merge with main

Author: angelamayxie

enginetest/join_op_tests.go

@@ -1921,6 +1921,18 @@ SELECT SUM(x) FROM xy WHERE x IN (
 			},
 		},
 	},
+	{
+		name: "where not exists",
+		setup: [][]string{
+			setup.XyData[0],
+		},
+		tests: []JoinOpTests{
+			{
+				Query:    `select * from xy_hasnull x where not exists(select 1 from ab_hasnull a where a.b = x.y)`,
+				Expected: []sql.Row{{1, 0}, {3, nil}},
+			},
+		},
+	},
 	{
 		name: "multi-column merge join",
 		setup: [][]string{

enginetest/queries/imdb_plans.go

@@ -22,6 +22,20 @@ import (
 )
 
 var LoadDataScripts = []ScriptTest{
+	{
+		Name: "LOAD DATA applies column defaults when \\N provided",
+		SetUpScript: []string{
+			"create table t (pk int primary key, c1 int default 1, c2 int)",
+			// Explicitly use Windows-style line endings to be robust on Windows CI
+			"LOAD DATA INFILE './testdata/load_defaults_null.csv' INTO TABLE t FIELDS TERMINATED BY ',' LINES TERMINATED BY '\r\n'",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query:    "select * from t",
+				Expected: []sql.Row{{1, 1, 1}},
+			},
+		},
+	},
 	{
 		Name: "Basic load data with enclosed values.",
 		SetUpScript: []string{

enginetest/queries/integration_plans.go

@@ -346,4 +346,26 @@ var OrderByGroupByScriptTests = []ScriptTest{
 			},
 		},
 	},
+	{
+		// https://github.com/dolthub/dolt/issues/9605
+		Name: "Order by wrapped by parentheses",
+		SetUpScript: []string{
+			"create table t(i int, j int)",
+			"insert into t values(2,4),(0,7),(9,10),(4,3)",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query:    "with cte(i) as (select i from t) select * from cte order by (i)",
+				Expected: []sql.Row{{0}, {2}, {4}, {9}},
+			},
+			{
+				Query:    "with cte(i) as (select i from t) select * from cte order by (((i)))",
+				Expected: []sql.Row{{0}, {2}, {4}, {9}},
+			},
+			{
+				Query:    "select * from t order by (i * 10 + j)",
+				Expected: []sql.Row{{0, 7}, {2, 4}, {4, 3}, {9, 10}},
+			},
+		},
+	},
 }