Commit Graph

770 Commits

Author SHA1 Message Date
Maximilian Hoffman 4a994d31c6 Read replica update working set fixes (#3471)
* Read replica update working set fixes

Read replica pull updates the session working set after pulling a
filtered set of branches from the tracking database. The original
(buggy) implementation updates the working set to the branch specified
at server-start time. The identity of that branch was fixed for the
duration of the server, so dolt_checkout would (appear to) have no
effect on the new branch's working set. What actually happened was more
pernicious: the working set was updated to the value of the
incorrect branch.

The fix no longer statically sets the active branch for a read replica
database. The active branch is pulled from the `*sql.Context`, so the
correct working set will be updated.

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

* add test

* todos

* delete extraeneous line

Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com>
2022-05-23 15:00:11 -07:00
Zach Musgrave c1d21f1e3a Merge pull request #3455 from dolthub/zachmu/db-drop-panic
[no-release-notes] Additional tests for drop database panic
2022-05-19 08:55:12 -07:00
Zach Musgrave 43fd1404b5 Skipped drop test failing on windows: 2022-05-19 08:07:33 -07:00
Zach Musgrave 40c7f67dd0 Merge pull request #3454 from dolthub/zachmu/db-drop-panic
Fixed panic when dropping a database with active branches in use
2022-05-18 21:04:17 -07:00
Zach Musgrave 8934137ebc Added skipped tests for case sensitivity in db connection strings 2022-05-18 19:42:49 -07:00
Zach Musgrave 837a9f6ac8 Added test for dropping a branch-qualified DB 2022-05-18 19:24:55 -07:00
Zach Musgrave 964dfc361b Skipping new test on new format 2022-05-18 19:02:21 -07:00
AndyA 622eecb9ce Merge pull request #3408 from dolthub/andy/nbf-gate
[no-release-notes] Gate some CLI commands for `__DOLT_1__`
2022-05-18 18:23:49 -07:00
Zach Musgrave c491e777a0 Fixed panic when dropping a database with active branches in use 2022-05-18 18:17:25 -07:00
Zach Musgrave 6ff2892dbc Removed test that dropping columns on a keyless table doesn't work 2022-05-18 16:26:44 -07:00
Andy Arthur bcbb7378de . 2022-05-18 15:16:30 -07:00
Andy Arthur 805f6a8a8e skip new bats 2022-05-18 14:26:20 -07:00
Andy Arthur 6d28deda12 Merge remote-tracking branch 'origin/main' into andy/nbf-gate 2022-05-18 14:25:23 -07:00
Andy Arthur 5c012c820a gate config reset 2022-05-18 14:02:43 -07:00
Andy Arthur 8a4b22a6f0 maybe skip failing bats 2022-05-18 13:58:52 -07:00
Aaron Son 25d00df834 Merge remote-tracking branch 'origin/main' into aaron/dolt_backup-stored-procedure 2022-05-18 09:02:25 -07:00
Maximilian Hoffman f4dd4c7d6b Dolt clean (#3440)
* Dolt clean

CLI and sql clean function. Clears untracked tables by finding the
difference betewen HEAD and the current working set and then deleting
the result.

Optionally specify `--dry-run` to avoid persisting the result root.

Optionally pass a list of table names to filter for deletion if
untracked.

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

* zach comments

* need clean func for proc

* fix andy's PR

Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com>
2022-05-17 18:38:24 -07:00
Andy Arthur b4ccd71c57 Merge branch 'main' into andy/nbf-gate 2022-05-17 17:11:09 -07:00
Andy Arthur a53b6730ac batsfixpls 2022-05-17 17:09:57 -07:00
Vinai Rachakonda 5e333b0e8f Fix error message for DOLT_MERGE conflicts (#3413) 2022-05-17 19:56:09 -04:00
Aaron Son 19f9a38628 integration-tests/bats: backup.bats: Update backup already up to date test to expect success. 2022-05-17 16:22:59 -07:00
Aaron Son 5a05ed939a Merge remote-tracking branch 'origin/main' into aaron/dolt_backup-stored-procedure 2022-05-17 15:53:12 -07:00
Aaron Son 661011aa78 go/libraries/doltcore/sqle/dfunctions: dolt_backup.go: Implement dolt_backup("sync", ...). 2022-05-17 15:41:59 -07:00
Andy Arthur d5bd000790 more BATS skipping for __DOLT_1__ 2022-05-17 11:44:11 -07:00
Andy Arthur 706a50317e skip BATS in dump.bats 2022-05-17 11:25:51 -07:00
Vinai Rachakonda c11db5a55b Make import work with FKs and add disableFks check (#3412) 2022-05-17 14:11:30 -04:00
Vinai Rachakonda c54f5a8b1a update tests 2022-05-16 20:05:22 -04:00
Vinai Rachakonda a49a536c77 gmod 2022-05-16 20:04:44 -04:00
Vinai Rachakonda 5e454f2d7e update client tests 2022-05-16 20:03:38 -04:00
Maximilian Hoffman 33a679f20b Default branch now database-specific global variable (#3422)
* Default branch now database-specific global variable

* fix bats
2022-05-16 13:21:50 -07:00
Andy Arthur 6cc935560b gate diff/merge less aggresively, update BATS 2022-05-13 14:58:53 -07:00
jennifersp f71b09bd29 Add first-hour-db and bats tests for it (#3272) 2022-05-12 17:47:39 -07:00
Zach Musgrave 8a32085d9c Fixed bats tests for bools 2022-05-11 19:25:55 -07:00
Zach Musgrave 868e6dff24 Another bats skip 2022-05-11 18:10:54 -07:00
Zach Musgrave 4ac4a3fe83 Fix 3 failing tests for new format 2022-05-11 16:59:36 -07:00
Andy Arthur 242793c0e9 two more skips 2022-05-10 15:01:20 -07:00
Andy Arthur eccb060ca8 unskipping more tests 2022-05-10 14:34:05 -07:00
Andy Arthur 01587c8c20 more BATS skips for __DOLT_1__ 2022-05-10 14:08:47 -07:00
Andy Arthur 82f5d8ae7d added BATS helper skip_nbf_dolt_1 2022-05-10 13:37:16 -07:00
Dhruv Sringari 839d7c9cf3 dolt reset --hard clears any merge state (#3374)
* dolt reset --hard clears any merge state

* fix call DOLT_RESET to match new behavior, add sqlengine tests

* uncomment conflicted case
2022-05-09 15:34:52 -07:00
Maximilian Hoffman 9154d2e5dd short dolt procs (#3369) 2022-05-06 18:42:13 -07:00
Dhruv Sringari b0e9329ab3 Fix dolt conflicts cat failing to show conflicted rows in the union-ed schema between left, right, and base. (#3354)
* fix skipped merge conflict and bad conflicts cat

* fix bats test naming

* revert old storage format, add todo for new storage format
2022-05-06 13:54:56 -07:00
James Cor 2f0338dd17 merge james/collate into auto-bump 2022-05-06 11:12:25 -07:00
James Cor 789aed40b9 this'd better be the last one 2022-05-05 14:21:30 -07:00
James Cor c8c731f102 :/ 2022-05-05 13:49:49 -07:00
James Cor d491b43c75 hello CI please run, thanks 2022-05-05 13:07:11 -07:00
James Cor 59caaafcce fixing tests 2022-05-05 12:11:40 -07:00
Dhruv Sringari a04b09c5db Improve merge failure messages (#3347)
* improve merge failure messages

* fix silenced err

* fix bats test
2022-05-05 11:29:29 -07:00
Zach Musgrave 3f8340bb57 Fixed naming problems 2022-05-03 17:34:34 -07:00
Zach Musgrave bc755cd483 New bats test for mysql import (subset of client tests with no dependency on mysqldump or running mysql server) 2022-05-03 17:16:21 -07:00