Commit Graph

2791 Commits

Author SHA1 Message Date
Stephanie You
f91c9abcfb remove nonsense variables from config tests 2023-12-18 13:59:54 -08:00
Stephanie You
b19af8f57e add check for nonsense variables in config 2023-12-15 17:32:00 -08:00
Stephanie You
c54e6b7b3a restrict dolt config to accepted options 2023-12-15 17:13:21 -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
14efec1153 go: sqle: cluster: Fix MySQLDb and dolt_branch_control replication for the cases where you have more than one standby server in the cluster.
Previously these changes would only get replicated to the first database in the cluster.
2023-12-14 15:11:31 -08:00
Jason Fulghum
8de95600dd Updating merge conflict error messages in BATS tests 2023-12-14 06:30:29 -08:00
Stephanie You
ee4490df38 change output check for bad version 2023-12-11 17:43:36 -08:00
Stephanie You
678da61ae6 better bats test for bad version error 2023-12-11 16:03:43 -08:00
Stephanie You
c63435889a poorly formatted version doesnt error 2023-12-11 13:45:36 -08:00
stephanie
f7636e9e31 Merge pull request #7126 from dolthub/steph/version-fix
fixes `dolt version` out of date warning
2023-12-08 14:40:17 -08:00
Jason Fulghum
5f74b027b1 Merge pull request #7125 from dolthub/fulghum/reflog
Clear out reflog contents consistently after GC
2023-12-08 14:31:07 -08:00
Stephanie You
cabcb8bc95 additional test 2023-12-08 11:52:39 -08:00
Stephanie You
98be638250 simplify out of date check 2023-12-08 11:39:18 -08:00
Nick Tobey
ef8a630f04 Disable performance bats test. 2023-12-07 20:06:25 -08:00
Aaron Son
076f51acca Merge pull request #7123 from dolthub/aaron/import-supports-bom
dolt table import: json,csv: Support BOM file headers.
2023-12-07 16:41:44 -08:00
Jason Fulghum
b9f8ededfc Merge branch 'main' into fulghum/reflog 2023-12-07 16:28:08 -08:00
Aaron Son
04bd70ad2e dolt table import: json,csv: Support BOM file headers.
The semantics are as follows:

For CSV files, the default import is an uninterpreted character encoding where
newline has to match 0xa and the delimeters have to match. In general Dolt
expects UTF8, but non-UTF8 characters in string fields can make it through to
the imported table for encodings which are close enough to ASCII, for example.
If there is a UTF8, UTF16LE or UTF16BE BOM header, then character decoding of
the input stream switches to the indicated encoding.

For JSON files, the default import is UTF8 character encoding. If there is a
UTF8, UTF16LE or UTF16BE BOM header, then character decoding of the input
stream switches to the indicated encoding.
2023-12-07 15:06:22 -08:00
Neil Macneale IV
282993a247 Merge pull request #7122 from dolthub/macneale4/checkout-B
Add support for -B flag to dolt_checkout

