Merge branch 'main' into jennifer/domain

Author: jennifersp

enginetest/queries/foreign_key_queries.go

@@ -2616,6 +2616,74 @@ var ForeignKeyTests = []ScriptTest{
 			},
 		},
 	},
+	{
+		Name: "multiple foreign key refs",
+		SetUpScript: []string{
+			"create table parent1 (i int primary key);",
+			"create table child1 (j int, k int, foreign key (j) references parent1(i) on delete cascade on update cascade, foreign key (k) references parent1 (i) on delete cascade on update cascade);",
+			"insert into parent1 values (1), (2), (3);",
+			"insert into child1 values (1, 2), (2, 3), (3, 1);",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query: "select * from parent1;",
+				Expected: []sql.Row{
+					{1},
+					{2},
+					{3},
+				},
+			},
+			{
+				Query: "select * from child1 order by j, k;",
+				Expected: []sql.Row{
+					{1, 2},
+					{2, 3},
+					{3, 1},
+				},
+			},
+			{
+				Query: "update parent1 set i = 20 where i = 2;",
+				Expected: []sql.Row{
+					{types.OkResult{RowsAffected: 1, Info: plan.UpdateInfo{Matched: 1, Updated: 1}}},
+				},
+			},
+			{
+				Query: "select * from parent1 order by i;",
+				Expected: []sql.Row{
+					{1},
+					{3},
+					{20},
+				},
+			},
+			{
+				Query: "select * from child1 order by j, k;",
+				Expected: []sql.Row{
+					{1, 20},
+					{3, 1},
+					{20, 3},
+				},
+			},
+			{
+				Query: "delete from parent1 where i = 1;",
+				Expected: []sql.Row{
+					{types.OkResult{RowsAffected: 1}},
+				},
+			},
+			{
+				Query: "select * from parent1;",
+				Expected: []sql.Row{
+					{3},
+					{20},
+				},
+			},
+			{
+				Query: "select * from child1 order by j, k;",
+				Expected: []sql.Row{
+					{20, 3},
+				},
+			},
+		},
+	},
 }
 
 var CreateForeignKeyTests = []ScriptTest{

enginetest/queries/insert_queries.go

@@ -1278,10 +1278,10 @@ var InsertScripts = []ScriptTest{
 		},
 	},
 	{
-		Name: "sql_mode=NO_AUTO_VALUE_ON_ZERO",
+		Name: "sql_mode=NO_auto_value_ON_ZERO",
 		SetUpScript: []string{
 			"set @old_sql_mode=@@sql_mode;",
-			"set @@sql_mode='NO_AUTO_VALUE_ON_ZERO';",
+			"set @@sql_mode='NO_auto_value_ON_ZERO';",
 			"create table auto (i int auto_increment, index (i));",
 			"create table auto_pk (i int auto_increment primary key);",
 		},

enginetest/queries/update_queries.go

@@ -707,9 +707,9 @@ var UpdateIgnoreScripts = []ScriptTest{
 		Name: "UPDATE IGNORE with foreign keys",
 		SetUpScript: []string{
 			"CREATE TABLE colors ( id INT NOT NULL, color VARCHAR(32) NOT NULL, PRIMARY KEY (id), INDEX color_index(color));",
-			"CREATE TABLE objects (id INT NOT NULL, name VARCHAR(64) NOT NULL,color VARCHAR(32), PRIMARY KEY(id),FOREIGN KEY (color) REFERENCES colors(color))",
-			"INSERT INTO colors (id,color) VALUES (1,'red'),(2,'green'),(3,'blue'),(4,'purple')",
-			"INSERT INTO objects (id,name,color) VALUES (1,'truck','red'),(2,'ball','green'),(3,'shoe','blue')",
+			"CREATE TABLE objects (id INT NOT NULL, name VARCHAR(64) NOT NULL,color VARCHAR(32), PRIMARY KEY(id),FOREIGN KEY (color) REFERENCES colors(color));",
+			"INSERT INTO colors (id,color) VALUES (1,'red'),(2,'green'),(3,'blue'),(4,'purple');",
+			"INSERT INTO objects (id,name,color) VALUES (1,'truck','red'),(2,'ball','green'),(3,'shoe','blue');",
 		},
 		Assertions: []ScriptTestAssertion{
 			{

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/dolthub/go-icu-regex v0.0.0-20240916130659-0118adc6b662
 	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-20241010201417-9d4f54b29ccc
+	github.com/dolthub/vitess v0.0.0-20241016191424-d14e107a654e
 	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

@@ -62,6 +62,8 @@ github.com/dolthub/vitess v0.0.0-20241009160728-54c0746cbff7 h1:mepdzTqvr0ZAbyOE
 github.com/dolthub/vitess v0.0.0-20241009160728-54c0746cbff7/go.mod h1:uBvlRluuL+SbEWTCZ68o0xvsdYZER3CEG/35INdzfJM=
 github.com/dolthub/vitess v0.0.0-20241010201417-9d4f54b29ccc h1:ZZgTRuxEwd3X67njtK30buHeZScLAd4W0rbRV8CORhE=
 github.com/dolthub/vitess v0.0.0-20241010201417-9d4f54b29ccc/go.mod h1:uBvlRluuL+SbEWTCZ68o0xvsdYZER3CEG/35INdzfJM=
+github.com/dolthub/vitess v0.0.0-20241016191424-d14e107a654e h1:Ssd/iV0hAOShAgr0c4pJQNgh2E4my2XHblFIIam0D+4=
+github.com/dolthub/vitess v0.0.0-20241016191424-d14e107a654e/go.mod h1:uBvlRluuL+SbEWTCZ68o0xvsdYZER3CEG/35INdzfJM=
 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=