Commit Graph

21736 Commits

Author SHA1 Message Date
Aaron Son 77972fb412 [no-release-notes] go: sqle: cluster: Abstract successChs machinery in commithook into a struct called ProgressNotifier. 2023-10-05 17:30:40 -07:00
Zach Musgrave f49ef149de Merge pull request #6778 from dolthub/zachmu-4cc2f2ca
[auto-bump] [no-release-notes] dependency by zachmu
2023-10-05 16:50:55 -07:00
Jason Fulghum 68a771bbca Tidying up 2023-10-05 16:05:42 -07:00
Zach Musgrave 7f486ab807 Merge pull request #6777 from dolthub/aaron/bump-go-1.21
go/go.mod: Require Go 1.21 in our go.mod.
2023-10-05 15:58:59 -07:00
zachmu 53ed6806d6 [ga-bump-dep] Bump dependency in Dolt by zachmu 2023-10-05 22:58:21 +00:00
Jason Fulghum b6f40a621d Merge branch 'main' into fulghum/undrop 2023-10-05 14:09:55 -07:00
Jason Fulghum b25a6555d3 Fixes for inmemfs implementation of MoveDir 2023-10-05 14:09:11 -07:00
Jason Fulghum c953bda067 Tidying up 2023-10-05 14:01:21 -07:00
Aaron Son dd798b09f4 integration-tests/go-sql-server-driver/go.mod: Use golang 1.21. 2023-10-05 13:51:36 -07:00
Aaron Son 08d44029a7 go/go.mod: Require Go 1.21 in our go.mod. 2023-10-05 13:28:40 -07:00
Dustin Brown 3a8453b615 [auto-bump] [no-release-notes] dependency by JCOR11599 (#6775) 2023-10-05 13:28:31 -07:00
stephkyou 6f095c5750 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-10-05 02:04:42 +00:00
Stephanie You 8ce8a924e7 add remote test for dolt pull 2023-10-04 18:53:58 -07:00
Stephanie You e5f20737e7 cleanup unneeded code 2023-10-04 18:53:58 -07:00
Stephanie You 60bcded65f update merge to return 1 when there are conflicts 2023-10-04 18:53:58 -07:00
Stephanie You 039f0221dc update pull to print proper merge stats 2023-10-04 18:53:58 -07:00
Stephanie You 0833f43968 refactor printing merge stats 2023-10-04 18:53:58 -07:00
Stephanie You d6ab22bee7 migrate dolt pull to use sql queries 2023-10-04 18:53:58 -07:00
Stephanie You 0a47b6f90a add bats tests for pull 2023-10-04 18:53:58 -07:00
Jason Fulghum 905b55fd2e Tidying up 2023-10-04 15:19:52 -07:00
Jason Fulghum 8c2c30fca0 Merge branch 'fulghum/undrop' of https://github.com/dolthub/dolt into fulghum/undrop 2023-10-04 15:02:11 -07:00
Jason Fulghum 8d49d9c1fe Making dolt_purge_dropped_databases() require SUPER privileges 2023-10-04 15:01:59 -07:00
fulghum 3089faade0 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-10-04 19:37:23 +00:00
Jason Fulghum 34c59e1b14 Fix missing interface method impl for test 2023-10-04 12:26:47 -07:00
Jason Fulghum b21317a480 Merge branch 'main' into fulghum/undrop 2023-10-04 12:17:54 -07:00
Jason Fulghum 24764496f1 Adding support for new dolt_purge_dropped_databases stored procedure 2023-10-04 12:13:37 -07:00
Jason Fulghum 17ebce57c9 Fixing BATS test to run correctly with the remote-engine variant. 2023-10-04 11:30:29 -07:00
James Cor 927ac2ccfa test for joining diff table function with alias (#6768) 2023-10-04 10:47:32 -07:00
Jason Fulghum 14a026601a Stubbing out the PurgeAllDroppedDatabases function 2023-10-04 10:30:47 -07:00
Jason Fulghum 0570288de0 Tidying up 2023-10-04 10:18:53 -07:00
Aaron Son b381903a2f integration-tests/go-sql-server-driver: Add a test for undropping a cluster replicated database. 2023-10-04 10:14:20 -07:00
Aaron Son e8e122b2d4 Merge pull request #6767 from dolthub/aaron/fix-cluster-drop-database-race
go: sqle: cluster: Improvements for DROP DATABASE replication.
2023-10-04 10:13:48 -07:00
Jason Fulghum 5f2c3c284d Switching to pointer receivers after picking up changes from main 2023-10-04 09:39:54 -07:00
Jason Fulghum d4f4945e16 Merge branch 'main' into fulghum/undrop 2023-10-04 09:31:27 -07:00
Jason Fulghum 947adf2bb0 Bug fix for case-insensitive file search helper function 2023-10-04 09:29:59 -07:00
Aaron Son c467bb2a8e Merge pull request #6769 from dolthub/aaron/sqle-database-provider-pointer-receiver
[no-release-notes] go: sqle: DoltDatabaseProvider: Change it to a pointer receiver so updates to its state are much easier to reason about.
2023-10-04 09:23:27 -07:00
Jason Fulghum 3fd6e5534c Adding helper methods for case-insensitive matching code and fixing a couple bugs 2023-10-03 17:03:55 -07:00
Jason Fulghum 109159f098 Renaming ListUndroppableDatabases -> ListDroppedDatabases 2023-10-03 17:03:09 -07:00
Aaron Son 7a7f26b70d [no-release-notes] go: sqle: DoltDatabaseProvider: Change it to a pointer receiver so updates to its state are much easier to reason about. 2023-10-03 16:05:36 -07:00
Jason Fulghum 93b044f233 Various small fixes 2023-10-03 15:58:00 -07:00
Aaron Son 9e66c4eae2 go: sqle: cluster: Improve how we handle sql.Context for replication api. 2023-10-03 15:47:17 -07:00
reltuk 2b2a289576 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-10-03 22:10:59 +00:00
Aaron Son 7d412a14e8 go: sqle: cluster: Improvements for DROP DATABASE replication.
Fix a bug in session handling for the replication api endpoint which would
prevent a dropped database from being recreated on a replica.

Fix a race condition when a database is recreated after it is dropped. In that
case, we stop attempting to replicate the drop, so that it does not replicate
after the new database does.
2023-10-03 14:50:57 -07:00
Nick Tobey b27db84190 Merge pull request #6703 from dolthub/nicktobey/tuples
When a three-way merge contains an altered column, convert values to the new column type in order to prevent conflicts.
2023-10-03 14:49:09 -07:00
Jason Fulghum 1cb66beede Bug fixes for inmemfs MoveDir implementation 2023-10-03 14:11:44 -07:00
Jason Fulghum c813142a6d First pass at implementation and tests for MoveDir method in InMemFS 2023-10-03 13:20:58 -07:00
stephanie 514422f82d Merge pull request #6764 from dolthub/steph/context-handling
update fetch context handling
2023-10-03 12:29:51 -07:00
Nick Tobey 3f11c838dd Update documentation. 2023-10-03 11:50:47 -07:00
Zach Musgrave a8d3aa8705 Merge pull request #6763 from dolthub/zachmu/gms-upgrade
[no-release-notes] upgrade gms and fix tests
2023-10-03 11:19:53 -07:00
Nick Tobey 645c9e2835 Update callback method signature in tests. 2023-10-03 10:54:42 -07:00