cleanup code

Author: elianddb

sql/analyzer/resolve_column_defaults.go

@@ -273,16 +273,15 @@ func validateColumnDefault(ctx *sql.Context, col *sql.Column, colDefault *sql.Co
 		return err
 	}
 
-	// For enum literal defaults, use stricter validation than runtime conversion
+	// validate type of default expression
+	if err = colDefault.CheckType(ctx); err != nil {
+		return err
+	}
+
 	if enumType, isEnum := col.Type.(sql.EnumType); isEnum && colDefault.IsLiteral() {
 		if err = validateEnumLiteralDefault(enumType, colDefault, col.Name, ctx); err != nil {
 			return err
 		}
-	} else {
-		// validate type of default expression
-		if err = colDefault.CheckType(ctx); err != nil {
-			return err
-		}
 	}
 
 	return nil

sql/types/enum.go

@@ -165,9 +165,8 @@ func (t EnumType) Convert(ctx context.Context, v interface{}) (interface{}, sql.
 
 	switch value := v.(type) {
 	case int:
-		// Check for 0 value in strict mode - MySQL behavior
 		// MySQL rejects 0 values in strict mode regardless of enum definition
-		if value == 0 && t.isStrictMode(ctx) {
+		if value == 0 && t.validateScrictMode(ctx) {
 			return nil, sql.OutOfRange, ErrConvertingToEnum.New(value)
 		}
 		if _, ok := t.At(value); ok {
@@ -216,8 +215,8 @@ func (t EnumType) Convert(ctx context.Context, v interface{}) (interface{}, sql.
 	return nil, sql.InRange, ErrConvertingToEnum.New(v)
 }
 
-// isStrictMode checks if STRICT_TRANS_TABLES or STRICT_ALL_TABLES is enabled
-func (t EnumType) isStrictMode(ctx context.Context) bool {
+// validateScrictMode checks if STRICT_TRANS_TABLES or STRICT_ALL_TABLES is enabled
+func (t EnumType) validateScrictMode(ctx context.Context) bool {
 	if sqlCtx, ok := ctx.(*sql.Context); ok {
 		sqlMode := sql.LoadSqlMode(sqlCtx)
 		return sqlMode.ModeEnabled("STRICT_TRANS_TABLES") || sqlMode.ModeEnabled("STRICT_ALL_TABLES")