https://github.com/dolthub/dolt/issues/7116
2023-12-07 14:31:21 -08:00
Dustin Brown
80037bcffc [auto-bump] [no-release-notes] dependency by jennifersp (#7112) 2023-12-07 13:33:07 -08:00
stephanie
e894937c0c Merge pull request #7105 from dolthub/steph/version
Add of out date warning to `dolt version`
2023-12-07 12:51:47 -08:00
Neil Macneale IV
3e7f3e3542 Add CLI support for checkout -B 2023-12-07 11:15:08 -08:00
Aaron Son
db3472ab54 Merge pull request #7107 from dolthub/aaron/sqle-database-provider-clone-dbLocations-fix
go/libraries/doltcore/sqle: DatabaseProvider: Fix a bug where a database created with call dolt_clone() would not be dropped until the server was restarted.
2023-12-06 15:14:19 -08:00
stephanie
e0013d3de2 Merge branch 'main' into steph/version 2023-12-06 10:30:30 -08:00
Jason Fulghum
69b5785495 Completely truncating the reflog ring buffer on GC, to make behavior consistent between long-running and short-lived dolt processes 2023-12-06 10:23:13 -08:00
Stephanie You
b756f73a81 fix bats test 2023-12-06 10:21:39 -08:00
Zach Musgrave
7c88abef6e Merge pull request #7090 from dolthub/zachmu/events
Added a periodic heartbeat event metric to `sql-server`
2023-12-06 09:48:48 -08:00
stephanie
ed7ee23423 Merge pull request #7088 from dolthub/steph/clone-branch
add `--single-branch` flag for `dolt clone`
2023-12-06 09:41:47 -08:00
Aaron Son
0e1bbfc9f0 go/libraries/doltcore/sqle: DatabaseProvider: Fix a bug where a database created with call dolt_clone() would not be dropped until the server was restarted.
Fixes #7106.
2023-12-06 09:03:39 -08:00
Zach Musgrave
8ad5bd0f6e Merge branch 'main' into zachmu/events 2023-12-05 16:52:58 -08:00
Aaron Son
5edebb5e4a integration-tests/bats/performance.bats: Run some long-running tests locally for now. 2023-12-05 16:50:28 -08:00
Aaron Son
379ee64cb9 Merge remote-tracking branch 'origin/main' into aaron/lambda-bats 2023-12-05 16:09:27 -08:00
Aaron Son
6c5c03dffe integration-tests/bats: Small bats tests improvements for the lambda runner. 2023-12-05 15:14:00 -08:00
Zach Musgrave
13d51ae1ae fixed test 2023-12-05 11:13:52 -08:00
Stephanie You
c64e2b93af Merge remote-tracking branch 'origin/main' into steph/clone-branch 2023-12-05 10:38:32 -08:00
Zach Musgrave
7271e56ce8 heartbeat tests 2023-12-05 10:03:10 -08:00
Zach Musgrave
b207b1bc03 Smoke test for faulty GRPC config, fixed broken error handling in the case of a bad GRPC client 2023-12-04 17:03:24 -08:00
stephanie
0972f6cf97 Merge pull request #7092 from dolthub/steph/gc
migrate `dolt gc` to use sql queries
2023-12-04 16:49:25 -08:00
Zach Musgrave
a7b31a3736 End to end tests of metrics logging 2023-12-04 16:21:59 -08:00
Nick Tobey
e723577492 Merge pull request #7065 from dolthub/nicktobey/perf
Cache the computation of default columns during three-way merges.
2023-12-04 14:10:51 -08:00
Stephanie You
aee558db41 catch different reflog output between remote vs local execution 2023-12-04 13:58:42 -08:00
Stephanie You
279b40a96e migrate dolt gc to use sql queries 2023-12-04 11:59:56 -08:00
Nick Tobey
c8ba567c23 Add comments to BATS test. 2023-12-04 11:59:09 -08:00
Nick Tobey
915cadb3b6 Delete unneeded files from test repo. 2023-12-04 11:54:03 -08:00
Zach Musgrave
6cdd0fbefd Merge main, resolve new event conflict 2023-12-04 10:25:52 -08:00
Stephanie You
4ec6d2b9fe PR comments 2023-12-04 10:00:58 -08:00
Zach Musgrave
d31758468d go mod cleanup 2023-12-01 17:44:27 -08:00
stephanie
d73c8fd4d5 Merge branch 'main' into steph/reflog 2023-12-01 16:39:43 -08:00
Stephanie You
be31b2852e adds --single-branch for dolt clone 2023-12-01 15:29:01 -08:00
Stephanie You
e2f18eedb9 Merge remote-tracking branch 'origin/main' into steph/reflog 2023-12-01 15:01:29 -08:00
Stephanie You
b47eeb4dec PR comments 2023-12-01 15:00:05 -08:00