Commit Graph

18875 Commits

Author SHA1 Message Date
James Cor bd3d67387f Merge branch 'main' into james/alter 2023-04-27 16:46:10 -07:00
James Cor e5c289399d bump 2023-04-27 16:45:52 -07:00
Neil Macneale IV 0b9bc8d077 --data-dir flag enabled before the sql subcommand
The complexity of creating global arguments is being broken into multiple pieces. This step includes the breaking up of the top level dolt command set to enable global argument parsing and initialization of the CliContext. At present, the sql subcommand is the only one getting this treatment, but it will be extended with additional commands in the future.

This change doesn't change much that is visible to the user, with the exception of the --data-dir flag being enabled before the sql subcommand.

https://github.com/dolthub/dolt/issues/3922
2023-04-26 22:01:18 -07:00
Aaron Son 9403d234e7 Merge pull request #5814 from dolthub/aaron/multirepoenv-dial-provider-from-bootstrap
go/libraries/doltcore/env/multi_repo_env.go: Always use the GRPCDialProvider from the bootstrap env for the MultiRepoEnv RemoteDialProvider.
2023-04-26 16:45:06 -07:00
Neil Macneale IV 18cb3e7f9d Allow dolt as a bare command 2023-04-26 16:19:59 -07:00
James Cor da422f6da2 enough to stop panics 2023-04-26 16:07:44 -07:00
Jason Fulghum 3bee1f35cd Merge pull request #5806 from dolthub/fulghum/schema-merge
Report schema conflicts for merges with column type changes
2023-04-26 15:36:56 -07:00
Aaron Son e2fce1bba7 go/libraries/doltcore/env/multi_repo_env.go: Always use the GRPCDialProvider from the bootstrap env for the MultiRepoEnv RemoteDialProvider.
Fixes #5811.
2023-04-26 15:13:57 -07:00
Dustin Brown 8da064594a Update ci-check-repo.yaml 2023-04-26 13:58:37 -07:00
macneale4 616f0851c5 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-04-26 20:51:40 +00:00
Neil Macneale IV fac735b543 PR Feedback and removing a panic required to speed testing up 2023-04-26 13:39:04 -07:00
Neil Macneale IV f3b98bc4fe Support case insensitive subcommand names 2023-04-26 13:39:04 -07:00
Neil Macneale IV 0f8c162e2a dolt rm and dolt mv want to join the party 2023-04-26 13:39:04 -07:00
Neil Macneale IV 213de8c5cb More test fixes with CliContext 2023-04-26 13:39:04 -07:00
Neil Macneale IV d81e1a2a77 Enable the blame command for global args, since it depends on sql command 2023-04-26 13:39:04 -07:00
Neil Macneale IV 471c163cdf Fix tests by passing in an empty CliContext 2023-04-26 13:39:04 -07:00
Neil Macneale IV e89e99b89c Ensure CliContext is never null for sql subcommand 2023-04-26 13:39:04 -07:00
Neil Macneale IV 0e053d4fe7 Test for new --data-dir option as global arg to sql subcommand 2023-04-26 13:39:04 -07:00
Neil Macneale IV 811b5598cf Revive dolt --help and dolt -h 2023-04-26 13:39:04 -07:00
Neil Macneale IV f0d68164fc Usage documentation for when bad arguments presented before subcommand. 2023-04-26 13:39:04 -07:00
Neil Macneale IV c50c0c3142 Preserve the knowledge that the dataDir argument was provided 2023-04-26 13:39:04 -07:00
Neil Macneale IV 7f397ff591 Refactor apr usage in sql.Exec
Having duling argument results was resulting in confusion, but not fully addressed yet.
2023-04-26 13:39:04 -07:00
Neil Macneale IV 0995b8217d Lay groundwork for global argument flags 2023-04-26 13:39:04 -07:00
Neil Macneale IV 8836a29409 Expose some constants and functions which will be used in other contexts 2023-04-26 13:39:04 -07:00
Jason Fulghum f4a9cbae4c Merge branch 'main' into fulghum/schema-merge 2023-04-26 11:29:24 -07:00
Dustin Brown c5c415e439 Merge pull request #5810 from dolthub/db/fix-format-script
[no-release-notes]Db/fix format script
2023-04-26 11:21:16 -07:00
coffeegoddd 584609e848 /.github/workflows/ci-check-repo.yaml: move protobuf check to after formatting 2023-04-26 11:06:31 -07:00
coffeegoddd 969a9a3f21 /go/utils/repofmt/format_repo.sh: allow format script to touch gen files 2023-04-26 10:58:57 -07:00
Jason Fulghum 28dcf824f6 Merge branch 'main' into fulghum/schema-merge 2023-04-26 10:05:37 -07:00
Jason Fulghum 8ac8575a93 Reusing the existing NameCollision column conflict type 2023-04-26 10:02:07 -07:00
Jason Fulghum 341e992d12 Tidying up comments 2023-04-26 09:32:11 -07:00
AndyA f25deecfca Merge pull request #5805 from dolthub/andy/schema-conflict-context
[no-release-notes] go/{commands, doltcore/merge}: improve schema conflicts UX
2023-04-26 09:29:09 -07:00
Nick Tobey 1d51563220 Merge pull request #5783 from dolthub/nicktobey/dolt-show
`dolt show` supports displaying non-commit objects.
2023-04-25 16:58:27 -07:00
Jason Fulghum 20b3333ab9 First pass on reporting schema conflicts for merges with column type changes 2023-04-25 16:55:16 -07:00
Andy Arthur 445d98ade5 go/commands: add schema conflicts to dolt conflicts cat output 2023-04-25 16:43:04 -07:00
Andy Arthur 1bfe045d2f go/doltcore/{merge,sqle}: populate description column for dolt_schema_conflicts table 2023-04-25 15:29:59 -07:00
nicktobey ecfbc0f5fd [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-04-25 22:29:04 +00:00
Taylor Bantle 0630a5345d Merge pull request #5803 from dolthub/taylor/fix-creds-check
Fix dolt creds check with specified endpoint
2023-04-25 15:14:58 -07:00
Jason Fulghum fd30e9456c Merge pull request #5790 from dolthub/fulghum/schema-merge
Bug fix and test for index merge bug that didn't detect incompatible index types
2023-04-25 15:07:08 -07:00
Nick Tobey 00f3118dce Move ParseHashString localling into show.go 2023-04-25 15:04:01 -07:00
AndyA d78190b2b9 Merge pull request #5800 from dolthub/andy/update-parse-create-table
go/doltcore/{sqle, merge}: Update sqlutil.ParseCreateTable to fix test gaps in schema merge suite
2023-04-25 14:49:44 -07:00
Taylor Bantle bc840837d1 Fix dolt creds check with specified endpoint 2023-04-25 13:36:44 -07:00
Nick Tobey 8882a79f42 Remove unused method. 2023-04-25 13:16:03 -07:00
Nick Tobey 61b1f12a8a Fix docs typo 2023-04-25 13:15:57 -07:00
Tim Sehn 0b41b7a558 Changed h2 to h1 in README 2023-04-25 12:46:24 -07:00
Andy Arthur dc00e49072 Godeps: update LICENSES 2023-04-25 12:44:29 -07:00
Jason Fulghum 5ba39bec7c Updating from new schema conflict reporting 2023-04-25 11:57:44 -07:00
Jason Fulghum ecf9d4bf9b Merge branch 'main' into fulghum/schema-merge 2023-04-25 11:46:18 -07:00
Andy Arthur 557c62b318 go/doltcore/merge: skip failing old format schema merge test 2023-04-25 11:45:46 -07:00
Dustin Brown 76bf2ebae3 update ci-check-repo.yaml: test prevent double runs 2023-04-25 11:38:01 -07:00