Merge branch 'main' of https://github.com/dolthub/go-mysql-server into angela/system_variables

Author: angelamayxie

enginetest/enginetests.go

@@ -793,6 +793,21 @@ func TestQueryPlanWithEngine(t *testing.T, harness Harness, e QueryEngine, tt qu
 	})
 }
 
+func TestQueryPlanScripts(t *testing.T, harness Harness) {
+	harness.Setup(setup.MydbData)
+	for _, script := range queries.QueryPlanScriptTests {
+		if sh, ok := harness.(SkippingHarness); ok {
+			if sh.SkipQueryTest(script.Name) {
+				t.Run(script.Name, func(t *testing.T) {
+					t.Skip(script.Name)
+				})
+				continue
+			}
+		}
+		TestScript(t, harness, script)
+	}
+}
+
 func TestOrderByGroupBy(t *testing.T, harness Harness) {
 	for _, tt := range queries.OrderByGroupByScriptTests {
 		TestScript(t, harness, tt)
@@ -3372,19 +3387,15 @@ func TestDropDatabase(t *testing.T, harness Harness) {
 
 func TestCreateForeignKeys(t *testing.T, harness Harness) {
 	harness.Setup(setup.MydbData, setup.MytableData)
-	e := mustNewEngine(t, harness)
-	defer e.Close()
 	for _, tt := range queries.CreateForeignKeyTests {
-		TestScriptWithEngine(t, e, harness, tt)
+		TestScript(t, harness, tt)
 	}
 }
 
 func TestDropForeignKeys(t *testing.T, harness Harness) {
 	harness.Setup(setup.MydbData, setup.MytableData)
-	e := mustNewEngine(t, harness)
-	defer e.Close()
 	for _, tt := range queries.DropForeignKeyTests {
-		TestScriptWithEngine(t, e, harness, tt)
+		TestScript(t, harness, tt)
 	}
 }
 
@@ -4527,14 +4538,14 @@ func TestPreparedInsert(t *testing.T, harness Harness) {
 					Bindings: map[string]sqlparser.Expr{
 						"v1": mustBuildBindVariable([]byte{0x99, 0x98, 0x97}),
 					},
-					ExpectedErrStr: "invalid string for charset utf8mb4: '[153 152 151]'",
+					ExpectedErrStr: "Incorrect string value: '\\x99\\x98\\x97' for column 'v1' at row 1",
 				},
 				{
 					Query: "INSERT INTO test VALUES (?);",
 					Bindings: map[string]sqlparser.Expr{
 						"v1": mustBuildBindVariable(string([]byte{0x99, 0x98, 0x97})),
 					},
-					ExpectedErrStr: "invalid string for charset utf8mb4: '[153 152 151]'",
+					ExpectedErrStr: "Incorrect string value: '\\x99\\x98\\x97' for column 'v1' at row 1",
 				},
 				{
 					Query: "INSERT INTO test2 VALUES (?);",
@@ -6151,6 +6162,26 @@ func TestSQLLogicTests(t *testing.T, harness Harness) {
 	}
 }
 
+func TestTimeQueries(t *testing.T, harness Harness) {
+	// "America/Phoenix" is a non-UTC time zone that does not observe daylight savings time
+	phoenixTimeZone, _ := time.LoadLocation("America/Phoenix")
+	mockNow := time.Date(2025, time.July, 23, 9, 43, 21, 0, phoenixTimeZone)
+	for _, script := range queries.TimeQueryTests {
+		if sh, ok := harness.(SkippingHarness); ok {
+			if sh.SkipQueryTest(script.Name) {
+				t.Run(script.Name, func(t *testing.T) {
+					t.Skip(script.Name)
+				})
+				continue
+			}
+		}
+		sql.RunWithNowFunc(func() time.Time { return mockNow }, func() error {
+			TestScript(t, harness, script)
+			return nil
+		})
+	}
+}
+
 // ExecuteNode builds an iterator and then drains it.
 // This is useful for populating actual row counts for `DESCRIBE ANALYZE`.
 func ExecuteNode(ctx *sql.Context, engine QueryEngine, node sql.Node) error {

enginetest/evaluation.go

@@ -144,12 +144,20 @@ func TestScriptWithEngine(t *testing.T, e QueryEngine, harness Harness, script q
 					}
 					TestQueryWithContext(t, ctx, e, harness, assertion.Query, expected, assertion.ExpectedColumns, assertion.Bindings, nil)
 				}
+
 				if assertion.ExpectedIndexes != nil && !IsServerEngine(e) {
 					evalIndexTest(t, harness, e, assertion.Query, assertion.ExpectedIndexes, assertion.Skip)
 				}
 				if assertion.JoinTypes != nil && !IsServerEngine(e) {
 					evalJoinTypeTest(t, harness, e, assertion.Query, assertion.JoinTypes, assertion.Skip)
 				}
+
+				if assertion.ExpectedPlan != "" && !IsServerEngine(e) {
+					options := sql.DescribeOptions{
+						Debug: true,
+					}
+					TestQueryPlanWithName(t, options.String(), harness, e, assertion.Query, assertion.ExpectedPlan, options)
+				}
 			})
 		}
 	})
