rm add func and inline type validation

Author: elianddb

sql/analyzer/validate_create_table.go

@@ -337,7 +337,7 @@ func resolveAlterColumn(ctx *sql.Context, a *Analyzer, n sql.Node, scope *plan.S
 	// We can't evaluate auto-increment until the end of the analysis, since we break adding a new auto-increment unique
 	// column into two steps: first add the column, then create the index. If there was no index created, that's an error.
 	if addedColumn {
-		err = validateAutoIncrementAdd(sch, keyedColumns)
+		err = validateAutoIncrementModify(sch, keyedColumns)
 		if err != nil {
 			return nil, false, err
 		}
@@ -788,17 +788,13 @@ func removeInSchema(sch sql.Schema, colName, tableName string) sql.Schema {
 	return schCopy
 }
 
-// validateAutoIncrementType returns true if the given type can be used with AUTO_INCREMENT
-func validateAutoIncrementType(t sql.Type) bool {
-	// Under MySQL 8.4+ only integer types can be used with AUTO_INCREMENT
-	return types.IsInteger(t)
-}
-
+// validateAutoIncrementModify checks that the schema is valid for an ALTER TABLE statement that modifies an AUTO_INCREMENT column.
 func validateAutoIncrementModify(schema sql.Schema, keyedColumns map[string]bool) error {
 	seen := false
 	for _, col := range schema {
 		if col.AutoIncrement {
-			if !validateAutoIncrementType(col.Type) {
+			// Under MySQL 8.4+ only integer types can be used with AUTO_INCREMENT
+			if !types.IsInteger(col.Type) {
 				return sql.ErrInvalidColumnSpecifier.New(col.Name)
 			}
 			// keyedColumns == nil means they are trying to add auto_increment column
@@ -820,33 +816,6 @@ func validateAutoIncrementModify(schema sql.Schema, keyedColumns map[string]bool
 	return nil
 }
 
-func validateAutoIncrementAdd(schema sql.Schema, keyColumns map[string]bool) error {
-	seen := false
-	for _, col := range schema {
-		if col.AutoIncrement {
-			{
-				if !validateAutoIncrementType(col.Type) {
-					return sql.ErrInvalidColumnSpecifier.New(col.Name)
-				}
-				if !col.PrimaryKey && !keyColumns[col.Name] {
-					// AUTO_INCREMENT col must be a key
-					return sql.ErrInvalidAutoIncCols.New()
-				}
-				if col.Default != nil {
-					// AUTO_INCREMENT col cannot have default
-					return sql.ErrInvalidAutoIncCols.New()
-				}
-				if seen {
-					// there can be at most one AUTO_INCREMENT col
-					return sql.ErrInvalidAutoIncCols.New()
-				}
-				seen = true
-			}
-		}
-	}
-	return nil
-}
-
 func schToColMap(sch sql.Schema) map[string]*sql.Column {
 	colMap := make(map[string]*sql.Column, len(sch))
 	for _, col := range sch {