zachmu
03ea0a2b32
[ga-bump-release] Update Dolt version to 0.75.8 and release v0.75.8
2023-03-28 17:47:16 +00:00
Zach Musgrave
84da4b789a
Merge pull request #5621 from dolthub/zachmu/commit-concurrency
...
Correctly handle merging of staged changes across concurrent sessions
2023-03-28 10:36:48 -07:00
Jason Fulghum
8c631607da
Merge pull request #5611 from dolthub/fulghum/bugfix
2023-03-27 20:12:29 -07:00
Jason Fulghum
40965c6d7a
Adding a test to assert the dolt branch CLI command will not delete the currently checked out branch.
2023-03-27 17:29:56 -07:00
AndyA
f628ebbb3e
Merge pull request #5620 from dolthub/andy/schema-merge-spec
...
[no-release-notes] go/doltcore/merge: spec tests for schema merge
2023-03-27 12:55:12 -07:00
jennifersp
963169fbcc
Merge pull request #5628 from dolthub/jennifersp-2153a5a4
...
[auto-bump] [no-release-notes] dependency by jennifersp
2023-03-27 12:34:59 -07:00
Aaron Son
7cbab83c6d
Merge pull request #5617 from dolthub/aaron/cluster-replication-standby-transition-robustness
...
go/libraries/doltcore/sqle/cluster: Improve the robustness of graceful transitions to standby role.
2023-03-27 11:14:13 -07:00
jennifersp
b8fd65d68f
[ga-bump-dep] Bump dependency in Dolt by jennifersp
2023-03-27 18:07:31 +00:00
Andy Arthur
32fc5f4021
go/doltcore/merge: fix schema merge tests for format __LD_1__
2023-03-27 09:56:42 -07:00
stephanie
1cc6213a5a
Merge pull request #5567 from dolthub/steph/dolt-5254
...
adds the dolt_column_diff system table
2023-03-27 08:29:11 -07:00
Stephanie You
be5b1fe354
update name for colSchemaDiff
2023-03-24 16:03:59 -07:00
Stephanie You
ec36caea27
add skip for dolt_column_diff engine tests for old format
2023-03-24 13:58:45 -07:00
Stephanie You
3cb10cd873
update logic for working set changes in dolt_column_diff
2023-03-24 13:03:58 -07:00
Brian Hendriks
59a4b0a82f
Merge pull request #5625 from dolthub/bh/yaml-config-omitempty
...
omit some empty fields
2023-03-24 12:27:49 -07:00
reltuk
09dab77a66
[ga-bump-release] Update Dolt version to 0.75.7 and release v0.75.7
2023-03-24 19:21:54 +00:00
Aaron Son
285b3eaa29
Merge pull request #5624 from dolthub/aaron/dolt_gc-succeeds-when-switching-to-chunk-journal
...
Fix dolt_gc for repositories newly using chunk journal.
2023-03-24 11:19:22 -07:00
Brian Hendriks
2bd5ae11a7
omit some empty fields
2023-03-24 11:14:43 -07:00
Aaron Son
f7a9172e9b
go/store/nbs: journal.go: Pass along UpdateGCGen calls for updating the manifest when the chunk journal is not bootstraped.
2023-03-24 09:49:01 -07:00
Aaron Son
d1bb4f6807
integration-tests/go-sql-server-driver: Add a test which fails when a non-chunk journal repo first switches to chunk journal and runs call dolt_gc.
2023-03-24 09:43:54 -07:00
zachmu
985515f6d3
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2023-03-23 22:46:41 +00:00
Zach Musgrave
82a9acd313
Merge branch 'zachmu/commit-concurrency' of github.com:dolthub/dolt into zachmu/commit-concurrency
2023-03-23 15:44:54 -07:00
Zach Musgrave
de8bc13a31
Updating pending commit staged with our merged working set stage
2023-03-23 15:44:49 -07:00
Pavel Safronov
aaf99b4e69
Merge pull request #5615 from dolthub/pavel/encode-logged-queries
...
Allow logging base64-encoded queries, instead of replacing bad chars.
2023-03-23 14:48:41 -07:00
Zach Musgrave
0c5c237463
New failing test
2023-03-23 14:23:57 -07:00
zachmu
6698da1996
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2023-03-23 21:03:05 +00:00
Zach Musgrave
c3b4cceda0
Another test of merging staged roots into eachother
2023-03-23 14:00:36 -07:00
Zach Musgrave
6e3d0238e4
Merge staged roots together as well as working roots
2023-03-23 13:54:43 -07:00
Zach Musgrave
dbb6c10383
Lots of tests, including a new failed one
2023-03-23 13:40:33 -07:00
stephanie
d0dd5e4d87
Update go/libraries/doltcore/sqle/enginetest/dolt_queries_diff.go
...
Co-authored-by: jennifersp <44716627+jennifersp@users.noreply.github.com >
2023-03-23 13:27:41 -07:00
Pavel Safronov
dbb0c5285a
Allow logging base64-encoded queries, instead of replacing bad chars.
2023-03-23 13:22:04 -07:00
Pavel Safronov
c2ca5b4ebe
Merge pull request #5619 from dolthub/max-hoffman-e8b04061
...
[auto-bump] [no-release-notes] dependency by max-hoffman
2023-03-23 13:19:50 -07:00
Andy Arthur
951dcaac4a
go/libraries/doltcore/merge: update schema merge tests after sqle revert
2023-03-23 12:43:09 -07:00
Andy Arthur
33f88b767f
Revert "go/doltcore/sqle: remove unused root parameter from test utility"
...
This reverts commit 69343b6a89
2023-03-23 12:42:07 -07:00
Andy Arthur
1cb1bcaa2d
go/doltcore/merge: outlined schema merge tests
2023-03-23 12:36:01 -07:00
Andy Arthur
69343b6a89
go/doltcore/sqle: remove unused root parameter from test utility
2023-03-23 12:15:11 -07:00
Zach Musgrave
bdc20bfd77
Bug fix for dolt_commit leaving a dirty working set
2023-03-23 11:31:32 -07:00
Andy Arthur
f35b7b4f2a
go/doltcore/merge: more schema merge tests
2023-03-23 11:17:39 -07:00
Andy Arthur
08c2439392
go/doltcore/merge: added schema merge tests
2023-03-23 11:17:39 -07:00
max-hoffman
e708e3b2c2
[ga-bump-dep] Bump dependency in Dolt by max-hoffman
2023-03-23 18:02:50 +00:00
Neil Macneale IV
8f9c9d241e
Added test for avoiding multiple parens issue.
...
Not a perfect test. See: https://github.com/dolthub/dolt/issues/5614
Validation for: https://github.com/dolthub/dolt/issues/5478
2023-03-23 10:09:09 -07:00
stephanie
fc1f9c3af9
Merge branch 'main' into steph/dolt-5254
2023-03-22 16:51:47 -07:00
Stephanie You
6e05d4b89c
add TestColumnDiffSystemTable test
2023-03-22 16:50:56 -07:00
Aaron Son
e83ab7d8b8
Merge remote-tracking branch 'origin/main' into aaron/cluster-replication-standby-transition-robustness
2023-03-22 16:07:43 -07:00
Neil Macneale IV
b51ff5637f
Additional test - now with no primary key
2023-03-22 15:49:34 -07:00
Neil Macneale IV
c0e553b6ad
Added test for avoiding multiple parens issue.
...
https://github.com/dolthub/dolt/issues/5478
2023-03-22 15:49:34 -07:00
Jason Fulghum
5af6ac20b9
Merge branch 'main' into fulghum/bugfix
2023-03-22 15:35:44 -07:00
Jason Fulghum
e48db854b1
Merge pull request #5616 from dolthub/fulghum/bugfix-2
...
[no-release-notes] re-genning protobuf files to fix CI failure
2023-03-22 15:32:24 -07:00
Aaron Son
396a60f7ed
go/libraries/doltcore/sqle/cluster: Improve the robustness of graceful transitions to standby role.
...
Some subtle races could cause graceful transitions to fail when they could have
succeeded or could cause replication to block for a long time while the attempt
to transition was ongoing.
2023-03-22 15:26:21 -07:00
Jason Fulghum
5cb476089e
Re-genning to fix out of sync versions in event_constants.pb.go, and adding more output to the ci-check-repo GH workflow.
2023-03-22 15:16:38 -07:00
Jason Fulghum
62b41ff2ed
Re-genning protobuf artifacts with go1.19 for matching comment newlines
2023-03-22 14:59:46 -07:00
