From 15d6aa406bb84695dcc75eb788ad22f6c669da69 Mon Sep 17 00:00:00 2001 From: James Cor Date: Mon, 14 Apr 2025 16:29:04 -0700 Subject: [PATCH 01/15] bump --- go/go.mod | 4 ++-- go/go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go/go.mod b/go/go.mod index 65948bd9c18..5e459f3ebdb 100644 --- a/go/go.mod +++ b/go/go.mod @@ -14,7 +14,7 @@ require ( github.com/dolthub/fslock v0.0.3 github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 - github.com/dolthub/vitess v0.0.0-20250410090211-143e6b272ad4 + github.com/dolthub/vitess v0.0.0-20250414213151-810e7add1b8e 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 @@ -60,7 +60,7 @@ require ( github.com/creasty/defaults v1.6.0 github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.19.1-0.20250411163327-ecbe045cc8f6 + github.com/dolthub/go-mysql-server v0.19.1-0.20250414220327-4d62d318f2e4 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 github.com/esote/minmaxheap v1.0.0 github.com/goccy/go-json v0.10.2 diff --git a/go/go.sum b/go/go.sum index c9b7aa99358..9a6d7ffde50 100644 --- a/go/go.sum +++ b/go/go.sum @@ -221,8 +221,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-20250327004329-6799764f2dad h1:66ZPawHszNu37VPQckdhX1BPPVzREsGgNxQeefnlm3g= github.com/dolthub/go-icu-regex v0.0.0-20250327004329-6799764f2dad/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA= -github.com/dolthub/go-mysql-server v0.19.1-0.20250411163327-ecbe045cc8f6 h1:s2hUUHLIN1TujkFw/T4xCINV/HWEoq4C+PLHZgK9jdQ= -github.com/dolthub/go-mysql-server v0.19.1-0.20250411163327-ecbe045cc8f6/go.mod h1:KZyoO3jngyZCLyCf100FEQTrwAHj33AIMj4Zv4u3MNE= +github.com/dolthub/go-mysql-server v0.19.1-0.20250414220327-4d62d318f2e4 h1:oFMqwDjR/qrmRegIPRR7VTlxwfdCBB9ppM8XItkLYys= +github.com/dolthub/go-mysql-server v0.19.1-0.20250414220327-4d62d318f2e4/go.mod h1:pcIpiQHAIBlryGP6GIIXNk/mRmBZW+MlMaXHaXsmoDI= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q= github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE= @@ -231,8 +231,8 @@ github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 h1:bMGS25NWAGTE github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI= github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 h1:7/v8q9XGFa6q5Ap4Z/OhNkAMBaK5YeuEzwJt+NZdhiE= github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81/go.mod h1:siLfyv2c92W1eN/R4QqG/+RjjX5W2+gCTRjZxBjI3TY= -github.com/dolthub/vitess v0.0.0-20250410090211-143e6b272ad4 h1:LGTt2LtYX8vaai32d+c9L0sMcP+Dg9w1kO6+lbsxxYg= -github.com/dolthub/vitess v0.0.0-20250410090211-143e6b272ad4/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70= +github.com/dolthub/vitess v0.0.0-20250414213151-810e7add1b8e h1:EASQ7Rjk4lbQjwqQaBmjjGxpbRRQqlnudEdmJZGjk/A= +github.com/dolthub/vitess v0.0.0-20250414213151-810e7add1b8e/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70= 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= From 2d97e4b3de56a90599ba40171a44d56ddc720b08 Mon Sep 17 00:00:00 2001 From: James Cor Date: Sat, 19 Apr 2025 10:36:05 -0700 Subject: [PATCH 02/15] bump --- go/go.mod | 4 ++-- go/go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go/go.mod b/go/go.mod index 3ce5ba6f20b..709cc94289f 100644 --- a/go/go.mod +++ b/go/go.mod @@ -14,7 +14,7 @@ require ( github.com/dolthub/fslock v0.0.3 github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 - github.com/dolthub/vitess v0.0.0-20250417230335-b8d80bc39341 + github.com/dolthub/vitess v0.0.0-20250418221234-8d272f40a217 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 @@ -60,7 +60,7 @@ require ( github.com/creasty/defaults v1.6.0 github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.19.1-0.20250418184029-b02d6d577682 + github.com/dolthub/go-mysql-server v0.19.1-0.20250418221339-b7d7c6143bab github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 github.com/esote/minmaxheap v1.0.0 github.com/goccy/go-json v0.10.2 diff --git a/go/go.sum b/go/go.sum index 70f3b96842f..a4d904750f9 100644 --- a/go/go.sum +++ b/go/go.sum @@ -221,8 +221,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-20250327004329-6799764f2dad h1:66ZPawHszNu37VPQckdhX1BPPVzREsGgNxQeefnlm3g= github.com/dolthub/go-icu-regex v0.0.0-20250327004329-6799764f2dad/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA= -github.com/dolthub/go-mysql-server v0.19.1-0.20250418184029-b02d6d577682 h1:c/DukYN5vohc/VIi+0nK8S6XNuTpN04OZTmG8V1OTDY= -github.com/dolthub/go-mysql-server v0.19.1-0.20250418184029-b02d6d577682/go.mod h1:AK7fdF0U5kK492FJ1Q260hgs2pHYS8psEXbtcH5ep5A= +github.com/dolthub/go-mysql-server v0.19.1-0.20250418221339-b7d7c6143bab h1:zUrG3gw09A4tHHum3f24ls39hujtB5Ladz+UQG0WyhM= +github.com/dolthub/go-mysql-server v0.19.1-0.20250418221339-b7d7c6143bab/go.mod h1:0XhgDm+bNI3yFyXtE+Ba64Zhwrpe37Ca192vQq09U6s= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q= github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE= @@ -231,8 +231,8 @@ github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 h1:bMGS25NWAGTE github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI= github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 h1:7/v8q9XGFa6q5Ap4Z/OhNkAMBaK5YeuEzwJt+NZdhiE= github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81/go.mod h1:siLfyv2c92W1eN/R4QqG/+RjjX5W2+gCTRjZxBjI3TY= -github.com/dolthub/vitess v0.0.0-20250417230335-b8d80bc39341 h1:qebIGlJEgi/mSXVZ39P77cklPuuIl8gApyTVMnKm79s= -github.com/dolthub/vitess v0.0.0-20250417230335-b8d80bc39341/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70= +github.com/dolthub/vitess v0.0.0-20250418221234-8d272f40a217 h1:QcVH/2VQrEv+azfhqUU1wkkP6fsbJfzx5JO1dqx/DwY= +github.com/dolthub/vitess v0.0.0-20250418221234-8d272f40a217/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70= 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= From b5ad62b67897dc01ce5341dc96930d78d3c4a585 Mon Sep 17 00:00:00 2001 From: James Cor Date: Mon, 21 Apr 2025 11:12:01 -0700 Subject: [PATCH 03/15] testing --- .../sqle/enginetest/dolt_engine_test.go | 50 ++++++++++++++++++- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go index dfc0469e23d..eb6451f2c17 100644 --- a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go +++ b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go @@ -113,9 +113,55 @@ func TestSchemaOverridesWithAdaptiveEncoding(t *testing.T) { // Convenience test for debugging a single query. Unskip and set to the desired query. func TestSingleScript(t *testing.T) { - t.Skip() + //t.Skip() - var scripts = []queries.ScriptTest{} + var scripts = []queries.ScriptTest{ + { + Name: "triggers with declare statements and stored procedure", + SetUpScript: []string{ + "create table t (i int primary key);", + "create table t2 (i int primary key);", + ` +create procedure proc(in i int) +begin + insert into t2 values (i); +end; +`, + ` +create trigger trig before +insert on t for each row begin + declare x int; + set x = new.i + 10; + call proc(x); +end; +`, + }, + Assertions: []queries.ScriptTestAssertion{ + { + Query: "insert into t values (1), (2), (3);", + Expected: []sql.Row{ + {gmstypes.NewOkResult(3)}, + }, + }, + //{ + // Query: "select * from t;", + // Expected: []sql.Row{ + // {1}, + // {2}, + // {3}, + // }, + //}, + { + Query: "select * from t2;", + Expected: []sql.Row{ + //{11}, + //{12}, + //{13}, + }, + }, + }, + }, + } for _, script := range scripts { harness := newDoltHarness(t) From 76531bb3654234456bff12ce45aa8d445f9a78fd Mon Sep 17 00:00:00 2001 From: James Cor Date: Wed, 23 Apr 2025 19:18:06 -0700 Subject: [PATCH 04/15] aaaa --- .../sqle/enginetest/dolt_engine_test.go | 52 ++++++------------- .../doltcore/sqle/enginetest/dolt_queries.go | 8 +-- 2 files changed, 19 insertions(+), 41 deletions(-) diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go index eb6451f2c17..b0c0f1ab548 100644 --- a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go +++ b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go @@ -113,51 +113,29 @@ func TestSchemaOverridesWithAdaptiveEncoding(t *testing.T) { // Convenience test for debugging a single query. Unskip and set to the desired query. func TestSingleScript(t *testing.T) { - //t.Skip() - + t.Skip() var scripts = []queries.ScriptTest{ { - Name: "triggers with declare statements and stored procedure", + Name: "Describe table as of", SetUpScript: []string{ - "create table t (i int primary key);", - "create table t2 (i int primary key);", ` -create procedure proc(in i int) -begin - insert into t2 values (i); -end; -`, +CREATE PROCEDURE p1() +BEGIN + DECLARE str VARCHAR(20); + CALL p2(str); + SET str = CONCAT('c', str); + SELECT str; +END`, ` -create trigger trig before -insert on t for each row begin - declare x int; - set x = new.i + 10; - call proc(x); -end; -`, +CREATE PROCEDURE p2(OUT param VARCHAR(20)) +BEGIN + SET param = 'd'; +END`, }, Assertions: []queries.ScriptTestAssertion{ { - Query: "insert into t values (1), (2), (3);", - Expected: []sql.Row{ - {gmstypes.NewOkResult(3)}, - }, - }, - //{ - // Query: "select * from t;", - // Expected: []sql.Row{ - // {1}, - // {2}, - // {3}, - // }, - //}, - { - Query: "select * from t2;", - Expected: []sql.Row{ - //{11}, - //{12}, - //{13}, - }, + Query: "CALL p1();", + Expected: []sql.Row{{"cd"}}, }, }, }, diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_queries.go b/go/libraries/doltcore/sqle/enginetest/dolt_queries.go index 28b3a76bb00..91b7f356761 100644 --- a/go/libraries/doltcore/sqle/enginetest/dolt_queries.go +++ b/go/libraries/doltcore/sqle/enginetest/dolt_queries.go @@ -7480,19 +7480,19 @@ END`, }, { Query: "CALL `mydb/main`.p4();", - Expected: []sql.Row{{4}}, + Expected: []sql.Row{{3}}, }, { Query: "CALL `mydb/main`.p5();", - Expected: []sql.Row{{4}}, + Expected: []sql.Row{{3}}, }, { Query: "CALL `mydb/p45`.p4();", - Expected: []sql.Row{{3}}, + Expected: []sql.Row{{4}}, }, { Query: "CALL `mydb/p45`.p5();", - Expected: []sql.Row{{3}}, + Expected: []sql.Row{{4}}, }, }, }, From 4aa6149cfbbd4351c8ebac103176ce947f7f27cd Mon Sep 17 00:00:00 2001 From: James Cor Date: Wed, 23 Apr 2025 23:27:25 -0700 Subject: [PATCH 05/15] progress --- .../sqle/enginetest/dolt_engine_test.go | 57 ++++++++++++++----- .../doltcore/sqle/enginetest/dolt_queries.go | 8 +-- 2 files changed, 48 insertions(+), 17 deletions(-) diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go index b0c0f1ab548..fe3ac8a9f88 100644 --- a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go +++ b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go @@ -113,30 +113,61 @@ func TestSchemaOverridesWithAdaptiveEncoding(t *testing.T) { // Convenience test for debugging a single query. Unskip and set to the desired query. func TestSingleScript(t *testing.T) { - t.Skip() + //t.Skip() var scripts = []queries.ScriptTest{ { - Name: "Describe table as of", + Name: "Database syntax propagates to inner calls", SetUpScript: []string{ - ` -CREATE PROCEDURE p1() + "CALL DOLT_CHECKOUT('main');", + `CREATE PROCEDURE p4() +BEGIN + CALL p5(); +END`, + `CREATE PROCEDURE p5() +BEGIN + SELECT 3; +END`, + "CALL DOLT_ADD('-A');", + "CALL DOLT_COMMIT('-m', 'commit message');", + "CALL DOLT_BRANCH('p45');", + "DROP PROCEDURE p4;", + "DROP PROCEDURE p5;", + `CREATE PROCEDURE p4() BEGIN - DECLARE str VARCHAR(20); - CALL p2(str); - SET str = CONCAT('c', str); - SELECT str; + CALL p5(); END`, - ` -CREATE PROCEDURE p2(OUT param VARCHAR(20)) + `CREATE PROCEDURE p5() BEGIN - SET param = 'd'; + SELECT 4; END`, + "CALL DOLT_ADD('-A');", + "CALL DOLT_COMMIT('-m', 'commit message');", }, Assertions: []queries.ScriptTestAssertion{ + //{ + // Query: "CALL p4();", + // Expected: []sql.Row{{4}}, + //}, + //{ + // Query: "CALL p5();", + // Expected: []sql.Row{{4}}, + //}, + //{ + // Query: "CALL `mydb/main`.p4();", + // Expected: []sql.Row{{4}}, + //}, + //{ + // Query: "CALL `mydb/main`.p5();", + // Expected: []sql.Row{{4}}, + //}, { - Query: "CALL p1();", - Expected: []sql.Row{{"cd"}}, + Query: "CALL `mydb/p45`.p4();", + Expected: []sql.Row{{3}}, }, + //{ + // Query: "CALL `mydb/p45`.p5();", + // Expected: []sql.Row{{3}}, + //}, }, }, } diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_queries.go b/go/libraries/doltcore/sqle/enginetest/dolt_queries.go index 91b7f356761..28b3a76bb00 100644 --- a/go/libraries/doltcore/sqle/enginetest/dolt_queries.go +++ b/go/libraries/doltcore/sqle/enginetest/dolt_queries.go @@ -7480,19 +7480,19 @@ END`, }, { Query: "CALL `mydb/main`.p4();", - Expected: []sql.Row{{3}}, + Expected: []sql.Row{{4}}, }, { Query: "CALL `mydb/main`.p5();", - Expected: []sql.Row{{3}}, + Expected: []sql.Row{{4}}, }, { Query: "CALL `mydb/p45`.p4();", - Expected: []sql.Row{{4}}, + Expected: []sql.Row{{3}}, }, { Query: "CALL `mydb/p45`.p5();", - Expected: []sql.Row{{4}}, + Expected: []sql.Row{{3}}, }, }, }, From 92c5f9ed0ada119c09afb2f355e7bed3098aa8db Mon Sep 17 00:00:00 2001 From: James Cor Date: Thu, 24 Apr 2025 01:46:47 -0700 Subject: [PATCH 06/15] need to clear session between queries --- .../sqle/enginetest/dolt_engine_test.go | 67 +++++++++---------- 1 file changed, 30 insertions(+), 37 deletions(-) diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go index fe3ac8a9f88..5575a8f1ee9 100644 --- a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go +++ b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go @@ -116,58 +116,51 @@ func TestSingleScript(t *testing.T) { //t.Skip() var scripts = []queries.ScriptTest{ { - Name: "Database syntax propagates to inner calls", + Name: "Database syntax properly handles inter-CALL communication", SetUpScript: []string{ - "CALL DOLT_CHECKOUT('main');", - `CREATE PROCEDURE p4() + `CREATE PROCEDURE p1() BEGIN - CALL p5(); + DECLARE str VARCHAR(20); + CALL p2(str); + SET str = CONCAT('a', str); + SELECT str; END`, - `CREATE PROCEDURE p5() + `CREATE PROCEDURE p2(OUT param VARCHAR(20)) BEGIN - SELECT 3; + SET param = 'b'; END`, "CALL DOLT_ADD('-A');", - "CALL DOLT_COMMIT('-m', 'commit message');", - "CALL DOLT_BRANCH('p45');", - "DROP PROCEDURE p4;", - "DROP PROCEDURE p5;", - `CREATE PROCEDURE p4() + "CALL DOLT_COMMIT('-m', 'First procedures');", + "CALL DOLT_BRANCH('p12');", + "DROP PROCEDURE p1;", + "DROP PROCEDURE p2;", + `CREATE PROCEDURE p1() BEGIN - CALL p5(); + DECLARE str VARCHAR(20); + CALL p2(str); + SET str = CONCAT('c', str); + SELECT str; END`, - `CREATE PROCEDURE p5() + `CREATE PROCEDURE p2(OUT param VARCHAR(20)) BEGIN - SELECT 4; + SET param = 'd'; END`, "CALL DOLT_ADD('-A');", - "CALL DOLT_COMMIT('-m', 'commit message');", + "CALL DOLT_COMMIT('-m', 'Second procedures');", }, Assertions: []queries.ScriptTestAssertion{ - //{ - // Query: "CALL p4();", - // Expected: []sql.Row{{4}}, - //}, - //{ - // Query: "CALL p5();", - // Expected: []sql.Row{{4}}, - //}, - //{ - // Query: "CALL `mydb/main`.p4();", - // Expected: []sql.Row{{4}}, - //}, - //{ - // Query: "CALL `mydb/main`.p5();", - // Expected: []sql.Row{{4}}, - //}, { - Query: "CALL `mydb/p45`.p4();", - Expected: []sql.Row{{3}}, + Query: "CALL p1();", + Expected: []sql.Row{{"cd"}}, + }, + { + Query: "CALL `mydb/main`.p1();", + Expected: []sql.Row{{"cd"}}, + }, + { + Query: "CALL `mydb/p12`.p1();", + Expected: []sql.Row{{"ab"}}, }, - //{ - // Query: "CALL `mydb/p45`.p5();", - // Expected: []sql.Row{{3}}, - //}, }, }, } From dc8cb73d78f839e8cf40b11bf7a6485e306aef8f Mon Sep 17 00:00:00 2001 From: James Cor Date: Fri, 25 Apr 2025 11:40:22 -0700 Subject: [PATCH 07/15] bump --- go/go.mod | 4 ++-- go/go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go/go.mod b/go/go.mod index 1b32b250ccd..cdbe303ebff 100644 --- a/go/go.mod +++ b/go/go.mod @@ -14,7 +14,7 @@ require ( github.com/dolthub/fslock v0.0.3 github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 - github.com/dolthub/vitess v0.0.0-20250418221234-8d272f40a217 + github.com/dolthub/vitess v0.0.0-20250424225619-bfb20390c1d1 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 @@ -60,7 +60,7 @@ require ( github.com/creasty/defaults v1.6.0 github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.19.1-0.20250418221339-b7d7c6143bab + github.com/dolthub/go-mysql-server v0.19.1-0.20250425181147-b67e4ecf250a github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 github.com/esote/minmaxheap v1.0.0 github.com/goccy/go-json v0.10.2 diff --git a/go/go.sum b/go/go.sum index b9879cd6316..5a7bfbd78cf 100644 --- a/go/go.sum +++ b/go/go.sum @@ -221,8 +221,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-20250327004329-6799764f2dad h1:66ZPawHszNu37VPQckdhX1BPPVzREsGgNxQeefnlm3g= github.com/dolthub/go-icu-regex v0.0.0-20250327004329-6799764f2dad/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA= -github.com/dolthub/go-mysql-server v0.19.1-0.20250418221339-b7d7c6143bab h1:zUrG3gw09A4tHHum3f24ls39hujtB5Ladz+UQG0WyhM= -github.com/dolthub/go-mysql-server v0.19.1-0.20250418221339-b7d7c6143bab/go.mod h1:0XhgDm+bNI3yFyXtE+Ba64Zhwrpe37Ca192vQq09U6s= +github.com/dolthub/go-mysql-server v0.19.1-0.20250425181147-b67e4ecf250a h1:RTsKrLI7D+m7WRvqWwIjnzzU3KhQ/9mkT3kjd+CduJs= +github.com/dolthub/go-mysql-server v0.19.1-0.20250425181147-b67e4ecf250a/go.mod h1:KcSe7KgDa8DCsFMS0vczFxpZeZIdL9DVfc3SzUNhQdc= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q= github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE= @@ -231,8 +231,8 @@ github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 h1:bMGS25NWAGTE github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI= github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 h1:7/v8q9XGFa6q5Ap4Z/OhNkAMBaK5YeuEzwJt+NZdhiE= github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81/go.mod h1:siLfyv2c92W1eN/R4QqG/+RjjX5W2+gCTRjZxBjI3TY= -github.com/dolthub/vitess v0.0.0-20250418221234-8d272f40a217 h1:QcVH/2VQrEv+azfhqUU1wkkP6fsbJfzx5JO1dqx/DwY= -github.com/dolthub/vitess v0.0.0-20250418221234-8d272f40a217/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70= +github.com/dolthub/vitess v0.0.0-20250424225619-bfb20390c1d1 h1:ZXssuc0ZNqKUD7xQCd0/xLT+nKrmAetNYb5v7xgU0U0= +github.com/dolthub/vitess v0.0.0-20250424225619-bfb20390c1d1/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70= 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= From 2f205781ce10cd9ef8c1087354380d6e15510e71 Mon Sep 17 00:00:00 2001 From: James Cor Date: Fri, 25 Apr 2025 12:57:54 -0700 Subject: [PATCH 08/15] bump --- go/go.mod | 4 ++-- go/go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go/go.mod b/go/go.mod index e5fc9996f62..7362ba4eac0 100644 --- a/go/go.mod +++ b/go/go.mod @@ -14,7 +14,7 @@ require ( github.com/dolthub/fslock v0.0.3 github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 - github.com/dolthub/vitess v0.0.0-20250423221552-f731ee5c5379 + github.com/dolthub/vitess v0.0.0-20250424225619-bfb20390c1d1 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 @@ -60,7 +60,7 @@ require ( github.com/creasty/defaults v1.6.0 github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.19.1-0.20250424205524-5b1a12f67329 + github.com/dolthub/go-mysql-server v0.19.1-0.20250425193944-7862ef1037b3 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 github.com/esote/minmaxheap v1.0.0 github.com/goccy/go-json v0.10.2 diff --git a/go/go.sum b/go/go.sum index 210cbe7e9e2..db2fc8bff70 100644 --- a/go/go.sum +++ b/go/go.sum @@ -221,8 +221,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-20250327004329-6799764f2dad h1:66ZPawHszNu37VPQckdhX1BPPVzREsGgNxQeefnlm3g= github.com/dolthub/go-icu-regex v0.0.0-20250327004329-6799764f2dad/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA= -github.com/dolthub/go-mysql-server v0.19.1-0.20250424205524-5b1a12f67329 h1:M7p+5WUwYM3OIUKsBG24G3wjTJJsa0TspANWIw6VmAw= -github.com/dolthub/go-mysql-server v0.19.1-0.20250424205524-5b1a12f67329/go.mod h1:skB7lRdqgWVqDZ/ih/DtX8iSvK15IaxRf2ASliUwgtE= +github.com/dolthub/go-mysql-server v0.19.1-0.20250425193944-7862ef1037b3 h1:wAfIq6Itq7TLUGMUzALz9I+1f4EUXHu4IEG4VvZsgUk= +github.com/dolthub/go-mysql-server v0.19.1-0.20250425193944-7862ef1037b3/go.mod h1:KcSe7KgDa8DCsFMS0vczFxpZeZIdL9DVfc3SzUNhQdc= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q= github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE= @@ -231,8 +231,8 @@ github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 h1:bMGS25NWAGTE github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI= github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 h1:7/v8q9XGFa6q5Ap4Z/OhNkAMBaK5YeuEzwJt+NZdhiE= github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81/go.mod h1:siLfyv2c92W1eN/R4QqG/+RjjX5W2+gCTRjZxBjI3TY= -github.com/dolthub/vitess v0.0.0-20250423221552-f731ee5c5379 h1:3nPFx23Ol0djIPf9rDw/y38yEn1BXqTXOUkYrWfxrEI= -github.com/dolthub/vitess v0.0.0-20250423221552-f731ee5c5379/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70= +github.com/dolthub/vitess v0.0.0-20250424225619-bfb20390c1d1 h1:ZXssuc0ZNqKUD7xQCd0/xLT+nKrmAetNYb5v7xgU0U0= +github.com/dolthub/vitess v0.0.0-20250424225619-bfb20390c1d1/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70= 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= From 4097b1af04b986e78f6deaddf8e01ec0859c9ec2 Mon Sep 17 00:00:00 2001 From: James Cor Date: Fri, 25 Apr 2025 20:37:25 -0700 Subject: [PATCH 09/15] bump --- go/go.mod | 2 +- go/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go/go.mod b/go/go.mod index 7362ba4eac0..fb85a7009a1 100644 --- a/go/go.mod +++ b/go/go.mod @@ -60,7 +60,7 @@ require ( github.com/creasty/defaults v1.6.0 github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.19.1-0.20250425193944-7862ef1037b3 + github.com/dolthub/go-mysql-server v0.19.1-0.20250426012249-c4b1e7961ae1 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 github.com/esote/minmaxheap v1.0.0 github.com/goccy/go-json v0.10.2 diff --git a/go/go.sum b/go/go.sum index db2fc8bff70..c20da54f69d 100644 --- a/go/go.sum +++ b/go/go.sum @@ -221,8 +221,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-20250327004329-6799764f2dad h1:66ZPawHszNu37VPQckdhX1BPPVzREsGgNxQeefnlm3g= github.com/dolthub/go-icu-regex v0.0.0-20250327004329-6799764f2dad/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA= -github.com/dolthub/go-mysql-server v0.19.1-0.20250425193944-7862ef1037b3 h1:wAfIq6Itq7TLUGMUzALz9I+1f4EUXHu4IEG4VvZsgUk= -github.com/dolthub/go-mysql-server v0.19.1-0.20250425193944-7862ef1037b3/go.mod h1:KcSe7KgDa8DCsFMS0vczFxpZeZIdL9DVfc3SzUNhQdc= +github.com/dolthub/go-mysql-server v0.19.1-0.20250426012249-c4b1e7961ae1 h1:TG91HuonsRrJTsqDOnvPydufHNqzhYVKfYdLcK81ylQ= +github.com/dolthub/go-mysql-server v0.19.1-0.20250426012249-c4b1e7961ae1/go.mod h1:skB7lRdqgWVqDZ/ih/DtX8iSvK15IaxRf2ASliUwgtE= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q= github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE= From 1e76733790d6169fa0a9ebff49b2cbd534b42567 Mon Sep 17 00:00:00 2001 From: James Cor Date: Sat, 26 Apr 2025 17:19:48 -0700 Subject: [PATCH 10/15] bump --- go/go.mod | 2 +- go/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go/go.mod b/go/go.mod index fb85a7009a1..d828c162bff 100644 --- a/go/go.mod +++ b/go/go.mod @@ -60,7 +60,7 @@ require ( github.com/creasty/defaults v1.6.0 github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.19.1-0.20250426012249-c4b1e7961ae1 + github.com/dolthub/go-mysql-server v0.19.1-0.20250427001732-e8c7fbee16d0 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 github.com/esote/minmaxheap v1.0.0 github.com/goccy/go-json v0.10.2 diff --git a/go/go.sum b/go/go.sum index c20da54f69d..7b774cc860c 100644 --- a/go/go.sum +++ b/go/go.sum @@ -221,8 +221,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-20250327004329-6799764f2dad h1:66ZPawHszNu37VPQckdhX1BPPVzREsGgNxQeefnlm3g= github.com/dolthub/go-icu-regex v0.0.0-20250327004329-6799764f2dad/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA= -github.com/dolthub/go-mysql-server v0.19.1-0.20250426012249-c4b1e7961ae1 h1:TG91HuonsRrJTsqDOnvPydufHNqzhYVKfYdLcK81ylQ= -github.com/dolthub/go-mysql-server v0.19.1-0.20250426012249-c4b1e7961ae1/go.mod h1:skB7lRdqgWVqDZ/ih/DtX8iSvK15IaxRf2ASliUwgtE= +github.com/dolthub/go-mysql-server v0.19.1-0.20250427001732-e8c7fbee16d0 h1:3+BvIsbhXiViiRNXHziRevTaAxEG7iHsU+QoVTIXkrY= +github.com/dolthub/go-mysql-server v0.19.1-0.20250427001732-e8c7fbee16d0/go.mod h1:KcSe7KgDa8DCsFMS0vczFxpZeZIdL9DVfc3SzUNhQdc= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q= github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE= From 772a88f7281fc5d323b3d160e25a5cd0c5d6eebf Mon Sep 17 00:00:00 2001 From: James Cor Date: Mon, 28 Apr 2025 17:00:12 -0700 Subject: [PATCH 11/15] bump --- go/go.mod | 2 +- go/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go/go.mod b/go/go.mod index d828c162bff..79db28598d9 100644 --- a/go/go.mod +++ b/go/go.mod @@ -60,7 +60,7 @@ require ( github.com/creasty/defaults v1.6.0 github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.19.1-0.20250427001732-e8c7fbee16d0 + github.com/dolthub/go-mysql-server v0.19.1-0.20250428235727-f6f4b918477a github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 github.com/esote/minmaxheap v1.0.0 github.com/goccy/go-json v0.10.2 diff --git a/go/go.sum b/go/go.sum index 7b774cc860c..48f15ee2db6 100644 --- a/go/go.sum +++ b/go/go.sum @@ -221,8 +221,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-20250327004329-6799764f2dad h1:66ZPawHszNu37VPQckdhX1BPPVzREsGgNxQeefnlm3g= github.com/dolthub/go-icu-regex v0.0.0-20250327004329-6799764f2dad/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA= -github.com/dolthub/go-mysql-server v0.19.1-0.20250427001732-e8c7fbee16d0 h1:3+BvIsbhXiViiRNXHziRevTaAxEG7iHsU+QoVTIXkrY= -github.com/dolthub/go-mysql-server v0.19.1-0.20250427001732-e8c7fbee16d0/go.mod h1:KcSe7KgDa8DCsFMS0vczFxpZeZIdL9DVfc3SzUNhQdc= +github.com/dolthub/go-mysql-server v0.19.1-0.20250428235727-f6f4b918477a h1:zAvgWJ9kpa6pL6Oj13oZR5nq/liooW30XybvmsJ90lw= +github.com/dolthub/go-mysql-server v0.19.1-0.20250428235727-f6f4b918477a/go.mod h1:KcSe7KgDa8DCsFMS0vczFxpZeZIdL9DVfc3SzUNhQdc= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q= github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE= From ba57ce295cb8659734994dc5a34d80b5ae01df6d Mon Sep 17 00:00:00 2001 From: James Cor Date: Tue, 29 Apr 2025 12:38:36 -0700 Subject: [PATCH 12/15] change test --- integration-tests/bats/sql.bats | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integration-tests/bats/sql.bats b/integration-tests/bats/sql.bats index 395a4cedf32..d16dc84cc9f 100755 --- a/integration-tests/bats/sql.bats +++ b/integration-tests/bats/sql.bats @@ -2227,7 +2227,7 @@ INSERT INTO test VALUES (6, 6, 6) SQL run dolt sql -q "CALL p1(3)" -r=csv [ "$status" -eq "0" ] - [[ "$output" =~ "(test.pk + x),(test.v1 + x),(test.v2 + x)" ]] || false + [[ "$output" =~ "(test.pk + 10),(test.v1 + 10),(test.v2 + 10)" ]] || false [[ "$output" =~ "11,11,11" ]] || false [[ "$output" =~ "12,12,12" ]] || false [[ "$output" =~ "13,13,13" ]] || false @@ -2238,7 +2238,7 @@ SQL run dolt sql -q "CALL p1(20)" -r=csv [ "$status" -eq "0" ] - [[ "$output" =~ "(test.pk + x),(test.v1 + x),(test.v2 + x)" ]] || false + [[ "$output" =~ "(test.pk + 20),(test.v1 + 20),(test.v2 + 20)" ]] || false [[ "$output" =~ "21,21,21" ]] || false [[ "$output" =~ "22,22,22" ]] || false [[ "$output" =~ "23,23,23" ]] || false From 12a69cc38d2a7ece813bc7b9a333760fd1d8a99b Mon Sep 17 00:00:00 2001 From: James Cor Date: Tue, 29 Apr 2025 12:48:50 -0700 Subject: [PATCH 13/15] bump --- go/go.mod | 4 ++-- go/go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go/go.mod b/go/go.mod index 1a766566da6..30bfe2764ca 100644 --- a/go/go.mod +++ b/go/go.mod @@ -14,7 +14,7 @@ require ( github.com/dolthub/fslock v0.0.3 github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 - github.com/dolthub/vitess v0.0.0-20250423221552-f731ee5c5379 + github.com/dolthub/vitess v0.0.0-20250424225619-bfb20390c1d1 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 @@ -60,7 +60,7 @@ require ( github.com/creasty/defaults v1.6.0 github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.19.1-0.20250428224756-b9931b05c831 + github.com/dolthub/go-mysql-server v0.19.1-0.20250429194045-85274504b89d github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 github.com/esote/minmaxheap v1.0.0 github.com/goccy/go-json v0.10.2 diff --git a/go/go.sum b/go/go.sum index 380eb09a9d9..eff0e6d9a52 100644 --- a/go/go.sum +++ b/go/go.sum @@ -221,8 +221,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-20250327004329-6799764f2dad h1:66ZPawHszNu37VPQckdhX1BPPVzREsGgNxQeefnlm3g= github.com/dolthub/go-icu-regex v0.0.0-20250327004329-6799764f2dad/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA= -github.com/dolthub/go-mysql-server v0.19.1-0.20250428224756-b9931b05c831 h1:SxQunmO7PM6h7Tp/xaOpBv3YPX2WdZmNAUzW7ywFRio= -github.com/dolthub/go-mysql-server v0.19.1-0.20250428224756-b9931b05c831/go.mod h1:skB7lRdqgWVqDZ/ih/DtX8iSvK15IaxRf2ASliUwgtE= +github.com/dolthub/go-mysql-server v0.19.1-0.20250429194045-85274504b89d h1:VrjKDxX5GMcI67Msl/YNwdR7KTBy/MFuObcGnOxqFFM= +github.com/dolthub/go-mysql-server v0.19.1-0.20250429194045-85274504b89d/go.mod h1:KcSe7KgDa8DCsFMS0vczFxpZeZIdL9DVfc3SzUNhQdc= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q= github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE= @@ -231,8 +231,8 @@ github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 h1:bMGS25NWAGTE github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI= github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 h1:7/v8q9XGFa6q5Ap4Z/OhNkAMBaK5YeuEzwJt+NZdhiE= github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81/go.mod h1:siLfyv2c92W1eN/R4QqG/+RjjX5W2+gCTRjZxBjI3TY= -github.com/dolthub/vitess v0.0.0-20250423221552-f731ee5c5379 h1:3nPFx23Ol0djIPf9rDw/y38yEn1BXqTXOUkYrWfxrEI= -github.com/dolthub/vitess v0.0.0-20250423221552-f731ee5c5379/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70= +github.com/dolthub/vitess v0.0.0-20250424225619-bfb20390c1d1 h1:ZXssuc0ZNqKUD7xQCd0/xLT+nKrmAetNYb5v7xgU0U0= +github.com/dolthub/vitess v0.0.0-20250424225619-bfb20390c1d1/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70= 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= From 452048100b9f51172ebda019408062751b38746b Mon Sep 17 00:00:00 2001 From: James Cor Date: Tue, 29 Apr 2025 16:10:51 -0700 Subject: [PATCH 14/15] bump --- go/go.mod | 2 +- go/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go/go.mod b/go/go.mod index 30bfe2764ca..9ab90435bd4 100644 --- a/go/go.mod +++ b/go/go.mod @@ -60,7 +60,7 @@ require ( github.com/creasty/defaults v1.6.0 github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.19.1-0.20250429194045-85274504b89d + github.com/dolthub/go-mysql-server v0.19.1-0.20250429230721-a6f8e51f7327 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 github.com/esote/minmaxheap v1.0.0 github.com/goccy/go-json v0.10.2 diff --git a/go/go.sum b/go/go.sum index eff0e6d9a52..965c934fc8b 100644 --- a/go/go.sum +++ b/go/go.sum @@ -221,8 +221,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-20250327004329-6799764f2dad h1:66ZPawHszNu37VPQckdhX1BPPVzREsGgNxQeefnlm3g= github.com/dolthub/go-icu-regex v0.0.0-20250327004329-6799764f2dad/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA= -github.com/dolthub/go-mysql-server v0.19.1-0.20250429194045-85274504b89d h1:VrjKDxX5GMcI67Msl/YNwdR7KTBy/MFuObcGnOxqFFM= -github.com/dolthub/go-mysql-server v0.19.1-0.20250429194045-85274504b89d/go.mod h1:KcSe7KgDa8DCsFMS0vczFxpZeZIdL9DVfc3SzUNhQdc= +github.com/dolthub/go-mysql-server v0.19.1-0.20250429230721-a6f8e51f7327 h1:bC59NNPXNCEcjebRwTqLuNzVNZ6jRlyRMhlP7VkFxOg= +github.com/dolthub/go-mysql-server v0.19.1-0.20250429230721-a6f8e51f7327/go.mod h1:KcSe7KgDa8DCsFMS0vczFxpZeZIdL9DVfc3SzUNhQdc= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q= github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE= From eaff01c06f4b4947b9a478d921d3d5afa6e4a302 Mon Sep 17 00:00:00 2001 From: James Cor Date: Wed, 30 Apr 2025 11:53:20 -0700 Subject: [PATCH 15/15] bump --- go/go.mod | 4 ++-- go/go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go/go.mod b/go/go.mod index 9ab90435bd4..d23872ff0eb 100644 --- a/go/go.mod +++ b/go/go.mod @@ -14,7 +14,7 @@ require ( github.com/dolthub/fslock v0.0.3 github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 - github.com/dolthub/vitess v0.0.0-20250424225619-bfb20390c1d1 + github.com/dolthub/vitess v0.0.0-20250430180243-0eee73763bc5 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 @@ -60,7 +60,7 @@ require ( github.com/creasty/defaults v1.6.0 github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.19.1-0.20250429230721-a6f8e51f7327 + github.com/dolthub/go-mysql-server v0.19.1-0.20250430183344-d3b95b2013dd github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 github.com/esote/minmaxheap v1.0.0 github.com/goccy/go-json v0.10.2 diff --git a/go/go.sum b/go/go.sum index 965c934fc8b..154d17b2de2 100644 --- a/go/go.sum +++ b/go/go.sum @@ -221,8 +221,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-20250327004329-6799764f2dad h1:66ZPawHszNu37VPQckdhX1BPPVzREsGgNxQeefnlm3g= github.com/dolthub/go-icu-regex v0.0.0-20250327004329-6799764f2dad/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA= -github.com/dolthub/go-mysql-server v0.19.1-0.20250429230721-a6f8e51f7327 h1:bC59NNPXNCEcjebRwTqLuNzVNZ6jRlyRMhlP7VkFxOg= -github.com/dolthub/go-mysql-server v0.19.1-0.20250429230721-a6f8e51f7327/go.mod h1:KcSe7KgDa8DCsFMS0vczFxpZeZIdL9DVfc3SzUNhQdc= +github.com/dolthub/go-mysql-server v0.19.1-0.20250430183344-d3b95b2013dd h1:WC8c6Wh+kWxw4xNQruFtqkDxTw3PMeFcS57ok3+rUV4= +github.com/dolthub/go-mysql-server v0.19.1-0.20250430183344-d3b95b2013dd/go.mod h1:pj8c/fGAEdKYy1BZWcN0xO+vEgMRI+kWVXhuEy1BN+Q= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q= github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE= @@ -231,8 +231,8 @@ github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 h1:bMGS25NWAGTE github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI= github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 h1:7/v8q9XGFa6q5Ap4Z/OhNkAMBaK5YeuEzwJt+NZdhiE= github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81/go.mod h1:siLfyv2c92W1eN/R4QqG/+RjjX5W2+gCTRjZxBjI3TY= -github.com/dolthub/vitess v0.0.0-20250424225619-bfb20390c1d1 h1:ZXssuc0ZNqKUD7xQCd0/xLT+nKrmAetNYb5v7xgU0U0= -github.com/dolthub/vitess v0.0.0-20250424225619-bfb20390c1d1/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70= +github.com/dolthub/vitess v0.0.0-20250430180243-0eee73763bc5 h1:eyC/UHnNsCham/65hV9p/Si0S+cq774kbgk0/KPFYws= +github.com/dolthub/vitess v0.0.0-20250430180243-0eee73763bc5/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70= 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=