Skip to content

Commit 01c2ce0

Browse files
committed
vitess bump and more testing
1 parent 8f288b5 commit 01c2ce0

File tree

3 files changed

+59
-1
lines changed

3 files changed

+59
-1
lines changed

enginetest/queries/script_queries.go

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11788,6 +11788,10 @@ select * from t1 except (
1178811788
"insert into names values ('john', 'smith'), ('bob','burger')",
1178911789
},
1179011790
Assertions: []ScriptTestAssertion{
11791+
{
11792+
Query: "select true || false",
11793+
Expected: []sql.Row{{true}},
11794+
},
1179111795
{
1179211796
Query: "select '0' || '0'",
1179311797
Expected: []sql.Row{{false}},
@@ -11804,10 +11808,38 @@ select * from t1 except (
1180411808
Query: "select first_name || ' ' || last_name as full_name from names order by full_name",
1180511809
Expected: []sql.Row{{false}, {false}},
1180611810
},
11811+
{
11812+
Query: "select 1 + 2 || 3 + 4",
11813+
Expected: []sql.Row{{true}},
11814+
},
11815+
{
11816+
Query: "select true || 1 || 'abc'",
11817+
Expected: []sql.Row{{true}},
11818+
},
11819+
{
11820+
Query: "select (1 || 2) || (3 || 4)",
11821+
Expected: []sql.Row{{true}},
11822+
},
11823+
{
11824+
Query: "select (1 + 2) || (3 + 4)",
11825+
Expected: []sql.Row{{true}},
11826+
},
11827+
{
11828+
Query: "select ((1 || 2) || 3) || 4",
11829+
Expected: []sql.Row{{true}},
11830+
},
11831+
{
11832+
Query: "select ((1 + 2) || 3) + 4",
11833+
Expected: []sql.Row{{5}},
11834+
},
1180711835
{
1180811836
Query: "SET SESSION sql_mode = CONCAT(@@SESSION.sql_mode, ',PIPES_AS_CONCAT');",
1180911837
Expected: []sql.Row{{types.NewOkResult(0)}},
1181011838
},
11839+
{
11840+
Query: "select true || false",
11841+
Expected: []sql.Row{{"10"}},
11842+
},
1181111843
{
1181211844
Query: "select '0' || '0'",
1181311845
Expected: []sql.Row{{"00"}},
@@ -11824,6 +11856,30 @@ select * from t1 except (
1182411856
Query: "select first_name || ' ' || last_name as full_name from names order by full_name",
1182511857
Expected: []sql.Row{{"bob burger"}, {"john smith"}},
1182611858
},
11859+
{
11860+
Query: "select 1 + 2 || 3 + 4",
11861+
Expected: []sql.Row{{float64(28)}},
11862+
},
11863+
{
11864+
Query: "select true || 1 || 'abc'",
11865+
Expected: []sql.Row{{"11abc"}},
11866+
},
11867+
{
11868+
Query: "select (1 || 2) || (3 || 4)",
11869+
Expected: []sql.Row{{"1234"}},
11870+
},
11871+
{
11872+
Query: "select (1 + 2) || (3 + 4)",
11873+
Expected: []sql.Row{{"37"}},
11874+
},
11875+
{
11876+
Query: "select ((1 || 2) || 3) || 4",
11877+
Expected: []sql.Row{{"1234"}},
11878+
},
11879+
{
11880+
Query: "select ((1 + 2) || 3) + 4",
11881+
Expected: []sql.Row{{float64(37)}},
11882+
},
1182711883
},
1182811884
},
1182911885
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/dolthub/go-icu-regex v0.0.0-20250820171420-f2b78f56ce9f
77
github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71
88
github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81
9-
github.com/dolthub/vitess v0.0.0-20250912213401-e062bc173788
9+
github.com/dolthub/vitess v0.0.0-20250915212634-b053eb289ded
1010
github.com/go-sql-driver/mysql v1.9.3
1111
github.com/gocraft/dbr/v2 v2.7.2
1212
github.com/google/uuid v1.3.0

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 h1:7/v8q9X
2020
github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81/go.mod h1:siLfyv2c92W1eN/R4QqG/+RjjX5W2+gCTRjZxBjI3TY=
2121
github.com/dolthub/vitess v0.0.0-20250912213401-e062bc173788 h1:qZiVJ5smudQJ9DEPmD3KaufGtvsi9kjyYubet5Y2IDY=
2222
github.com/dolthub/vitess v0.0.0-20250912213401-e062bc173788/go.mod h1:tV3BrIVyDWVkkYy8dKt2o6hjJ89cHb5opY5FpCyhncQ=
23+
github.com/dolthub/vitess v0.0.0-20250915212634-b053eb289ded h1:HjvCNN6BiWN2UI5uqmYhLYw/pxvHb/GGX8mWibACBR8=
24+
github.com/dolthub/vitess v0.0.0-20250915212634-b053eb289ded/go.mod h1:tV3BrIVyDWVkkYy8dKt2o6hjJ89cHb5opY5FpCyhncQ=
2325
github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
2426
github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
2527
github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=

0 commit comments

Comments
 (0)