merge with main

Author: James Cor

enginetest/queries/script_queries.go

@@ -4694,6 +4694,16 @@ CREATE TABLE tab3 (
 			"insert into collate_tbl values (7, 'a,c');",
 			"insert into collate_tbl values (8, 'a,b,c');",
 
+			"create table text_tbl (i int primary key, s text);",
+			"insert into text_tbl values (0, '');",
+			"insert into text_tbl values (1, 'a');",
+			"insert into text_tbl values (2, 'b');",
+			"insert into text_tbl values (3, 'c');",
+			"insert into text_tbl values (4, 'a,b');",
+			"insert into text_tbl values (6, 'b,c');",
+			"insert into text_tbl values (7, 'a,c');",
+			"insert into text_tbl values (8, 'a,b,c');",
+
 			"create table enum_tbl (i int primary key, s enum('a','b','c'));",
 			"insert into enum_tbl values (0, 'a'), (1, 'b'), (2, 'c');",
 			"select i, s, find_in_set('a', s) from enum_tbl;",
@@ -4725,6 +4735,19 @@ CREATE TABLE tab3 (
 					{8, 1},
 				},
 			},
+			{
+				Query: "select i, find_in_set('a', s) from text_tbl;",
+				Expected: []sql.Row{
+					{0, 0},
+					{1, 1},
+					{2, 0},
+					{3, 0},
+					{4, 1},
+					{6, 0},
+					{7, 1},
+					{8, 1},
+				},
+			},
 			{
 				Query: "select i, find_in_set('a', s) from enum_tbl;",
 				Expected: []sql.Row{
@@ -8107,6 +8130,208 @@ where
 			},
 		},
 	},