@@ -852,7 +860,7 @@ func WidenRow(t *testing.T, sch sql.Schema, row sql.Row) sql.Row {
 	widened := make(sql.Row, len(row))
 	for i, v := range row {
 		if i < len(sch) && types.IsJSON(sch[i].Type) {
-			widened[i] = widenJSONValues(v)
+			widened[i] = widenJSONValues(t.Context(), v)
 			continue
 		}
 
@@ -893,7 +901,7 @@ func widenValue(t *testing.T, v interface{}) (vw interface{}) {
 	return vw
 }
 
-func widenJSONValues(val interface{}) sql.JSONWrapper {
+func widenJSONValues(ctx context.Context, val interface{}) sql.JSONWrapper {
 	if val == nil {
 		return nil
 	}
@@ -907,7 +915,7 @@ func widenJSONValues(val interface{}) sql.JSONWrapper {
 		js = types.MustJSON(str)
 	}
 
-	doc, err := js.ToInterface()
+	doc, err := js.ToInterface(ctx)
 	if err != nil {
 		panic(err)
 	}

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/memory_engine_test.go

@@ -156,7 +156,6 @@ func TestSingleQuery(t *testing.T) {
 		Expected: []sql.Row{{-1}},
 	}
 
-	fmt.Sprintf("%v", test)
 	harness := enginetest.NewMemoryHarness("", 1, testNumPartitions, true, nil)
 	// harness.UseServer()
 	harness.Setup(setup.MydbData, setup.NiltableData)
@@ -186,7 +185,6 @@ func TestSingleQueryPrepared(t *testing.T) {
 		},
 	}
 
-	fmt.Sprintf("%v", test)
 	harness := enginetest.NewMemoryHarness("", 1, testNumPartitions, false, nil)
 	harness.Setup(setup.KeylessSetup...)
 	engine, err := harness.NewEngine(t)
@@ -329,6 +327,10 @@ func TestQueryPlans(t *testing.T) {
 	}
 }
 
+func TestQueryPlanScripts(t *testing.T) {
+	enginetest.TestQueryPlanScripts(t, enginetest.NewMemoryHarness("default", 1, testNumPartitions, true, mergableIndexDriver))
+}
+
 func TestSingleQueryPlan(t *testing.T) {
 	t.Skip()
 	tt := []queries.QueryPlanTest{
@@ -1099,3 +1101,7 @@ func TestSQLLogicTestFiles(t *testing.T) {
 	}
 	logictest.RunTestFiles(h, paths...)
 }
+
+func TestTimeQueries(t *testing.T) {
+	enginetest.TestTimeQueries(t, enginetest.NewDefaultMemoryHarness())
+}