Neil Macneale IV
c3f3ea7ab0
Pass through the --force flag for branch deletes
2023-12-21 18:25:54 -08:00
Neil Macneale IV
8550237e2f
Remove the RemoteRefType case in WorkingSetRefForHead
2023-12-21 15:22:08 -08:00
Neil Macneale IV
8225acb020
database_test.go needs the same
2023-12-21 14:20:15 -08:00
Neil Macneale IV
91a24e31a4
noms tools effected by interface change of Delete
2023-12-21 14:10:28 -08:00
Neil Macneale IV
dcc0cc39b8
Delete the remote workingset ref on branch delete pushes
2023-12-21 14:03:51 -08:00
Neil Macneale IV
e69b4857fc
verify that branch deletes don't overwrite dirty remotes
2023-12-21 13:47:20 -08:00
Neil Macneale IV
e18f795e14
Create branch test added
2023-12-21 11:11:59 -08:00
Neil Macneale IV
14474ccc3c
Merge remote-tracking branch 'origin/main' into server-push
2023-12-21 10:27:59 -08:00
max-hoffman
0c76ff6527
[ga-bump-release] Update Dolt version to 1.29.7 and release v1.29.7
2023-12-20 22:45:08 +00:00
Dustin Brown
2d903c43cf
[ga-bump-dep] Bump dependency in Dolt by max-hoffman ( #7202 )
...
Co-authored-by: max-hoffman <maximilian.wolfgang1@gmail.com >
2023-12-20 16:37:25 -06:00
Neil Macneale IV
08fb4d40e3
Fix create unknown db flag correctly
2023-12-19 17:46:35 -08:00
Neil Macneale IV
b19a00136f
Disable the ability to create a database on push
...
Also add two tests for branch deletion
2023-12-19 15:06:17 -08:00
Jason Fulghum
c3c57dd640
Merge pull request #7194 from dolthub/fulghum/sysbench
...
[no-release-notes] Changing sysbench_runner CI test to explicitly specify script tests
2023-12-19 12:42:00 -08:00
Jason Fulghum
9eb765f722
Specifying scripts explicitly for CI job that tests sysbench_runner
2023-12-19 12:14:19 -08:00
Nick Tobey
39a8f8409f
Merge pull request #7191 from dolthub/nicktobey/collate_merge1
...
Correctly resolve merge conflicts for types where two values with different representations can compare equal.
2023-12-19 11:34:18 -08:00
nicktobey
ca55d226aa
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2023-12-19 09:42:43 +00:00
Nick Tobey
6ef90a331e
Add comment explaining why we unconditionally call MutableMap::Delete when processing a resolved divergent delete.
2023-12-19 01:35:41 -08:00
Nick Tobey
6f388ac275
During convergent operations, the two values may have different representations: choose the one that comes higher when compared, in order to make the merge the same regardless of merge direction.
2023-12-19 01:35:41 -08:00
Nick Tobey
28a7d145d2
Add additional tests for merging types that have multiple representations corresponding to the same value.
2023-12-19 01:35:41 -08:00
Nick Tobey
1085f52b92
Guard against trying to delete unused key when finalizing index.
2023-12-19 01:35:35 -08:00
Dustin Brown
ce82b55688
[ga-bump-dep] Bump dependency in Dolt by jycor ( #7193 )
...
Co-authored-by: jycor <jcor@ucsd.edu >
2023-12-18 22:09:04 -08:00
stephanie
2d717c6495
Merge pull request #7181 from dolthub/steph/config
...
Warning for nonsense variables in config
2023-12-18 17:02:12 -08:00
Dustin Brown
10cac7a4c2
[auto-bump] [no-release-notes] dependency by jennifersp ( #7189 )
2023-12-18 16:15:18 -08:00
Nick Tobey
f4b1ef27f2
Delete from the secondary index when a conflict is auto-resolved into a detele.
2023-12-18 15:58:34 -08:00
Nick Tobey
8f205e192f
Force binary collation when resolving modified text in merges. This ensures we detect conflicts when the only change is different casing in a case-insensitive column.
2023-12-18 15:58:15 -08:00
Stephanie You
d06e827938
PR comments
2023-12-18 15:30:37 -08:00
Stephanie You
f91c9abcfb
remove nonsense variables from config tests
2023-12-18 13:59:54 -08:00
Stephanie You
8c3f4c19d0
allow sqlserver prefix variables in dolt config
2023-12-18 13:35:01 -08:00
Dustin Brown
0d1b7e181f
[auto-bump] [no-release-notes] dependency by jycor ( #7184 )
2023-12-18 12:34:20 -08:00
Jason Fulghum
4bcdce736a
Merge pull request #7185 from dolthub/fulghum/rebase-refactor
...
[no-release-notes] Refactor: Renaming existing `rebase.go` to `filter_branch.go`
2023-12-18 12:09:18 -08:00
bheni
97cc1b103b
[ga-bump-release] Update Dolt version to 1.29.6 and release v1.29.6
2023-12-18 19:05:11 +00:00
Jason Fulghum
23fa257af9
Renaming rebase.go to filter_branch.go to make room for rebase code
2023-12-18 10:22:18 -08:00
James Cor
5012d331f0
serialize on update expressions ( #7115 )
2023-12-15 22:40:01 -08:00
Aaron Son
b7aa9887a7
Merge pull request #7114 from dolthub/aaron/run-bats-in-lambdabats
...
.github: Iterate on getting bats tests running with lambdabats.
2023-12-15 17:32:41 -08:00
Aaron Son
b16a3d3f4c
Merge pull request #7179 from dolthub/aaron/sqle-databaseprovider-no-straggling-uninited-databases
...
go: sqle: DoltDatabaseProvider: If we encounter an error while creating a database, try to clean up after ourselves so we do not leave partially initialized database state around.
2023-12-15 17:32:29 -08:00
Stephanie You
b19af8f57e
add check for nonsense variables in config
2023-12-15 17:32:00 -08:00
Jason Fulghum
91d31ada3d
Merge pull request #7137 from dolthub/fulghum/connector-tests
...
Adding tests for column name metadata through MySQL C++ and Rust Connector
2023-12-15 17:31:42 -08:00
Stephanie You
c54e6b7b3a
restrict dolt config to accepted options
2023-12-15 17:13:21 -08:00
Aaron Son
abc5600467
Merge pull request #7178 from dolthub/aaron/dolt-sqle-cluster-create-missing-remotes-on-startup
...
go: sqle: cluster: Create missing remotes for cluster replication on startup if they do not already exist.
2023-12-15 15:29:22 -08:00
Aaron Son
90979cc588
Merge remote-tracking branch 'origin/main' into aaron/run-bats-in-lambdabats
2023-12-15 14:57:10 -08:00
Maximilian Hoffman
e5667b48b8
[no-release-notes] bump for carder refactor ( #7156 )
...
* [no-release-notes] bump for carder refactor
* add hints for branch plans
---------
Co-authored-by: Max Hoffman <maxhoffman@Maxs-MacBook-Pro.local >
2023-12-15 14:53:49 -08:00
Aaron Son
33927ec540
go: sqle: DoltDatabaseProvider: If we encounter an error while creating a database, try to clean up after ourselves so we do not leave partially initialized database state around.
2023-12-15 14:39:48 -08:00
stephanie
e630a0cb9a
Merge pull request #7169 from dolthub/steph/import-warning
...
More detailed warning message for import schema not matching
2023-12-15 14:13:40 -08:00
Aaron Son
b7b3f7b911
integration-tests/go-sql-server-driver: Fix tests.
2023-12-15 13:55:24 -08:00
Aaron Son
09d9d0312e
integration-tests/go-sql-server-driver: Small tweak for TestCluster/adding_new_remotes_to_the_config_creates_those_remotes_on_startup.
2023-12-15 13:03:28 -08:00
Aaron Son
0fbfd0d80a
go: sqle: cluster: Create missing remotes for cluster replication on startup if they do not already exist.
...
Previously `dolt sql-server` would error if there were existing databases and
they were missing any of the remotes listed as cluster replication remotes in
the config.yaml. This changes it so that those remotes are automatically
created at startup instead.
2023-12-15 12:49:11 -08:00
Nick Tobey
32ec7c4193
Improve output of failed schema merge tests to include secondary indexes.
2023-12-15 11:25:51 -08:00
Stephanie You
96f030505b
Merge remote-tracking branch 'origin/main' into steph/import-warning
2023-12-15 11:02:54 -08:00
Jason Fulghum
3c0b84760a
Merge pull request #7161 from dolthub/fulghum/tx-conflict-error
...
Return a different error message for tx commit conflicts depending on `@autocommit`
2023-12-15 08:35:17 -08:00
Aaron Son
72c61a897a
Merge pull request #7173 from dolthub/aaron/sqle-cluster-multiple-standbys-mysqldb-and-branch-control-fix
...
go: sqle: cluster: Fix MySQLDb and dolt_branch_control replication for the cases where you have more than one standby server in the cluster.
2023-12-14 16:58:01 -08:00
