4c746771bb
Track whether the left and right schemas are equal. If they're not, then the three way differ should never produce a convergent edit.
2023-11-22 02:10:50 -08:00
23c09343c6
During three way merge, only process stored columns, not virtual columns.
2023-11-21 17:12:26 -08:00
b6232a5b5e
Create and propagate MergeInfo struct.
2023-11-21 17:12:14 -08:00
887ed8c990
Copmute whether schemas have changed during three way merge.
2023-11-21 17:11:50 -08:00
a69ac26d7c
Add considerAllRowsModified option to Differ.
...
This is useful for three way merges: in the presence of a schema change, we want every key in a diff to be considered modified, even if the tuple value doesn't change.
2023-11-21 17:11:50 -08:00
b3943e5397
Re-enabled skipped tests.
2023-11-21 17:11:50 -08:00
f8e2371d24
Merge pull request #7024 from nustiueudinastea/concurrent-branches-map
...
Concurrent branches map
2023-11-21 11:47:39 -08:00
015efd4c53
reverting older ordering, changed during merge
2023-11-21 13:29:38 +02:00
cab07b32c1
added the nil check when unmarshaling from json
2023-11-21 13:26:03 +02:00
fb4275a65e
Merge branch 'main' into concurrent-branches-map
2023-11-21 13:25:17 +02:00
9bc32d9db2
Merge pull request #6980 from dolthub/nicktobey/schemamerge
...
Correctly identify and report data conflicts when deleting rows and/or columns during a three-way merge.
2023-11-20 23:12:26 -08:00
6527d9d6e9
Update docstring for mergeProllyTableData
2023-11-20 21:52:22 -08:00
8cf2982898
Add comments explaining why we have to handle left-only diffs during three-way merge.
2023-11-20 21:49:41 -08:00
dbb5ce3d2d
Merge pull request #7023 from dolthub/macneale4/fix_dolt_fetch_pull
...
fix dolt fetch and dolt pull commands to properly authenticate
2023-11-20 20:32:04 -08:00
aacfd0a673
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2023-11-21 02:46:35 +00:00
0780d4e496
Update tests for more descriptive messages
2023-11-20 18:39:42 -08:00
16a9dd80d4
Refactor to keep sql.Context out of interceptors.go
2023-11-20 18:39:35 -08:00
89f89a0997
Don't run check validator on resolved deleted rows: it's not needed and won't work.
2023-11-20 18:01:54 -08:00
560dfc02a7
Rename GetKeyColumnsDescriptor to GetKeyDescriptorWithNoConversion
2023-11-20 14:39:28 -08:00
c278833866
Refactor test harness to make clear why we're copying the test object.
2023-11-20 14:38:41 -08:00
d09c29cb7e
use database name that is the same as directory name on disk ( #7020 )
2023-11-20 13:20:12 -08:00
517e8679cd
Merge pull request #7019 from nustiueudinastea/concurrent-backups-map2
...
Concurrent backups map
2023-11-20 10:14:26 -08:00
4cffade705
[ga-bump-dep] Bump dependency in Dolt by JCOR11599 ( #7021 )
...
Co-authored-by: JCOR11599 <jcor@ucsd.edu >
2023-11-18 12:52:16 -08:00
2e4184adb5
initialize nramches as well in the RepoState
2023-11-18 15:32:58 +02:00
322f528be6
first pass switching branches to concurrent map
2023-11-18 15:32:58 +02:00
5aed4d14bd
setting default values for repo state remotes and backups. They should never be nil even if the on disk config doesn't have values for them
2023-11-18 15:15:14 +02:00
a78a6d2008
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2023-11-18 01:19:05 +00:00
e11363a5c1
Activate skipped tests for fetch and pull
2023-11-17 17:07:38 -08:00
8e8335e9d4
Refactor Aaron's change in my voice
2023-11-17 14:54:17 -08:00
311b54f3cc
dolt_fetch: Allow dolt fetch to work with username/password auth against a remotesapi.
...
When we migrated `dolt fetch` to use the SQL interface, we broke
username/password authentication for it. This change restores that
functionality.
Because `dolt fetch` can run against a SQL server, the semantics here are a bit
subtle. We pass along the `--user` parameter which is given to the `dolt fetch`
invocation. When the server sees a `--user` parameter in a `call dolt_fetch()`,
it consults its own process environment to pull out the password. In the common
case where `dolt fetch` is running against a SQL engine which is in the same
process, this means the `dolt fetch` invocations same the same.
2023-11-17 11:50:59 -08:00
477a1af160
Split Authentication and Authorization in the chunkstore API impl
2023-11-17 11:47:51 -08:00
e7180e42a5
Merge pull request #7016 from dolthub/steph/cli-perf
...
Allow `dolt config` to run in folders without write permissions
2023-11-17 09:24:17 -08:00
7a36a96af6
initialize backups as well in the RepoState
2023-11-17 19:21:25 +02:00
e5827be667
first pass switching backups to concurrent map
2023-11-17 19:21:18 +02:00
f5e0b0ff61
Merge pull request #7015 from dolthub/fulghum/bugfix
...
Update docs for merge's `--abort` param
2023-11-17 08:52:06 -08:00
c6ea9725a7
minor updates
2023-11-16 17:48:00 -08:00
0f5a26af3a
profile does not need write perms in current dir
2023-11-16 16:53:14 -08:00
f37e231e7c
does not check write perms for config
2023-11-16 16:44:12 -08:00
41f31eb8bf
Updating docs for --abort param; merge validates that the working set is clean before it will start a merge
2023-11-16 16:30:58 -08:00
52ce8d241a
Remove unused code and add comments.
2023-11-16 15:09:37 -08:00
85525e58ac
Fix copy-paste error in processBaseColumns
...
Regression test is not included because it led to discovery of https://github.com/dolthub/dolt/issues/7014
2023-11-16 14:53:50 -08:00
76c2f4641b
[ga-bump-dep] Bump dependency in Dolt by jennifersp ( #7013 )
2023-11-16 14:07:03 -08:00
9cf62a54ab
fix panic on foreign key references dropped table for dolt diff ( #7008 )
2023-11-16 13:26:26 -08:00
820686bc42
Merge pull request #7004 from dolthub/aaron/sql-server-startup-rigor
...
[no-release-notes] cmd/dolt/commands/sqlserver: Restructure the start up sequence for sql-server.
2023-11-16 10:23:46 -08:00
184a3175f1
[ga-bump-release] Update Dolt version to 1.27.0 and release v1.27.0
2023-11-16 18:17:08 +00:00
8ea2847759
allow hyphen in db name to match its dir name ( #6995 )
2023-11-16 07:25:55 -08:00
95b80fdf29
Cleanup comments in merge_prolly_rows.go
2023-11-16 00:25:10 -08:00
445ba966b2
During three-way merging, avoid touching the primary index for every left-side row unless we actually need to (because the schema changed.)
2023-11-15 17:20:15 -08:00
32fd66d75b
Update processBaseColumn to account for the fact that we no longer preemptively migrate the left side of the merge.
2023-11-15 14:36:22 -08:00
efff37bdf6
Update bats tests. These tests test handling data conflicts, but the behavior that was in the test (row deletion + column deletion) is no longer a conflict. This commit changes the behavior to something else that is a conflict.
2023-11-15 14:36:19 -08:00
Nick Tobey