macneale4
9360c4e199
[ga-bump-release] Update Dolt version to 1.32.0 and release v1.32.0
2024-01-19 01:34:08 +00:00
Dustin Brown
bbcfa555cc
[ga-bump-dep] Bump dependency in Dolt by max-hoffman ( #7369 )
2024-01-18 17:23:49 -08:00
Neil Macneale IV
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
jennifersp
20b42aafdf
update sqllogictest/go version ( #7366 )
2024-01-18 15:59:09 -08:00
macneale4
65d411e34c
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2024-01-18 22:08:01 +00:00
Neil Macneale IV
d8bd592db9
PR feedback
2024-01-18 14:00:35 -08:00
Zach Musgrave
3cbb73cafa
Merge pull request #7357 from dolthub/zachmu/prepare2
...
[no-release-notes] refactoring BinaryExpression
2024-01-18 13:49:00 -08:00
Zach Musgrave
9c1ee17361
Merge branch 'zachmu/prepare2' of github.com:dolthub/dolt into zachmu/prepare2
2024-01-18 13:42:10 -08:00
Zach Musgrave
929d7b2735
Latest gms
2024-01-18 13:42:03 -08:00
Dustin Brown
edde46c33f
Merge pull request #7364 from dolthub/db/fix
...
[no-release-notes] /.github/workflows/pull-report.yaml: check as bool
2024-01-18 13:41:54 -08:00
coffeegoddd
e29df02040
/.github/workflows/pull-report.yaml: check as bool
2024-01-18 13:41:02 -08:00
Neil Macneale IV
fb440bacf3
Fix result expectations in mysql-client-tests
2024-01-18 13:36:17 -08:00
macneale4
476dfd781a
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2024-01-18 21:28:23 +00:00
Neil Macneale IV
329cf5ebbc
Update go/cmd/dolt/commands/pull.go
...
Co-authored-by: Jason Fulghum <jason@dolthub.com >
2024-01-18 13:21:11 -08:00
zachmu
cb5379fc58
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2024-01-18 20:40:08 +00:00
Zach Musgrave
030ddc2982
Fix compile error
2024-01-18 12:33:16 -08:00
Neil Macneale IV
6a1389437b
fix typo
2024-01-18 12:26:51 -08:00
Zach Musgrave
241ee215ac
dev gms for testing
2024-01-18 12:21:02 -08:00
Neil Macneale IV
3d5a43ced3
Remove the incorrect validation in constraints test
2024-01-18 12:20:30 -08:00
Neil Macneale IV
2d912bef62
Make the merge result printing a little less magical
2024-01-18 12:20:30 -08:00
Neil Macneale IV
79679c19a8
Fix test which depended on broken merge behavior
2024-01-18 12:20:30 -08:00
Neil Macneale IV
4622f7a37c
Don't print HEAD info if there were conflicts (no-new merge)
2024-01-18 12:20:30 -08:00
Neil Macneale IV
f1b2d405c2
test updates to account for new column returned from dolt_merge
2024-01-18 12:20:30 -08:00
Neil Macneale IV
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
Dustin Brown
5c3bdf9b36
Merge pull request #7362 from dolthub/db/fix
...
[no-release-notes] /.github/workflows: more logs
2024-01-18 12:17:15 -08:00
coffeegoddd
94e398d8ff
/.github/workflows: more logs
2024-01-18 12:16:53 -08:00
Zach Musgrave
1732ff3ff2
Merge main
2024-01-18 12:15:56 -08:00
Zach Musgrave
1c1d503dcb
Fix tests
2024-01-18 12:10:19 -08:00
Dustin Brown
2398a547fc
Merge pull request #7361 from dolthub/db/more
...
[no-release-notes] /.github/workflows/pull-report.yaml: do more printing
2024-01-18 11:37:00 -08:00
coffeegoddd
33c1523477
/.github/workflows/pull-report.yaml: do more printing
2024-01-18 11:36:20 -08:00
Dustin Brown
6a0c77e0ea
Merge pull request #7359 from dolthub/db/print-job-type
...
[no-release-notes] /.github/workflows/pull-report.yaml: print job type too
2024-01-18 10:48:10 -08:00
coffeegoddd
580fb81fa4
/.github/workflows/pull-report.yaml: print job type too
2024-01-18 10:47:33 -08:00
fulghum
93b3dcb163
[ga-bump-release] Update Dolt version to 1.31.3 and release v1.31.3
2024-01-18 01:38:21 +00:00
Jason Fulghum
fa2feeea93
Merge pull request #7355 from dolthub/fulghum-91a2a9d4
...
[auto-bump] [no-release-notes] dependency by fulghum
2024-01-17 17:27:03 -08:00
Zach Musgrave
3613eed18a
Dev gms
2024-01-17 17:04:36 -08:00
Zach Musgrave
240566f5c5
New binaryExpression interface
2024-01-17 16:42:02 -08:00
Jason Fulghum
aacaff1f76
Fixing test references for non-explicitly specified SESSION sys vars
2024-01-17 15:56:53 -08:00
Jason Fulghum
c7076d9f75
Fixing test from change to match how MySQL returns system variable names
2024-01-17 15:48:09 -08:00
fulghum
7ef3afa241
[ga-bump-dep] Bump dependency in Dolt by fulghum
2024-01-17 23:45:53 +00:00
Dustin Brown
95aeffef44
[auto-bump] [no-release-notes] dependency by jycor ( #7342 )
2024-01-17 12:27:11 -08:00
Zach Musgrave
ff1e8f75ad
Merge pull request #7336 from dolthub/zachmu/event-error
...
Fixed spurious error message for event scheduling when the dolt_schem…
2024-01-17 12:03:39 -08:00
zachmu
5f5202fcf5
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2024-01-17 19:22:49 +00:00
Zach Musgrave
8ac94d174b
Merge main
2024-01-17 11:15:37 -08:00
Zach Musgrave
d666ebad54
Merge branch 'zachmu/event-error' of github.com:dolthub/dolt into zachmu/event-error
2024-01-17 11:14:03 -08:00
Zach Musgrave
632eea5bf0
Added tests
2024-01-17 11:13:59 -08:00
Dustin Brown
ae9369336c
Merge pull request #7349 from dolthub/db/fix
...
[no-release-notes] /.github/workflows/pull-report.yamlL: fix print correctness info
2024-01-17 10:50:49 -08:00
coffeegoddd
f67c502193
/.github/workflows/pull-report.yamlL: fix print correctness info
2024-01-17 10:49:59 -08:00
Dustin Brown
c01f8d8017
Merge pull request #7335 from dolthub/db/sysbench
...
[no-release-notes] sysbench runner postgres and doltgres support
2024-01-17 10:23:02 -08:00
Dustin Brown
755dcbb689
Merge pull request #7347 from dolthub/db/fix
...
[no-release-notes] /.github/workflows/sql-correctness.yaml: fix workflow
2024-01-17 10:19:46 -08:00
coffeegoddd
a6974ca14c
/.github/workflows/sql-correctness.yaml: fix workflow
2024-01-17 10:19:24 -08:00
