Merge pull request #1858 from dolthub/zachmu/autoinc

[no-release-notes] Cleaned up a bunch of test logic, moved it into ScriptTest format

Author: zachmu

enginetest/enginetests.go

@@ -5401,31 +5401,9 @@ func TestJsonScripts(t *testing.T, harness Harness) {
 }
 
 func TestAlterTable(t *testing.T, harness Harness) {
-	errorTests := []queries.QueryErrorTest{
-		{
-			Query:       "ALTER TABLE one_pk_two_idx MODIFY COLUMN v1 BIGINT DEFAULT (pk) AFTER v3",
-			ExpectedErr: sql.ErrTableColumnNotFound,
-		},
-		{
-			Query:       "ALTER TABLE one_pk_two_idx ADD COLUMN v4 BIGINT DEFAULT (pk) AFTER v3",
-			ExpectedErr: sql.ErrTableColumnNotFound,
-		},
-		{
-			Query:       "ALTER TABLE one_pk_two_idx ADD COLUMN v3 BIGINT DEFAULT 5, RENAME COLUMN v3 to v4",
-			ExpectedErr: sql.ErrTableColumnNotFound,
-		},
-		{
-			Query:       "ALTER TABLE one_pk_two_idx ADD COLUMN v3 BIGINT DEFAULT 5, modify column v3 bigint default null",
-			ExpectedErr: sql.ErrTableColumnNotFound,
-		},
-	}
-
 	harness.Setup(setup.MydbData, setup.Pk_tablesData)
 	e := mustNewEngine(t, harness)
 	defer e.Close()
-	for _, tt := range errorTests {
-		runQueryErrorTest(t, harness, tt)
-	}
 
 	t.Run("variety of alter column statements in a single statement", func(t *testing.T) {
 		RunQuery(t, e, harness, "CREATE TABLE t32(pk BIGINT PRIMARY KEY, v1 int, v2 int, v3 int default (v1), toRename int)")
@@ -5503,216 +5481,9 @@ func TestAlterTable(t *testing.T, harness Harness) {
 		}, checks)
 	})
 
