Commit Graph

20887 Commits

Author SHA1 Message Date
Nick Tobey 3f9bc80370 Refactor to move feature version checking logic into CheckoutWouldStompWorkingSetChanges 2023-08-18 10:29: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
Nick Tobey 04b26f029e When checking out a new branch, check if the working sets differ from their heads only in their feature version. 2023-08-17 16:10:17 -07:00
Nick Tobey f1f9b80a1d When checking out a new branch, the new branch cannot possibly be dirty, so we can skip a check on whether the new branch has a dirty working set. 2023-08-17 13:56:50 -07:00
fulghum 80e1a646b0 [ga-bump-release] Update Dolt version to 1.11.1 and release v1.11.1 v1.11.1 2023-08-17 06:00:35 +00:00
Jason Fulghum ef6e67b4ac Merge pull request #6523 from dolthub/fulghum/schema-merge-rewriter
Changing primary index to use the Rewriter function, instead of Mutate
2023-08-16 22:49:36 -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 4b31561edf Changing primary index to use the Rewriter function, instead of Mutate, to ensure that the tuple descriptors use the correct types (and don't do address validation on unnecessary data) 2023-08-16 18:37:55 -07:00
zachmu 7d1b2a8068 [ga-bump-release] Update Dolt version to 1.11.0 and release v1.11.0 v1.11.0 2023-08-17 00:28:40 +00:00
Jason Fulghum 4beaf524de Merge pull request #6465 from dolthub/fulghum/ansi_quotes
`ANSI_QUOTES` support
2023-08-16 14:08:16 -07:00
Dustin Brown 59033c5e56 Merge pull request #6515 from dolthub/db/sql
Prevent `dolt sql` from allowing `LOAD_FILE` from directories outside of working directory
2023-08-16 13:04:49 -07:00
Neil Macneale IV 439dd8f493 Merge pull request #6506 from dolthub/macneale4/drop-aws-args
Drop the aws flags from the `dolt_remote()`  and `dolt_clone()` procedures
2023-08-16 12:21:54 -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
Neil Macneale IV 5b25f9442a Remove AWS arguments from dolt_clone() 2023-08-16 09:31:48 -07:00
Neil Macneale IV 9a23b942bb Fix descriptions for region and type 2023-08-16 09:02:04 -07:00
Jason Fulghum 3ee51bb0eb Updating BATS for feature version bump 2023-08-16 09:00:40 -07:00
Jason Fulghum 15394eb8f7 Merge pull request #6511 from dolthub/fulghum/schema-merge 2023-08-15 18:03:04 -07:00
Aaron Son 48bb1d26f2 Merge pull request #6513 from dolthub/aaron/config-yaml-server_variables
dolt sql-server: Add a system_variables: key to config.yaml, which allows setting global system variables.
2023-08-15 17:31:39 -07:00
Jason Fulghum 33d2d63ba6 Merge branch 'main' into fulghum/ansi_quotes 2023-08-15 17:26:05 -07:00
Jason Fulghum daa149891c Updating head commit value for tests, from changing FeatureVersion from 3 to 4. 2023-08-15 17:09:42 -07:00
Daylon Wilkins 864d926d45 Merge pull request #6512 from dolthub/Hydrocharged-88f41939
[auto-bump] [no-release-notes] dependency by Hydrocharged
2023-08-15 17:03:53 -07:00
Jason Fulghum c4f73a03b4 Bumping to latest dev builds of go-mysql-server from fulghum/ansi_quotes branch 2023-08-15 16:30:46 -07:00
reltuk 96cd18f845 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-08-15 23:04:20 +00: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
Jason Fulghum 488bd40b11 PR feedback 2023-08-15 15:38:39 -07:00
Neil Macneale IV d92b7c3f90 Remove the AWS flags from the dolt_remote function 2023-08-15 15:02:18 -07:00
Jason Fulghum 5580f3d851 Bumping DoltFeatureVersion 2023-08-15 14:53:52 -07:00
Daylon Wilkins 9079bace2d Readded Full-Text drop column test 2023-08-15 14:47:33 -07:00
Hydrocharged 4407d025bb [ga-bump-dep] Bump dependency in Dolt by Hydrocharged 2023-08-15 21:43:19 +00:00
Jason Fulghum bd644b8774 Bug fix for panic in schema merge when schema contains BLOB columns 2023-08-15 13:39:10 -07:00
Aaron Son 559cbcbefc Merge pull request #6505 from dolthub/add-security-policy
Create SECURITY.md
2023-08-14 15:56:25 -07:00
Aaron Son 2c3b2b65e6 Add reference to SECURITY.md in README.md 2023-08-14 15:34:57 -07:00
Aaron Son 8704eea5fa Create SECURITY.md 2023-08-14 15:28:54 -07:00
Daylon Wilkins 45ee8f3317 Merge pull request #6485 from dolthub/daylon/ft-merge-fixes
Fixed Full-Text merge bug, removed pseudo-index tables from view
2023-08-14 15:13:11 -07:00
Nick Tobey cda023d17b Merge pull request #6501 from dolthub/nicktobey-cee5b01d
[auto-bump] [no-release-notes] dependency by nicktobey
2023-08-14 11:36:51 -07:00
nicktobey 73ce3e2aa5 [ga-bump-dep] Bump dependency in Dolt by nicktobey 2023-08-11 23:27:13 +00:00
macneale4 6253c53a2c [ga-bump-release] Update Dolt version to 1.10.1 and release v1.10.1 v1.10.1 2023-08-11 16:23:50 +00:00
Neil Macneale IV dc29700862 Merge pull request #6495 from dolthub/macneale4-3ab25584
[auto-bump] [no-release-notes] dependency by macneale4
2023-08-10 21:05:56 -07:00
macneale4 26a70ac527 [ga-bump-dep] Bump dependency in Dolt by macneale4 2023-08-10 22:14:23 +00:00
Zach Musgrave c797e96c99 Merge pull request #6494 from dolthub/zachmu/virtual-cols
[no-release-notes] fix breaking GMS interface change
2023-08-10 14:55:36 -07:00
zachmu dd2f918360 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-08-10 20:35:51 +00:00
Zach Musgrave 9c384cce97 Updated gms 2023-08-10 13:25:56 -07:00
Zach Musgrave ae4df4aff2 Merge main 2023-08-10 13:25:44 -07:00
Zach Musgrave 23adbf14b3 Updated gms 2023-08-10 13:25:02 -07:00
Zach Musgrave b05372263e Merge pull request #6492 from dolthub/zsh-plugin
Make gen-zsh command write to stdout
2023-08-10 13:17:51 -07:00