Support for text keys in ALTER TABLE statements

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20241119094239-f4e529af734d
 	github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
 	github.com/dolthub/go-icu-regex v0.0.0-20250303123116-549b8d7cad00
-	github.com/dolthub/go-mysql-server v0.19.1-0.20250305230031-14a57e076a0a
+	github.com/dolthub/go-mysql-server v0.19.1-0.20250306014046-f73a318f7731
 	github.com/dolthub/sqllogictest/go v0.0.0-20240618184124-ca47f9354216
 	github.com/dolthub/vitess v0.0.0-20250304211657-920ca9ec2b9a
 	github.com/fatih/color v1.13.0

go.sum

@@ -224,8 +224,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U=
 github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0=
 github.com/dolthub/go-icu-regex v0.0.0-20250303123116-549b8d7cad00 h1:rh2ij2yTYKJWlX+c8XRg4H5OzqPewbU1lPK8pcfVmx8=
 github.com/dolthub/go-icu-regex v0.0.0-20250303123116-549b8d7cad00/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA=
-github.com/dolthub/go-mysql-server v0.19.1-0.20250305230031-14a57e076a0a h1:lemFIUt0NCKIeX7vnU2yKF8UIgc0DT8zIoEUn7oy+60=
-github.com/dolthub/go-mysql-server v0.19.1-0.20250305230031-14a57e076a0a/go.mod h1:yr+Vv47/YLOKMgiEY+QxHTlbIVpTuiVtkEZ5l+xruY4=
+github.com/dolthub/go-mysql-server v0.19.1-0.20250306014046-f73a318f7731 h1:flDUXUqKRo4u5gdoQZBeO3jESUnCNkv01GDmiZbgAA4=
+github.com/dolthub/go-mysql-server v0.19.1-0.20250306014046-f73a318f7731/go.mod h1:yr+Vv47/YLOKMgiEY+QxHTlbIVpTuiVtkEZ5l+xruY4=
 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI=
 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q=
 github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE=

server/analyzer/init.go

@@ -37,6 +37,7 @@ const (
 	ruleId_OptimizeFunctions                                          // optimizeFunctions
 	ruleId_ValidateColumnDefaults                                     // validateColumnDefaults
 	ruleId_ValidateCreateTable                                        // validateCreateTable
+	rulesId_ResolveAlterColumn                                        // resolveAlterColumn
 )
 
 // Init adds additional rules to the analyzer to handle Doltgres-specific functionality.
@@ -56,11 +57,18 @@ func Init() {
 	analyzer.OnceBeforeDefault = append([]analyzer.Rule{{Id: ruleId_AddImplicitPrefixLengths, Apply: AddImplicitPrefixLengths}},
 		analyzer.OnceBeforeDefault...)
 
+	// We remove several validation rules and substitute our own
 	analyzer.OnceBeforeDefault = insertAnalyzerRules(analyzer.OnceBeforeDefault, analyzer.ValidateCreateTableId, true,
 		analyzer.Rule{Id: ruleId_ValidateCreateTable, Apply: validateCreateTable})
+	analyzer.OnceBeforeDefault = insertAnalyzerRules(analyzer.OnceBeforeDefault, analyzer.ResolveAlterColumnId, true,
+		analyzer.Rule{Id: rulesId_ResolveAlterColumn, Apply: resolveAlterColumn})
 
-	// We remove the original column default and create table validation rules, as we have our own implementations
-	analyzer.OnceBeforeDefault = removeAnalyzerRules(analyzer.OnceBeforeDefault, analyzer.ValidateColumnDefaultsId, analyzer.ValidateCreateTableId)
+	analyzer.OnceBeforeDefault = removeAnalyzerRules(
+		analyzer.OnceBeforeDefault,
+		analyzer.ValidateColumnDefaultsId,
+		analyzer.ValidateCreateTableId,
+		analyzer.ResolveAlterColumnId,
+	)
 
 	// Remove all other validation rules that do not apply to Postgres
 	analyzer.DefaultValidationRules = removeAnalyzerRules(analyzer.DefaultValidationRules, analyzer.ValidateOperandsId)
@@ -82,9 +90,11 @@ func Init() {
 
 // insertAnalyzerRules inserts the given rule(s) before or after the given analyzer.RuleId, returning an updated slice.
 func insertAnalyzerRules(rules []analyzer.Rule, id analyzer.RuleId, before bool, additionalRules ...analyzer.Rule) []analyzer.Rule {
+	inserted := false
 	newRules := make([]analyzer.Rule, len(rules)+len(additionalRules))
 	for i, rule := range rules {
 		if rule.Id == id {
+			inserted = true
 			if before {
 				copy(newRules, rules[:i])
 				copy(newRules[i:], additionalRules)
@@ -97,6 +107,11 @@ func insertAnalyzerRules(rules []analyzer.Rule, id analyzer.RuleId, before bool,
 			break
 		}
 	}
+
+	if !inserted {
+		panic("no rules were inserted")
+	}
+
 	return newRules
 }
 
@@ -106,11 +121,20 @@ func removeAnalyzerRules(rules []analyzer.Rule, remove ...analyzer.RuleId) []ana
 	for _, removal := range remove {
 		ids[removal] = struct{}{}
 	}
+
+	removedIds := 0
 	var newRules []analyzer.Rule
 	for _, rule := range rules {
 		if _, ok := ids[rule.Id]; !ok {
 			newRules = append(newRules, rule)
+		} else {
+			removedIds++
 		}
 	}
+
+	if removedIds < len(remove) {
+		panic("one or more rules were not removed, this is a bug")
+	}
+
 	return newRules
 }