-	t.Run("drop column drops check constraint", func(t *testing.T) {
-		RunQuery(t, e, harness, "create table t34 (i bigint primary key, s varchar(20))")
-		RunQuery(t, e, harness, "ALTER TABLE t34 ADD COLUMN j int")
-		RunQuery(t, e, harness, "ALTER TABLE t34 ADD CONSTRAINT test_check CHECK (j < 12345)")
-		RunQuery(t, e, harness, "ALTER TABLE t34 DROP COLUMN j")
-		tt := queries.QueryTest{
-			Query: "show create table t34",
-			Expected: []sql.Row{{"t34", "CREATE TABLE `t34` (\n" +
-				"  `i` bigint NOT NULL,\n" +
-				"  `s` varchar(20),\n" +
-				"  PRIMARY KEY (`i`)\n" +
-				") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin"}},
-		}
-		TestQueryWithEngine(t, harness, e, tt)
-	})
-
-	t.Run("drop column drops all relevant check constraints", func(t *testing.T) {
-		RunQuery(t, e, harness, "create table t42 (i bigint primary key, s varchar(20))")
-		RunQuery(t, e, harness, "ALTER TABLE t42 ADD COLUMN j int")
-		RunQuery(t, e, harness, "ALTER TABLE t42 ADD CONSTRAINT check1 CHECK (j < 12345)")
-		RunQuery(t, e, harness, "ALTER TABLE t42 ADD CONSTRAINT check2 CHECK (j > 0)")
-		RunQuery(t, e, harness, "ALTER TABLE t42 DROP COLUMN j")
-		tt := queries.QueryTest{
-			Query: "show create table t42",
-			Expected: []sql.Row{{"t42", "CREATE TABLE `t42` (\n" +
-				"  `i` bigint NOT NULL,\n" +
-				"  `s` varchar(20),\n" +
-				"  PRIMARY KEY (`i`)\n" +
-				") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin"}},
-		}
-		TestQueryWithEngine(t, harness, e, tt)
-	})
-
-	t.Run("drop column drops correct check constraint", func(t *testing.T) {
-		RunQuery(t, e, harness, "create table t41 (i bigint primary key, s varchar(20))")
-		RunQuery(t, e, harness, "ALTER TABLE t41 ADD COLUMN j int")
-		RunQuery(t, e, harness, "ALTER TABLE t41 ADD COLUMN k int")
-		RunQuery(t, e, harness, "ALTER TABLE t41 ADD CONSTRAINT j_check CHECK (j < 12345)")
-		RunQuery(t, e, harness, "ALTER TABLE t41 ADD CONSTRAINT k_check CHECK (k < 123)")
-		RunQuery(t, e, harness, "ALTER TABLE t41 DROP COLUMN j")
-		tt := queries.QueryTest{
-			Query: "show create table t41",
-			Expected: []sql.Row{{"t41", "CREATE TABLE `t41` (\n" +
-				"  `i` bigint NOT NULL,\n" +
-				"  `s` varchar(20),\n" +
-				"  `k` int,\n" +
-				"  PRIMARY KEY (`i`),\n" +
-				"  CONSTRAINT `k_check` CHECK ((`k` < 123))\n" +
-				") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin"}},
-		}
-		TestQueryWithEngine(t, harness, e, tt)
-	})
-
-	t.Run("drop column does not drop when referenced in constraint with other column", func(t *testing.T) {
-		RunQuery(t, e, harness, "create table t43 (i bigint primary key, s varchar(20))")
-		RunQuery(t, e, harness, "ALTER TABLE t43 ADD COLUMN j int")
-		RunQuery(t, e, harness, "ALTER TABLE t43 ADD COLUMN k int")
-		RunQuery(t, e, harness, "ALTER TABLE t43 ADD CONSTRAINT test_check CHECK (j < k)")
-		AssertErr(t, e, harness, "ALTER TABLE t43 DROP COLUMN j", sql.ErrCheckConstraintInvalidatedByColumnAlter)
-		tt := queries.QueryTest{
-			Query: "show create table t43",
-			Expected: []sql.Row{{"t43", "CREATE TABLE `t43` (\n" +
-				"  `i` bigint NOT NULL,\n" +
-				"  `s` varchar(20),\n" +
-				"  `j` int,\n" +
-				"  `k` int,\n" +
-				"  PRIMARY KEY (`i`),\n" +
-				"  CONSTRAINT `test_check` CHECK ((`j` < `k`))\n" +
-				") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin"}},
-		}
-		TestQueryWithEngine(t, harness, e, tt)
-	})
-
-	t.Run("drop column preserves indexes", func(t *testing.T) {
-		ctx := NewContext(harness)
-		RunQuery(t, e, harness, "create table t35 (i bigint primary key, s varchar(20), s2 varchar(20))")
-		RunQuery(t, e, harness, "ALTER TABLE t35 ADD unique key test_key (s)")
-
-		RunQuery(t, e, harness, "ALTER TABLE t35 DROP COLUMN s2")
-		TestQueryWithContext(t, ctx, e, harness, "show create table t35",
-			[]sql.Row{{"t35", "CREATE TABLE `t35` (\n" +
-				"  `i` bigint NOT NULL,\n" +
-				"  `s` varchar(20),\n" +
-				"  PRIMARY KEY (`i`),\n" +
-				"  UNIQUE KEY `test_key` (`s`)\n" +
-				") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin"}},
-			nil, nil)
-	})
-
-	t.Run("drop column prevents foreign key violations", func(t *testing.T) {
-		RunQuery(t, e, harness, "create table t36 (i bigint primary key, j varchar(20))")
-		RunQuery(t, e, harness, "create table t37 (i bigint primary key, j varchar(20))")
-		RunQuery(t, e, harness, "ALTER TABLE t36 ADD key (j)")
-		RunQuery(t, e, harness, "ALTER TABLE t37 ADD constraint fk_36 foreign key (j) references t36(j)")
-
-		AssertErr(t, e, harness, "ALTER TABLE t37 DROP COLUMN j", sql.ErrForeignKeyDropColumn)
-	})
-
-	t.Run("disable keys / enable keys", func(t *testing.T) {
-		ctx := NewContext(harness)
-		AssertWarningAndTestQuery(t, e, ctx, harness, "ALTER TABLE t33 DISABLE KEYS",
-			[]sql.Row{{types.NewOkResult(0)}},
-			nil, mysql.ERNotSupportedYet, 1,
-			"", false)
-		AssertWarningAndTestQuery(t, e, ctx, harness, "ALTER TABLE t33 ENABLE KEYS",
-			[]sql.Row{{types.NewOkResult(0)}}, nil, mysql.ERNotSupportedYet, 1,
-			"", false)
-	})
-
-	t.Run("adding a unique constraint errors if violations exist", func(t *testing.T) {
-		// single column unique constraint (success)
-		RunQuery(t, e, harness, "CREATE TABLE t38 (pk int PRIMARY KEY, col1 int)")
-		RunQuery(t, e, harness, "INSERT INTO t38 VALUES (1, 1)")
-		RunQuery(t, e, harness, "INSERT INTO t38 VALUES (2, 2)")
-		RunQuery(t, e, harness, "INSERT INTO t38 VALUES (3, NULL)")
-		RunQuery(t, e, harness, "INSERT INTO t38 VALUES (4, NULL)")
-		RunQuery(t, e, harness, "ALTER TABLE t38 ADD UNIQUE u_col1 (col1)")
-
-		// multi column unique constraint (success)
-		RunQuery(t, e, harness, "CREATE TABLE t39 (pk int PRIMARY KEY, col1 int, col2 int)")
-		RunQuery(t, e, harness, "INSERT INTO t39 VALUES (1, 1, 1)")
-		RunQuery(t, e, harness, "INSERT INTO t39 VALUES (2, 1, 2)")
-		RunQuery(t, e, harness, "INSERT INTO t39 VALUES (3, 2, 1)")
-		RunQuery(t, e, harness, "INSERT INTO t39 VALUES (4, 1, NULL)")
-		RunQuery(t, e, harness, "INSERT INTO t39 VALUES (5, 1, NULL)")
-		RunQuery(t, e, harness, "INSERT INTO t39 VALUES (6, NULL, 1)")
-		RunQuery(t, e, harness, "INSERT INTO t39 VALUES (7, NULL, 1)")
-		RunQuery(t, e, harness, "INSERT INTO t39 VALUES (8, NULL, NULL)")
-		RunQuery(t, e, harness, "INSERT INTO t39 VALUES (9, NULL, NULL)")
-		RunQuery(t, e, harness, "ALTER TABLE t39 ADD UNIQUE u_col1_col2 (col1, col2)")
-
-		// single column unique constraint (failure)
-		RunQuery(t, e, harness, "ALTER TABLE t38 DROP INDEX u_col1;")
-		RunQuery(t, e, harness, "INSERT INTO t38 VALUES (5, 1);")
-		AssertErr(t, e, harness, "ALTER TABLE t38 ADD UNIQUE u_col1 (col1)", sql.ErrUniqueKeyViolation)
-		tt := queries.QueryTest{
-			Query: "show create table t38;",
-			Expected: []sql.Row{{"t38", "CREATE TABLE `t38` (\n" +
-				"  `pk` int NOT NULL,\n" +
-				"  `col1` int,\n" +
-				"  PRIMARY KEY (`pk`)\n" +
-				") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin"}},
-		}
-		TestQueryWithEngine(t, harness, e, tt)
-
-		// multi column unique constraint (failure)
-		RunQuery(t, e, harness, "ALTER TABLE t39 DROP INDEX u_col1_col2;")
-		RunQuery(t, e, harness, "INSERT INTO t39 VALUES (10, 1, 1);")
-		AssertErr(t, e, harness, "ALTER TABLE t39 ADD UNIQUE u_col1_col2 (col1, col2)", sql.ErrUniqueKeyViolation)
-		tt = queries.QueryTest{
-			Query: "show create table t39;",
-			Expected: []sql.Row{{"t39", "CREATE TABLE `t39` (\n" +
-				"  `pk` int NOT NULL,\n" +
-				"  `col1` int,\n" +
-				"  `col2` int,\n" +
-				"  PRIMARY KEY (`pk`)\n" +
-				") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin"}},
-		}
-		TestQueryWithEngine(t, harness, e, tt)
-	})
-
-	t.Run("ALTER TABLE remove AUTO_INCREMENT", func(t *testing.T) {
-		RunQuery(t, e, harness, "CREATE TABLE t40 (pk int AUTO_INCREMENT PRIMARY KEY, val int)")
-		RunQuery(t, e, harness, "INSERT into t40 VALUES (1, 1), (NULL, 2), (NULL, 3)")
-
-		RunQuery(t, e, harness, "ALTER TABLE t40 MODIFY COLUMN pk int")
-		ctx := harness.NewContext()
-		TestQueryWithContext(t, ctx, e, harness, "DESCRIBE t40", []sql.Row{
-			{"pk", "int", "NO", "PRI", "NULL", ""},
-			{"val", "int", "YES", "", "NULL", ""}},
-			nil, nil)
-
-		AssertErr(t, e, harness, "INSERT INTO t40 VALUES (NULL, 4)", sql.ErrInsertIntoNonNullableProvidedNull)
-		RunQuery(t, e, harness, "DROP TABLE t40")
-
-		RunQuery(t, e, harness, "CREATE TABLE t40 (pk int AUTO_INCREMENT PRIMARY KEY, val int)")
-		RunQuery(t, e, harness, "INSERT into t40 VALUES (NULL, 1)")
-
-		TestQueryWithContext(t, ctx, e, harness, "SELECT * FROM t40", []sql.Row{{1, 1}}, nil, nil)
-	})
-
-	TestScript(t, harness, queries.ScriptTest{
-		// https://github.com/dolthub/dolt/issues/6206
-		Name: "alter table containing column default value expressions",
-		SetUpScript: []string{
-			"create table t (pk int primary key, col1 timestamp default current_timestamp(), col2 varchar(1000), index idx1 (pk, col1));",
-		},
-		Assertions: []queries.ScriptTestAssertion{
-			{
-				Query:    "alter table t alter column col2 DROP DEFAULT;",
-				Expected: []sql.Row{},
-			},
-			{
-				Query:    "show create table t;",
-				Expected: []sql.Row{{"t", "CREATE TABLE `t` (\n  `pk` int NOT NULL,\n  `col1` timestamp(6) DEFAULT (CURRENT_TIMESTAMP()),\n  `col2` varchar(1000),\n  PRIMARY KEY (`pk`),\n  KEY `idx1` (`pk`,`col1`)\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin"}},
-			},
-			{
-				Query:    "alter table t alter column col2 SET DEFAULT 'FOO!';",
-				Expected: []sql.Row{},
-			},
-			{
-				Query:    "show create table t;",
-				Expected: []sql.Row{{"t", "CREATE TABLE `t` (\n  `pk` int NOT NULL,\n  `col1` timestamp(6) DEFAULT (CURRENT_TIMESTAMP()),\n  `col2` varchar(1000) DEFAULT 'FOO!',\n  PRIMARY KEY (`pk`),\n  KEY `idx1` (`pk`,`col1`)\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin"}},
-			},
-			{
-				Query:    "alter table t drop index idx1;",
-				Expected: []sql.Row{{types.NewOkResult(0)}},
-			},
-		},
-	})
+	for _, script := range queries.AlterTableScripts {
+		TestScript(t, harness, script)
+	}
 }
 
 func NewColumnDefaultValue(expr sql.Expression, outType sql.Type, representsLiteral, isParenthesized, mayReturnNil bool) *sql.ColumnDefaultValue {