Jason Fulghum
070127bf92
Adding support for: 1) data diff patch statements when there are schema changes, and 2) charset/collation change patch statements.
2023-07-20 14:00:11 -07:00
stephanie
3e8b35d303
Merge pull request #6288 from dolthub/steph/dolt-merge
...
migrates dolt merge to use sql queries
2023-07-20 09:33:53 -07:00
Stephanie You
ea418cda38
dolt merge doesn't fail if unable to get hash
2023-07-19 23:28:12 -07:00
Neil Macneale IV
fd343b068a
Merge pull request #6363 from dolthub/macneale4/cli-remote-connection
...
Enable the connection of SQL enabled CLI commands to remote servers with addition of three flags:
--host - The server to connect to. Using this flag forces the use of a remote connection no matter what.
--port - The port to use. Defaults to 3306. No effect when --host is not used.
--no-tls - Disable the use of SSL. This is required to connect to your local host.
Also special cased the sql command to allow starting without a DB. Enables connecting to an empty repo so you can CREATE DATABASE FOO.
Related: https://github.com/dolthub/dolt/issues/3922
2023-07-19 19:35:57 -07:00
Neil Macneale IV
5e315b1844
Disallow --port without --host
2023-07-19 16:48:04 -07:00
Neil Macneale IV
83ad77d35a
PR Feedback
2023-07-19 16:38:07 -07:00
Neil Macneale IV
a9d8f87ee9
Seed tests which talk to a hosted intance from the CLI
2023-07-19 14:56:31 -07:00
Neil Macneale IV
6e7d9d12a3
Add the --host and --port flags to enable connecting to remote servers
...
Also includes the --no-tls flag, which enables using local server.
2023-07-19 14:56:31 -07:00
Neil Macneale IV
590c7e5a82
Allow the use of an env var for the cli user id
2023-07-19 14:56:23 -07:00
Neil Macneale IV
bc6445c971
Add RequiresRepo -> diff and show
2023-07-19 13:49:20 -07:00
Dustin Brown
06eb41b87a
[ga-bump-dep] Bump dependency in Dolt by JCOR11599 ( #6359 )
2023-07-19 10:25:04 -07:00
stephkyou
62d34109a5
[ga-bump-release] Update Dolt version to 1.8.0 and release v1.8.0
v1.8.0
2023-07-19 16:46:57 +00:00
Stephanie You
508630b383
fix dolt merge engine test
2023-07-19 08:41:36 -07:00
stephanie
90bddd87e1
Merge branch 'main' into steph/dolt-merge
2023-07-18 22:28:00 -07:00
Stephanie You
e141787cb8
fix dolt merge bats tests
2023-07-18 22:27:13 -07:00
Neil Macneale IV
f553866939
Merge pull request #6346 from dolthub/macneale4/empty-db-panic
...
Allow empty databases in the shell prompt
2023-07-18 17:14:30 -07:00
Neil Macneale IV
e94d0b26fb
Remove mistaken insert
...
Co-authored-by: Jason Fulghum <jason@dolthub.com >
2023-07-18 17:14:08 -07:00
Stephanie You
50c9f6464d
Merge branch 'main' into steph/dolt-merge
2023-07-18 16:24:04 -07:00
stephanie
07a49cc940
Merge pull request #6344 from dolthub/steph/sql-merge
...
updates `dolt_merge` to allow dirty working sets with no conflicts
2023-07-18 16:00:24 -07:00
Neil Macneale IV
cc65904ec6
Allow empty databases in the shell prompt
2023-07-18 15:57:55 -07:00
Neil Macneale IV
4e147dcd8d
Verify that a prompt can be an empty string using expect
2023-07-18 15:56:43 -07:00
Stephanie You
a2aee19039
fix print error message
2023-07-18 14:52:52 -07:00
Stephanie You
ff479ddd71
Merge branch 'main' into steph/sql-merge
2023-07-18 13:13:04 -07:00
Dustin Brown
1901dfeae2
Merge pull request #6361 from dolthub/db/fix-ci
...
/go/performance/continuous_integration/SysbenchDockerfile: change distro from buster to bullseye
2023-07-18 13:04:30 -07:00
coffeegoddd
7188cddc25
/go/performance/continuous_integration: install sysbench from source
2023-07-18 13:03:41 -07:00
Jason Fulghum
0910b1de84
Merge pull request #6352 from dolthub/fulghum/dolt-6350
2023-07-18 13:01:10 -07:00
coffeegoddd
5b52e07c16
/go/performance/continuous_integration/SysbenchDockerfile: change distro from buster to bullseye
2023-07-18 11:41:46 -07:00
Tim Sehn
c6c405d3fb
Merge pull request #6360 from dolthub/tim/readme-1
...
Slightly better copy in README opening
2023-07-18 11:20:19 -07:00
Tim Sehn
6f1f4e442a
Slightly better copy in README opening
2023-07-18 10:54:55 -07:00
Stephanie You
31f6f068c5
Merge branch steph/sql-merge into steph/dolt-merge
2023-07-18 10:50:29 -07:00
Stephanie You
673eff7226
update error print
2023-07-18 10:48:07 -07:00
Jason Fulghum
b091ff307a
Fix for handling strings as binary hex
2023-07-18 09:54:05 -07:00
Stephanie You
a2fbaab00d
update variable names
2023-07-18 09:45:37 -07:00
stephanie
930f3a1437
Merge branch 'main' into steph/dolt-merge
2023-07-17 16:49:46 -07:00
Stephanie You
45d6afe5d2
address PR comments
2023-07-17 16:48:40 -07:00
fulghum
40ce60b47c
[ga-bump-release] Update Dolt version to 1.7.6 and release v1.7.6
v1.7.6
2023-07-17 23:26:08 +00:00
Jason Fulghum
6e2dd9f41d
Moving tests from TestSingleScript to dolt_patch engine tests
2023-07-17 15:30:55 -07:00
Jason Fulghum
077029d565
Excluding BlobStringTypeIdentifier from treating as a []byte
2023-07-17 15:17:07 -07:00
Stephanie You
af1a8b5ad2
Merge branch 'main' into steph/dolt-merge
2023-07-17 15:04:04 -07:00
Jason Fulghum
2bc1ee8e9b
Adding a BATS test for sql output with hex-encoded binary values
2023-07-17 14:55:20 -07:00
Stephanie You
45a8fa576e
fixes CI tests
2023-07-17 14:34:47 -07:00
Jason Fulghum
fd64f18b4c
Merge pull request #6331 from dolthub/fulghum/dolt-6319
...
Update unique constraint violations when rows are deleted
2023-07-17 14:11:57 -07:00
Jason Fulghum
f977c89b31
typo fix
2023-07-17 14:11:26 -07:00
Jason Fulghum
126b2d6b92
First pass on encoding binary values in hex for SQL patch statement output
2023-07-17 14:03:45 -07:00
Jason Fulghum
c244ff1c24
Tidying up
2023-07-17 11:48:15 -07:00
Stephanie You
cde9b2fc1a
addresses PR comments
2023-07-17 11:26:41 -07:00
Jason Fulghum
cb84cbb2d5
Cleaning up tests
2023-07-17 10:20:55 -07:00
Dustin Brown
61acf32b07
Merge pull request #6326 from dolthub/db/rm-format-str
...
[no-release-notes] /.github/scripts/{performance-benchmarking,sql-correctness}: remove doltnbf from key string
2023-07-17 09:59:47 -07:00
Neil Macneale IV
35159313be
Small changes to help improve the wait_for_connection failures ( #6345 )
...
* Pick from a random port from 2048 - 6146
* Use `nc` to check if port is in use rather than lsof
* Wait longer, in case the server retries successfully.
2023-07-14 17:43:06 -07:00
stephkyou
e5a9eba4ec
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2023-07-14 21:59:52 +00:00