f28c2be53d
Merge branch 'fulghum/cherry-pick' of https://github.com/dolthub/dolt into fulghum/cherry-pick
2023-06-13 13:00:16 -07:00
12501bf919
Reverting change to dolt_cherry_pick stored procedure's return schema
2023-06-13 13:00:09 -07:00
a91152f88b
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2023-06-13 19:56:05 +00:00
cb4a50acc0
Cleaning up BATS tests
2023-06-13 12:45:31 -07:00
389279c000
Minor fixes to dolt_merge stored procedure
2023-06-13 12:41:31 -07:00
761a881fa1
Converted sql-cherry-pick BATS tests to enginetests
2023-06-13 12:30:02 -07:00
b7588dfa99
Tidying up
2023-06-13 12:18:13 -07:00
4f7f5da00f
Start of enginetests
2023-06-12 19:33:31 -07:00
ce34ba3c37
Tidying up
2023-06-12 19:20:54 -07:00
46dfabfef1
Allowing schema changes for cherry-pick
2023-06-12 16:21:57 -07:00
15a9110a1a
Adding additional info link to error message
2023-06-12 16:20:21 -07:00
bc91c20f5e
First pass at dolt_cherry_pick stored procedure support for dealing with conflicts
2023-06-12 16:17:31 -07:00
627ae1cc6d
Fixing table rename test
2023-06-12 16:01:06 -07:00
f7e02f28a5
BATS tests for cherry-pick conflict resolution from the CLI
2023-06-12 15:34:15 -07:00
4d29dce2a3
Helper methods for testing MergeStat conflict/violation status
2023-06-12 13:42:04 -07:00
81a5554601
Differentiating between schema and content conflicts in merge command line output
2023-06-12 13:41:26 -07:00
de01d65f78
cherry pick command line merge support
2023-06-12 13:40:06 -07:00
687ecd4536
cherry-pick --abort support
2023-06-12 12:53:08 -07:00
e610d000ab
Merge pull request #6086 from dolthub/fulghum/skip-empty-commit
...
Add support for `--skip-empty` to `dolt commit` and `dolt_commit()`
2023-06-06 08:50:47 -07:00
25190826ff
Merge pull request #6077 from dolthub/fulghum/schema-merge
...
Evaluate column default expressions during merge
2023-06-06 08:50:33 -07:00
c1ed21669a
[ga-bump-release] Update Dolt version to 1.2.5 and release v1.2.5
2023-06-06 05:24:11 +00:00
0d29270878
[auto-bump] [no-release-notes] dependency by max-hoffman ( #6091 )
...
* [ga-bump-dep] Bump dependency in Dolt by max-hoffman
* collation test
---------
Co-authored-by: max-hoffman <maximilian.wolfgang1@gmail.com >
Co-authored-by: Max Hoffman <max@dolthub.com >
2023-06-05 21:49:54 -07:00
c232144df9
Merge pull request #6087 from dolthub/james/err
...
[no-release-notes] add more info to constraint violation error
2023-06-05 15:42:08 -07:00
2df79e0778
Merge pull request #6015 from dolthub/nicktobey/addcommand
...
Migrate `dolt add` to use Sql backend.
2023-06-05 14:22:25 -07:00
0d88a6aab8
Fix case sensitivity issue in sql-local-remote.bats
2023-06-05 12:28:14 -07:00
63e74b7a3c
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2023-06-05 19:06:37 +00:00
f1503edfde
detailed and formatted error
2023-06-05 11:56:52 -07:00
be8056793e
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2023-06-05 18:22:38 +00:00
e313617cff
Merge branch 'main' of github.com:dolthub/dolt into nicktobey/addcommand
2023-06-05 11:14:01 -07:00
1f5a931e07
Merge pull request #6090 from dolthub/nicktobey/ci
...
Actually run bats tests in a configuration where all commands connect to a server process.
2023-06-05 11:12:51 -07:00
a0a90d9110
Remove dolt add test. It will get added with the actual dolt add migration PR.
2023-06-05 09:30:35 -07:00
79912bfe6a
xargs --no-run-if-empty does not exist on macOS, use xargs -r instead.
2023-06-04 18:07:32 -07:00
248fffdf08
Don't run dolt config --unset in tests if there are no vars to unset (because the test was skipped.)
2023-06-04 18:07:18 -07:00
c2f58bd406
Use correct matrix variable when setting env variable in ci-bats-unix.yaml
2023-06-04 18:07:05 -07:00
af6c15a221
Make sql-local-remote.bats more explicit about skipping remote-engine tests.
2023-06-04 18:06:52 -07:00
2596999362
Fix case sensitivity issue in sql-local-remote.bats test.
2023-06-04 18:06:26 -07:00
27b848623c
Ensure we skip sql-local-remote.bats when running in remote server CI mode.
2023-06-04 18:05:50 -07:00
b1d1ea80de
error
2023-06-03 00:03:48 -07:00
69f999531a
Merge pull request #6065 from dolthub/steph/dolt-blame
...
update dolt blame to use sql backend and accept specific revision
2023-06-02 23:51:16 -07:00
0d69f95604
Make exception in buildLateBinder for dolt sql-client
2023-06-02 17:46:59 -07:00
3935d9aff2
sql-local-remote.bats is for manually testing CLI commands in both local and remote mode. It shouldn't be included in the remote-server CI testing.
2023-06-02 15:28:49 -07:00
646178e098
Merge branch 'main' of github.com:dolthub/dolt into nicktobey/addcommand
2023-06-02 15:25:41 -07:00
e3ea1e031b
Delay getting a Queryist until after parsing command line args, in case --help is passed.
2023-06-02 15:18:13 -07:00
98f717e236
Give RevertCmd a CliCtx so it can pass it to AddCmd
2023-06-02 13:52:07 -07:00
54b8e0f4b3
adding more info to error and fixing tests
2023-06-02 13:46:31 -07:00
0b135017b0
Adding documentation that --skip-empty cannot be used together with --allow-empty
2023-06-02 12:53:54 -07:00
98b9a858b8
Adding support for --skip-empty for dolt commit and dolt_commit()
2023-06-02 12:49:48 -07:00
d5e3d075be
Fail early when running CliContext-using-commands outside of a repo, with an exception for specific commands.
2023-06-02 12:21:53 -07:00
694ea98a0e
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2023-06-02 19:12:08 +00:00
f285c5bbe2
update ref checking in dolt blame
2023-06-02 12:02:12 -07:00
Jason Fulghum