+	{
+		Name:    "ntile tests",
+		Dialect: "mysql",
+		SetUpScript: []string{
+			"create table t (i int primary key, j int);",
+			"insert into t values (1, 1), (2, 1), (3, 1), (4, 1), (5, 1), (6, 2), (7, 2), (8, 2), (9, 2), (10, 2);",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query:       "select i, ntile(null) over() from t;",
+				ExpectedErr: sql.ErrInvalidArgument,
+			},
+			{
+				Query:       "select i, ntile(0) over() from t;",
+				ExpectedErr: sql.ErrInvalidArgument,
+			},
+			{
+				Query:       "select i, ntile(-1) over() from t;",
+				ExpectedErr: sql.ErrInvalidArgument,
+			},
+			{
+				Query: "select i, ntile(100) over() from t;",
+				Expected: []sql.Row{
+					{1, uint64(1)},
+					{2, uint64(2)},
+					{3, uint64(3)},
+					{4, uint64(4)},
+					{5, uint64(5)},
+					{6, uint64(6)},
+					{7, uint64(7)},
+					{8, uint64(8)},
+					{9, uint64(9)},
+					{10, uint64(10)},
+				},
+			},
+			{
+				Query: "select i, ntile(10) over() from t;",
+				Expected: []sql.Row{
+					{1, uint64(1)},
+					{2, uint64(2)},
+					{3, uint64(3)},
+					{4, uint64(4)},
+					{5, uint64(5)},
+					{6, uint64(6)},
+					{7, uint64(7)},
+					{8, uint64(8)},
+					{9, uint64(9)},
+					{10, uint64(10)},
+				},
+			},
+			{
+				Query: "select i, ntile(9) over() from t;",
+				Expected: []sql.Row{
+					{1, uint64(1)},
+					{2, uint64(1)},
+					{3, uint64(2)},
+					{4, uint64(3)},
+					{5, uint64(4)},
+					{6, uint64(5)},
+					{7, uint64(6)},
+					{8, uint64(7)},
+					{9, uint64(8)},
+					{10, uint64(9)},
+				},
+			},
+			{
+				Query: "select i, ntile(8) over() from t;",
+				Expected: []sql.Row{
+					{1, uint64(1)},
+					{2, uint64(1)},
+					{3, uint64(2)},
+					{4, uint64(2)},
+					{5, uint64(3)},
+					{6, uint64(4)},
+					{7, uint64(5)},
+					{8, uint64(6)},
+					{9, uint64(7)},
+					{10, uint64(8)},
+				},
+			},
+			{
+				Query: "select i, ntile(7) over() from t;",
+				Expected: []sql.Row{
+					{1, uint64(1)},
+					{2, uint64(1)},
+					{3, uint64(2)},
+					{4, uint64(2)},
+					{5, uint64(3)},
+					{6, uint64(3)},
+					{7, uint64(4)},
+					{8, uint64(5)},
+					{9, uint64(6)},
+					{10, uint64(7)},
+				},
+			},
+			{
+				Query: "select i, ntile(6) over() from t;",
+				Expected: []sql.Row{
+					{1, uint64(1)},
+					{2, uint64(1)},
+					{3, uint64(2)},
+					{4, uint64(2)},
+					{5, uint64(3)},
+					{6, uint64(3)},
+					{7, uint64(4)},
+					{8, uint64(4)},
+					{9, uint64(5)},
+					{10, uint64(6)},
+				},
+			},
+			{
+				Query: "select i, ntile(5) over() from t;",
+				Expected: []sql.Row{
+					{1, uint64(1)},
+					{2, uint64(1)},
+					{3, uint64(2)},
+					{4, uint64(2)},
+					{5, uint64(3)},
+					{6, uint64(3)},
+					{7, uint64(4)},
+					{8, uint64(4)},
+					{9, uint64(5)},
+					{10, uint64(5)},
+				},
+			},
+			{
+				Query: "select i, ntile(4) over() from t;",
+				Expected: []sql.Row{
+					{1, uint64(1)},
+					{2, uint64(1)},
+					{3, uint64(1)},
+					{4, uint64(2)},
+					{5, uint64(2)},
+					{6, uint64(2)},
+					{7, uint64(3)},
+					{8, uint64(3)},
+					{9, uint64(4)},
+					{10, uint64(4)},
+				},
+			},
+			{
+				Query: "select i, ntile(3) over() from t;",
+				Expected: []sql.Row{
+					{1, uint64(1)},
+					{2, uint64(1)},
+					{3, uint64(1)},
+					{4, uint64(1)},
+					{5, uint64(2)},
+					{6, uint64(2)},
+					{7, uint64(2)},
+					{8, uint64(3)},
+					{9, uint64(3)},
+					{10, uint64(3)},
+				},
+			},
+			{
+				Query: "select i, ntile(2) over() from t;",
+				Expected: []sql.Row{
+					{1, uint64(1)},
+					{2, uint64(1)},
+					{3, uint64(1)},
+					{4, uint64(1)},
+					{5, uint64(1)},
+					{6, uint64(2)},
+					{7, uint64(2)},
+					{8, uint64(2)},
+					{9, uint64(2)},
+					{10, uint64(2)},
+				},
+			},
+			{
+				Query: "select i, ntile(1) over() from t;",
+				Expected: []sql.Row{
+					{1, uint64(1)},
+					{2, uint64(1)},
+					{3, uint64(1)},
+					{4, uint64(1)},
+					{5, uint64(1)},
+					{6, uint64(1)},
+					{7, uint64(1)},
+					{8, uint64(1)},
+					{9, uint64(1)},
+					{10, uint64(1)},
+				},
+			},
+			{
+				Query: "select i, j, ntile(2) over(partition by j) from t;",
+				Expected: []sql.Row{
+					{1, 1, uint64(1)},
+					{2, 1, uint64(1)},
+					{3, 1, uint64(1)},
+					{4, 1, uint64(2)},
+					{5, 1, uint64(2)},
+					{6, 2, uint64(1)},
+					{7, 2, uint64(1)},
+					{8, 2, uint64(1)},
+					{9, 2, uint64(2)},
+					{10, 2, uint64(2)},
+				},
+			},
+		},
+	},
 }
 
 var SpatialScriptTests = []ScriptTest{

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/dolthub/go-icu-regex v0.0.0-20250327004329-6799764f2dad
 	github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71
 	github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81
-	github.com/dolthub/vitess v0.0.0-20250411172524-030d7ebedb96
+	github.com/dolthub/vitess v0.0.0-20250414165810-f0031a6472b7
 	github.com/go-kit/kit v0.10.0
 	github.com/go-sql-driver/mysql v1.7.2-0.20231213112541-0004702b931d
 	github.com/gocraft/dbr/v2 v2.7.2

go.sum

@@ -58,8 +58,10 @@ 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-20250411172524-030d7ebedb96 h1:CRHpJLqR9rYaBfEwFn5De/6j7IPQxUObMxuO3svg2FI=
-github.com/dolthub/vitess v0.0.0-20250411172524-030d7ebedb96/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70=
+github.com/dolthub/vitess v0.0.0-20250410233614-8d8c7a5b3d6b h1:2wE+qJwJ5SRIzz+dJQT8XbkpK+g8/pFt34AU/iJ5K+Y=
+github.com/dolthub/vitess v0.0.0-20250410233614-8d8c7a5b3d6b/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70=
+github.com/dolthub/vitess v0.0.0-20250414165810-f0031a6472b7 h1:4Y043kZgAH1WhOER0nk+02KPKxJX8Ir6yK7cGzY04c4=
+github.com/dolthub/vitess v0.0.0-20250414165810-f0031a6472b7/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=

optgen/cmd/source/unary_aggs.yaml

@@ -32,11 +32,11 @@ unaryAggs:
 - name:     "Sum"
   desc:     "returns the sum of expr in all rows"
   nullable: false
-- name:     "StdDevPop"
-  desc:     "returns the population standard deviation of expr"
-- name:     "StdDevSamp"
-  desc:     "returns the sample standard deviation of expr"
-- name:     "VarPop"
-  desc:     "returns the population variance of expr"
-- name:     "VarSamp"
-  desc:     "returns the sample variance of expr"
+- name: "StdDevPop"
+  desc: "returns the population standard deviation of expr"
+- name: "StdDevSamp"
+  desc: "returns the sample standard deviation of expr"
+- name: "VarPop"
+  desc: "returns the population variance of expr"
+- name: "VarSamp"
+  desc: "returns the sample variance of expr"

sql/analyzer/constraints.go

@@ -74,6 +74,12 @@ func resolveDropConstraint(ctx *sql.Context, a *Analyzer, n sql.Node, scope *pla
 			}
 		}
 
+		if dropConstraint.IfExists {
+			newAlterDropCheck := plan.NewAlterDropCheck(rt, dropConstraint.Name)
+			newAlterDropCheck.IfExists = true
+			return newAlterDropCheck, transform.NewTree, nil
+		}
+
 		return nil, transform.SameTree, sql.ErrUnknownConstraint.New(dropConstraint.Name)
 	})
 }
@@ -82,6 +88,11 @@ func resolveDropConstraint(ctx *sql.Context, a *Analyzer, n sql.Node, scope *pla
 func validateDropConstraint(ctx *sql.Context, a *Analyzer, n sql.Node, scope *plan.Scope, sel RuleSelector, qFlags *sql.QueryFlags) (sql.Node, transform.TreeIdentity, error) {
 	switch n := n.(type) {
 	case *plan.DropCheck:
+		// Don't bother validating that the constraint exists if the IfExists flag is set
+		if n.IfExists {
+			return n, transform.SameTree, nil
+		}
+
 		rt := n.Table
 
 		ct, ok := rt.Table.(sql.CheckTable)