diff --git a/go/go.mod b/go/go.mod index 897c5f155c2..9608cbf2050 100644 --- a/go/go.mod +++ b/go/go.mod @@ -15,7 +15,7 @@ require ( github.com/dolthub/fslock v0.0.3 github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488 github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 - github.com/dolthub/vitess v0.0.0-20240117061527-f9260279b3d3 + github.com/dolthub/vitess v0.0.0-20240117231546-55b8c7b39462 github.com/dustin/go-humanize v1.0.1 github.com/fatih/color v1.13.0 github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568 @@ -57,7 +57,7 @@ require ( github.com/cespare/xxhash v1.1.0 github.com/creasty/defaults v1.6.0 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.17.1-0.20240117075138-f66e0253d331 + github.com/dolthub/go-mysql-server v0.17.1-0.20240117234409-91a2a9d4b1a1 github.com/dolthub/swiss v0.1.0 github.com/goccy/go-json v0.10.2 github.com/google/go-github/v57 v57.0.0 diff --git a/go/go.sum b/go/go.sum index 53ad8ebf2dc..3651f0fd85a 100644 --- a/go/go.sum +++ b/go/go.sum @@ -183,8 +183,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U= github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0= github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e h1:kPsT4a47cw1+y/N5SSCkma7FhAPw7KeGmD6c9PBZW9Y= github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e/go.mod h1:KPUcpx070QOfJK1gNe0zx4pA5sicIK1GMikIGLKC168= -github.com/dolthub/go-mysql-server v0.17.1-0.20240117075138-f66e0253d331 h1:WPYOfoC37qa6Ul5f2dkVUFad6RACJ07EQgvNW0rFSjA= -github.com/dolthub/go-mysql-server v0.17.1-0.20240117075138-f66e0253d331/go.mod h1:m7avfVLGUe9zdJbYE4HVjbhhx7EFW9d2qYZf0mVBDWg= +github.com/dolthub/go-mysql-server v0.17.1-0.20240117234409-91a2a9d4b1a1 h1:CPdkEWpNyz6H1380wwR+pkxXpBQF7vRTjZ7fb/UCqWs= +github.com/dolthub/go-mysql-server v0.17.1-0.20240117234409-91a2a9d4b1a1/go.mod h1:hS8Snuzg+nyTDjv4NI9jiXQ2lJJOd3O0ylhVPQlHySw= github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488 h1:0HHu0GWJH0N6a6keStrHhUAK5/o9LVfkh44pvsV4514= github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488/go.mod h1:ehexgi1mPxRTk0Mok/pADALuHbvATulTh6gzr7NzZto= github.com/dolthub/jsonpath v0.0.2-0.20230525180605-8dc13778fd72 h1:NfWmngMi1CYUWU4Ix8wM+USEhjc+mhPlT9JUR/anvbQ= @@ -195,8 +195,8 @@ github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 h1:7/v8q9X github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81/go.mod h1:siLfyv2c92W1eN/R4QqG/+RjjX5W2+gCTRjZxBjI3TY= github.com/dolthub/swiss v0.1.0 h1:EaGQct3AqeP/MjASHLiH6i4TAmgbG/c4rA6a1bzCOPc= github.com/dolthub/swiss v0.1.0/go.mod h1:BeucyB08Vb1G9tumVN3Vp/pyY4AMUnr9p7Rz7wJ7kAQ= -github.com/dolthub/vitess v0.0.0-20240117061527-f9260279b3d3 h1:nEwq2/8gTI2jm/4APIMTrWNDDRCn8AWJjrCbH+d7CJc= -github.com/dolthub/vitess v0.0.0-20240117061527-f9260279b3d3/go.mod h1:IwjNXSQPymrja5pVqmfnYdcy7Uv7eNJNBPK/MEh9OOw= +github.com/dolthub/vitess v0.0.0-20240117231546-55b8c7b39462 h1:So1KO202cb047yWg5X27xRso6tkSYmU0Yu96JIVsaEU= +github.com/dolthub/vitess v0.0.0-20240117231546-55b8c7b39462/go.mod h1:IwjNXSQPymrja5pVqmfnYdcy7Uv7eNJNBPK/MEh9OOw= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= diff --git a/integration-tests/bats/sql-server.bats b/integration-tests/bats/sql-server.bats index 2b60dcfaa5b..f29a494bbec 100644 --- a/integration-tests/bats/sql-server.bats +++ b/integration-tests/bats/sql-server.bats @@ -157,7 +157,7 @@ EOF start_sql_server run dolt --use-db repo1 sql -q "SELECT @@repo1_default_branch;" [ $status -eq 0 ] - [[ $output =~ "@@SESSION.repo1_default_branch" ]] || false + [[ $output =~ "@@repo1_default_branch" ]] || false [[ $output =~ "dev" ]] || false } diff --git a/integration-tests/go-sql-server-driver/tests/sql-server-config.yaml b/integration-tests/go-sql-server-driver/tests/sql-server-config.yaml index b31f2e9cbad..ccd5067485e 100644 --- a/integration-tests/go-sql-server-driver/tests/sql-server-config.yaml +++ b/integration-tests/go-sql-server-driver/tests/sql-server-config.yaml @@ -86,7 +86,7 @@ tests: rows: [["main"]] - query: "select @@dolt_replicate_heads" result: - columns: ["@@SESSION.dolt_replicate_heads"] + columns: ["@@dolt_replicate_heads"] rows: [["main"]] - name: dolt_replicate_all_heads is global variable repos: @@ -114,7 +114,7 @@ tests: rows: [["1"]] - query: "select @@dolt_replicate_all_heads" result: - columns: ["@@SESSION.dolt_replicate_all_heads"] + columns: ["@@dolt_replicate_all_heads"] rows: [["1"]] - name: dolt_transaction_commit is global variable repos: @@ -142,7 +142,7 @@ tests: rows: [["1"]] - query: "select @@dolt_transaction_commit" result: - columns: ["@@SESSION.dolt_transaction_commit"] + columns: ["@@dolt_transaction_commit"] rows: [["1"]] - query: "select count(*) from dolt_log" result: