Commit Graph

2509 Commits

Author SHA1 Message Date
Jason Fulghum a532614edb Merge pull request #6570 from dolthub/fulghum/bugfix-2
Bug fix:  Correctly detect uncommitted changes for `dolt_pull` when roots have different feature versions
2023-08-23 13:45:33 -07:00
Neil Macneale IV 7618863b3c Merge pull request #6537 from Nithinps021/branch-param-to-global-args
Added the `--branch` parameter to Dolt global arguments on the command line.
2023-08-23 13:35:38 -07:00
James Cor 89d79f751d adding query-diff cli command (#6514)
* starting on reviving console command

* this does something

* working, definitely not jank

* simple same table diff working

* implementation for different tables

* remove old code

* adding tests and TODO

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

* working as a table function

* fix space

* better schema

* handle different schemas

* asdf

* bump

* bump

* bump

* point CLI to table function

* cleaning up code

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

* queries

* adding enginetests

* more test

* bats tests

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

* bump

* bump again

---------

Co-authored-by: James Cor <james@dolthub.com>
Co-authored-by: JCOR11599 <JCOR11599@users.noreply.github.com>
Co-authored-by: Max Hoffman <max@dolthub.com>
2023-08-23 13:11:59 -07:00
Jason Fulghum 58d08a203c Adding a BATS test for dolt_pull uncommitted changes error on different feature version 2023-08-23 12:04:58 -07:00
Neil Macneale IV 4b8e0ee614 Merge remote-tracking branch 'origin/main' into branch-flag 2023-08-23 10:00:56 -07:00
Neil Macneale IV 940cd181d0 Merge pull request #6531 : Empty Servers allow sql command to connect
WIth this change, starting sql-server will result in creating a .dolt/sql-server.lock file in the --data-dir (CWD by default). This file will be used for two purposes: 1) Ensuring another dolt sql-server is not started with the same data dir. 2) Allowing the dolt sql command to connect to it.
2023-08-22 16:12:51 -07:00
Aaron Son 48cf308d05 Merge pull request #6454 from dolthub/aaron/cluster-replication-users-and-grants
go/libraries/doltcore/sqle/cluster: Add replication of user and grant changes from primary to standby replicas.
2023-08-22 13:28:35 -07:00
Neil Macneale IV 79a2885579 PR Feedback - remove teardown call 2023-08-22 12:17:06 -07:00
Neil Macneale IV 899cc45edb Empty .dolt directories won't cause trouble for init and sql commands. 2023-08-22 12:12:37 -07:00
Nithin PS 7538ffd783 changed db1/b1 to db1 2023-08-22 17:23:30 +00:00
Neil Macneale IV 5e48317f90 Support single arg version of branch copy/move 2023-08-22 08:27:46 -07:00
Neil Macneale IV a505266208 Validate new branch name when moving and copying 2023-08-21 15:32:53 -07:00
Neil Macneale IV f88d26b6b3 Tests for empty branch creation output and rejecting bad branch names added. 2023-08-21 11:10:44 -07:00
Daylon Wilkins 9c212f60d2 Fixed bump 2023-08-21 01:27:52 -07:00
Neil Macneale IV 8034567916 Ensure that the --data-dir flag does what we expect it to 2023-08-18 14:46:31 -07:00
Neil Macneale IV 47b58258ef Two additional sql-server tests
Servers don't start where other servers are
`dolt sql` can connect to the empty server
2023-08-18 14:46:31 -07:00
Neil Macneale IV 74759c5e1b Simplify error message to fix test 2023-08-18 14:46:31 -07:00
Neil Macneale IV 65dcd39c3e Tests for the global --branch flag 2023-08-18 14:32:00 -07:00
Zach Musgrave 91d11267b7 Merge pull request #6532 from dolthub/nicktobey/checkout
When checking out a branch, consider it clean if the working set differs from the head only by feature version.
2023-08-18 12:50:58 -07:00
Zach Musgrave b6c027c146 merge main 2023-08-18 11:23:31 -07:00
Zach Musgrave 5acf3a794d Fixed tests 2023-08-18 11:13:36 -07:00
Nick Tobey 2bf4e4c894 fix typo in test description 2023-08-18 09:01:12 -07:00
Nick Tobey d38f809eb1 Add regression test for feature version checkout bug. 2023-08-17 16:10:21 -07:00
Tim Sehn 0533d1f451 Merge pull request #6526 from dolthub/tim/remove-no-db
`dolt version` only prints the dolt version if there is no dolt database in the directory.
2023-08-17 15:22:21 -07:00
Tim Sehn 0f34e4d0a9 remove useless test 2023-08-17 13:32:57 -07:00
Tim Sehn 4b9d901085 Also updated bats 2023-08-17 13:09:28 -07:00
Daylon Wilkins 403aeba375 Removed Full-Text tables from 'schema show' 2023-08-17 11:22:03 -07:00
Maximilian Hoffman 22068f6407 [no-release-notes] gms bump for name res (#6490)
* [no-release-notes] gms bump

* comments

* merge main

* del local repo refs

* tidy

* tidy

* eventsapi

* more tests

* fix import

* import/diff fixes

* diff panic

* test changes

* import backtick col names

* sysvar name error

* bump

* more import fixes

* fix test to match mysql

* bump

* more fixes

* more fixes

* no prepared count checking

* bump

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

* inline type lookup

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

* no mod replace

* bump

* bump revert

---------

Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com>
2023-08-16 19:24:32 -07:00
Jason Fulghum 4beaf524de Merge pull request #6465 from dolthub/fulghum/ansi_quotes
`ANSI_QUOTES` support
2023-08-16 14:08:16 -07:00
coffeegoddd 0560968b80 /{go,integration-tests}: prevent load_file() from dolt sql cli 2023-08-16 11:17:24 -07:00
coffeegoddd a8713f8394 /integration-tests/bats/sql.bats: sorta correct bats test 2023-08-16 10:23:13 -07:00
coffeegoddd 374b7ee69a /integration-tests/bats/sql.bats: wip, adding failing test for sql cli load file 2023-08-16 09:59:34 -07:00
Jason Fulghum 09f1c00c4d Updating tests from bumping feature version 2023-08-16 09:57:36 -07:00
Jason Fulghum 3ee51bb0eb Updating BATS for feature version bump 2023-08-16 09:00:40 -07:00
Aaron Son 6d7c73575d dolt sql-server: Add a system_variables: key to config.yaml, which allows setting global system variables.
For example, this can be used to set `secure_file_priv` when the server starts
up. That variable is non-dynamic, so it cannot be set with `SET @@GLOBAL...`
2023-08-15 15:53:18 -07:00
Jason Fulghum 4c99636c75 Merge branch 'main' into fulghum/ansi_quotes 2023-08-15 15:51:46 -07:00
Aaron Son 38eeec5b73 Merge remote-tracking branch 'origin/main' into aaron/cluster-replication-users-and-grants 2023-08-14 11:11:03 -07:00
Daylon Wilkins 4b86b73a39 Fixed Full-Text merge bug, removed pseudo-index tables from view 2023-08-10 04:17:59 -07:00
Jason Fulghum 7056549946 Merge pull request #6480 from dolthub/fulghum/bats
[no-release-notes] Automated check to prevent future bash test bugs on Mac
2023-08-09 20:34:54 -07:00
Jason Fulghum 329205558d Merge pull request #6470 from dolthub/fulghum/bugfix
Bug Fix: Error on merges that produce schema conflicts when `@@autocommit` is enabled
2023-08-09 16:12:48 -07:00
Jason Fulghum 13a61323bc Removing the testing lines that triggered test failures 2023-08-09 15:28:15 -07:00
Jason Fulghum 88d8efb0d5 Merge branch 'main' into fulghum/ansi_quotes 2023-08-09 15:24:03 -07:00
Jason Fulghum 030b7db819 Fixing up tests from dolt_schemas schema change 2023-08-09 15:21:12 -07:00
Jason Fulghum 989f36d497 Tidying up 2023-08-09 15:16:15 -07:00
Jason Fulghum 796ce4ec01 Trying out an automated check to prevent future bash test bugs on Mac 2023-08-09 14:38:32 -07:00
Jason Fulghum 8b52c90c1f Added expected sql_mode column 2023-08-09 14:23:48 -07:00
Jason Fulghum 6f03849f56 Testing that we can round trip a dolt dump with ANSI_QUOTES mode used 2023-08-09 12:30:05 -07:00
Jason Fulghum 4773192a50 Fixing missing "|| false" in BATS files 2023-08-09 12:10:14 -07:00
Jason Fulghum c15bf734b4 Fixing more test bugs 2023-08-08 17:30:10 -07:00
Jason Fulghum 859e8e4c01 One more BATS test fix 2023-08-08 16:17:59 -07:00