Merge branch 'main' into angelamayxie-87bce348

Author: angelamayxie

enginetest/queries/alter_table_queries.go

@@ -2273,6 +2273,20 @@ var ModifyColumnScripts = []ScriptTest{
 			},
 		},
 	},
+	{
+		// https://github.com/dolthub/dolt/issues/9591
+		Name: "Add check constraint when modifying column",
+		SetUpScript: []string{
+			"create table t(pk int primary key)",
+			"alter table t modify column pk int check(pk < 10)",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query:       "insert into t values (20)",
+				ExpectedErr: sql.ErrCheckConstraintViolated,
+			},
+		},
+	},
 	{
 		Name:        "error cases",
 		SetUpScript: []string{},

sql/analyzer/validate_create_table.go

@@ -458,7 +458,7 @@ func ValidateModifyColumn(ctx *sql.Context, initialSch sql.Schema, schema sql.Sc
 	// It cannot have been renamed in the same statement.
 	oldColName := mc.Column()
 	if !schema.Contains(oldColName, tableName) || !initialSch.Contains(oldColName, tableName) {
-		return nil, sql.ErrTableColumnNotFound.New(table, oldColName)
+		return nil, sql.ErrTableColumnNotFound.New(tableName, oldColName)
 	}
 
 	newCol := mc.NewColumn()