e94ffebb29
Merge pull request #7373 from dolthub/steph/rebase
...
add `dolt rebase` command
2024-01-23 10:27:58 -08:00
89c8e806a9
Merge remote-tracking branch 'origin/main' into steph/rebase
2024-01-22 17:21:33 -08:00
d94f840c92
PR comments
2024-01-22 14:39:52 -08:00
5fb69ebc1a
PR Feedback
2024-01-22 11:07:36 -08:00
427b04b733
Update go/libraries/doltcore/env/actions/clone.go
...
Co-authored-by: Aaron Son <aaron@dolthub.com >
2024-01-22 11:00:38 -08:00
e2721cfb94
Be more selective in our remote references when cloning another repo
2024-01-22 10:00:50 -08:00
6b41096d81
Write stats to disk and dolt_statistics table ( #7243 )
...
* Write statistics to prolly tree
* fix go-sql-server-driver
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* bump
* [skip actions] [ga-update-correctness] SQL Correctness updated to 99.997709
* Tidy
* test edits
* fix string outputs
* fix string printing histogram rows
* bump
* [skip actions] [ga-update-correctness] SQL Correctness updated to 99.998097
* test bump
* bump
* bump
---------
Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com >
Co-authored-by: coffeegoddd <coffeegoddd@users.noreply.github.com >
2024-01-20 11:49:45 -08:00
da1bb8df16
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2024-01-20 01:42:11 +00:00
f5df9852a0
Merge branch 'zachmu/replicate-tags' of github.com:dolthub/dolt into zachmu/replicate-tags
2024-01-19 17:33:39 -08:00
91b953277c
Simplified warn on error behavior for replication
2024-01-19 17:06:47 -08:00
3ea7acb6cd
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2024-01-20 00:08:19 +00:00
fbbdc3cc6d
Push tags on replication
2024-01-19 15:55:25 -08:00
a3ea0aa803
rename open temp editor function to be more general
2024-01-18 23:11:48 -08:00
dc3c0eaf4f
Merge pull request #7363 from dolthub/macneale4/merge-noop-fix
...
dolt_merge() operation now appropriately ends as a no-op when an attempt is made to merge in a commit which is already reachable from HEAD. This matches git behavior, and is a non-error scenario.
In order to communicate to users what actually happened, the message column was added to the output of dolt_merge() and dolt_pull() stored procedures. Given the change in schema and that some user may actually depend on this broken merge behavior, this is a breaking change.
2024-01-18 16:10:29 -08:00
20b42aafdf
update sqllogictest/go version ( #7366 )
2024-01-18 15:59:09 -08:00
d8bd592db9
PR feedback
2024-01-18 14:00:35 -08:00
476dfd781a
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2024-01-18 21:28:23 +00:00
cb5379fc58
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2024-01-18 20:40:08 +00:00
030ddc2982
Fix compile error
2024-01-18 12:33:16 -08:00
f1b2d405c2
test updates to account for new column returned from dolt_merge
2024-01-18 12:20:30 -08:00
42abd6cd0d
Properly exit when merge is a no-op
...
Also expand the dolt_merge and dolt_pull result tables to include a message to communicate such things.
2024-01-18 12:20:30 -08:00
1c1d503dcb
Fix tests
2024-01-18 12:10:19 -08:00
240566f5c5
New binaryExpression interface
2024-01-17 16:42:02 -08:00
95aeffef44
[auto-bump] [no-release-notes] dependency by jycor ( #7342 )
2024-01-17 12:27:11 -08:00
5f5202fcf5
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2024-01-17 19:22:49 +00:00
8ac94d174b
Merge main
2024-01-17 11:15:37 -08:00
d666ebad54
Merge branch 'zachmu/event-error' of github.com:dolthub/dolt into zachmu/event-error
2024-01-17 11:14:03 -08:00
632eea5bf0
Added tests
2024-01-17 11:13:59 -08:00
5f6b95f20a
fix tests from string to bool conversion change ( #7327 )
...
* test bump
* fix test
* fix binlog test
---------
Co-authored-by: James Cor <james@dolthub.com >
2024-01-16 18:14:07 -08:00
4786c570dd
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2024-01-17 02:03:54 +00:00
ee0270d0bb
Fixed spurious error message for event scheduling when the dolt_schemas table doesn't exist.
2024-01-16 17:56:35 -08:00
9ce2393c3b
Merge pull request #7285 from dolthub/fulghum/dolt-7275
...
Bug fix: keyless table constraint violations
2024-01-12 17:27:21 -08:00
e0a0d025f2
PR Feedback: adding a test case where duplicate rows in a keyless table violate a constraint, and explaining the current behavior as well as a TODO for a potential future change.
2024-01-12 15:54:34 -08:00
2feeff4f34
PR Feedback: completing the in-progress merge and verifying that merging again passes cleanly without constraint violations
2024-01-12 12:04:29 -08:00
0a6767aa02
Take the grpc auth header as a signal we need to validate the remote working set
2024-01-10 17:50:41 -08:00
69a201affc
Less redirection
2024-01-10 17:07:46 -08:00
b832e3bf9d
dolt push: Only assert on a clean working set when doing a push if we are running against a server which requests it.
2024-01-10 15:51:30 -08:00
8d84a6213b
Including dolt_row_hash in test results
2024-01-09 16:41:05 -08:00
9a44b41fc7
Bug fix for clearing constraint violations for keyless tables.
...
Related to: https://github.com/dolthub/dolt/issues/7275
2024-01-09 16:35:32 -08:00
2c58d53cc9
Merge pull request #7230 from dolthub/nicktobey/json
...
Allow for three way merges to automatically resolve concurrent changes to a JSON object when the changes affect different keys.
2024-01-08 09:33:51 -08:00
66c6f493e9
[auto-bump] [no-release-notes] dependency by max-hoffman ( #7269 )
...
* [ga-bump-dep] Bump dependency in Dolt by max-hoffman
* fix join op tests
---------
Co-authored-by: max-hoffman <maximilian.wolfgang1@gmail.com >
2024-01-06 20:06:45 -08:00
56a32f67c5
Add tests for dont_merge_json, both as a command line flag and as a system variable.
2024-01-05 16:37:14 -08:00
79c5f72363
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2024-01-05 23:32:59 +00:00
b73483b18d
Update tests.
2024-01-05 15:26:17 -08:00
5bd9f780cb
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2024-01-05 23:08:25 +00:00
852fa102a3
move files
2024-01-05 15:00:40 -08:00
f3d20a29fb
Merge pull request #7242 from dolthub/macneale4/sql-shell-prompt
...
Three changes to the dolt sql shell:
- Show the branch you are on: mydb/main>
- Show the workspace is dirty with a "*" in the prompt
- Add color to the DB name, branch, and dirty status.
2024-01-05 14:16:58 -08:00
a7b37c55ce
[no-release-notes] bump and test for required commit_diff index predicates ( #7256 )
...
* bump and test for required commit_diff index predicatesg
* bump gms
2024-01-04 17:29:58 -08:00
6b55281e5b
Add dolt_dont_merge_json session variable.
2024-01-04 16:36:12 -08:00
78fc43724d
Expose sql.Context to three-way merge algorithm. This way, we will be able to toggle expensive JSON merging with a session variable.
2024-01-04 16:35:34 -08:00
stephanie