Commit Graph

19578 Commits

Author SHA1 Message Date
Jason Fulghum
25190826ff Merge pull request #6077 from dolthub/fulghum/schema-merge
Evaluate column default expressions during merge
2023-06-06 08:50:33 -07:00
max-hoffman
c1ed21669a [ga-bump-release] Update Dolt version to 1.2.5 and release v1.2.5 v1.2.5 2023-06-06 05:24:11 +00:00
Dustin Brown
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
Dustin Brown
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
Nick Tobey
2df79e0778 Merge pull request #6015 from dolthub/nicktobey/addcommand
Migrate `dolt add` to use Sql backend.
2023-06-05 14:22:25 -07:00
Nick Tobey
0d88a6aab8 Fix case sensitivity issue in sql-local-remote.bats 2023-06-05 12:28:14 -07:00
JCOR11599
63e74b7a3c [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-06-05 19:06:37 +00:00
James Cor
f1503edfde detailed and formatted error 2023-06-05 11:56:52 -07:00
nicktobey
be8056793e [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-06-05 18:22:38 +00:00
Nick Tobey
e313617cff Merge branch 'main' of github.com:dolthub/dolt into nicktobey/addcommand 2023-06-05 11:14:01 -07:00
Nick Tobey
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
Nick Tobey
a0a90d9110 Remove dolt add test. It will get added with the actual dolt add migration PR. 2023-06-05 09:30:35 -07:00
Nick Tobey
79912bfe6a xargs --no-run-if-empty does not exist on macOS, use xargs -r instead. 2023-06-04 18:07:32 -07:00
Nick Tobey
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
Nick Tobey
c2f58bd406 Use correct matrix variable when setting env variable in ci-bats-unix.yaml 2023-06-04 18:07:05 -07:00
Nick Tobey
af6c15a221 Make sql-local-remote.bats more explicit about skipping remote-engine tests. 2023-06-04 18:06:52 -07:00
Nick Tobey
2596999362 Fix case sensitivity issue in sql-local-remote.bats test. 2023-06-04 18:06:26 -07:00
Nick Tobey
27b848623c Ensure we skip sql-local-remote.bats when running in remote server CI mode. 2023-06-04 18:05:50 -07:00
James Cor
b1d1ea80de error 2023-06-03 00:03:48 -07:00
stephanie
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
Nick Tobey
0d69f95604 Make exception in buildLateBinder for dolt sql-client 2023-06-02 17:46:59 -07:00
Nick Tobey
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
Nick Tobey
646178e098 Merge branch 'main' of github.com:dolthub/dolt into nicktobey/addcommand 2023-06-02 15:25:41 -07:00
Nick Tobey
e3ea1e031b Delay getting a Queryist until after parsing command line args, in case --help is passed. 2023-06-02 15:18:13 -07:00
Nick Tobey
98f717e236 Give RevertCmd a CliCtx so it can pass it to AddCmd 2023-06-02 13:52:07 -07:00
James Cor
54b8e0f4b3 adding more info to error and fixing tests 2023-06-02 13:46:31 -07:00
Nick Tobey
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
stephkyou
694ea98a0e [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-06-02 19:12:08 +00:00
Stephanie You
f285c5bbe2 update ref checking in dolt blame 2023-06-02 12:02:12 -07:00
timsehn
a99ff81508 [ga-bump-release] Update Dolt version to 1.2.4 and release v1.2.4 v1.2.4 2023-06-02 17:22:21 +00:00
Tim Sehn
3fa8540839 Merge pull request #6080 from dolthub/fulghum-63ffc9c1
[auto-bump] [no-release-notes] dependency by fulghum
2023-06-02 10:13:04 -07:00
Stephanie You
b32c5e6fed updates dolt blame to work outside of dolt repos 2023-06-02 09:45:59 -07:00
coffeegoddd
bc95bd636e [ga-bump-release] Update Dolt version to 1.2.3 and release v1.2.3 v1.2.3 2023-06-02 13:52:17 +00:00
Nick Tobey
bef50ffebd Allow staging tables with merge conflicts. 2023-06-01 19:24:04 -07:00
stephkyou
62fff578ab [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-06-02 00:51:42 +00:00
Stephanie You
b8ad54f7e5 add validation for ref spec and more detailed error messaging in dolt blame 2023-06-01 17:39:07 -07:00
fulghum
e1caaed6d1 [ga-bump-dep] Bump dependency in Dolt by fulghum 2023-06-02 00:29:18 +00:00
Stephanie You
fc4d7439cd update local and remote tests for dolt blame to be more accurate 2023-06-01 16:34:40 -07:00
Jason Fulghum
492ec12bfe Adding merge support for evaluating column default expressions that contain column references and functions 2023-06-01 13:45:55 -07:00
bheni
d6aada5576 [ga-bump-release] Update Dolt version to 1.2.3 and release v1.2.3 2023-06-01 20:34:27 +00:00
Brian Hendriks
c3135f80e6 Merge pull request #6071 from dolthub/bh/replace-default-json-unmarshaller
replace encoding/json with goccy/go-json for improved unmarshalling
2023-06-01 13:25:30 -07:00
Brian Hendriks
23bf61489f Merge pull request #6075 from dolthub/bheni-6108505e
[auto-bump] [no-release-notes] dependency by bheni
2023-06-01 13:25:22 -07:00
Nick Tobey
6973ce302e Merge pull request #6060 from dolthub/nicktobey/bats
Test CI with automatic server connection for CLI commands.
2023-06-01 13:17:53 -07:00
Nick Tobey
3f327f24fe Ensure that SKIP_SERVER_TESTS won't match on a file name that is a superset of the intended file name, by adding a delimiter. 2023-06-01 11:41:01 -07:00
Nick Tobey
09c723d9f6 Make clear when bats tests are using the remote engine. 2023-06-01 11:40:49 -07:00
Nick Tobey
5260397aed Add basic tests for dolt add 2023-06-01 11:40:45 -07:00
Brian Hendriks
358594ec76 update licenses 2023-06-01 11:32:02 -07:00
bheni
d85f39ea04 [ga-bump-dep] Bump dependency in Dolt by bheni 2023-06-01 18:30:40 +00:00
Dustin Brown
cd2a24569b Merge pull request #6073 from dolthub/db/fix-dockerfiles
[no-release-notes] /docker/{Dockerfile, serverDockerfile}: install ca-certificates
2023-06-01 11:09:47 -07:00
coffeegoddd
2b519441fb /docker/{Dockerfile, serverDockerfile}: install ca-certificates 2023-06-01 10:56:26 -07:00