Replace static functions with references to global interafaces

Author: zachmu

sql/parser.go

@@ -266,14 +266,4 @@ func (m *MySqlSchemaFormatter) GenerateCreateTableCheckConstraintClause(checkNam
 // identifier by replacing them with double backticks.
 func (m *MySqlSchemaFormatter) QuoteIdentifier(id string) string {
 	return fmt.Sprintf("`%s`", strings.ReplaceAll(id, "`", "``"))
-}
-
-// QuoteIdentifiers wraps each of the specified identifiers in backticks, escapes all occurrences of backticks in
-// the identifier, and returns a slice of the quoted identifiers.
-func (m *MySqlSchemaFormatter) QuoteIdentifiers(ids []string) []string {
-	quoted := make([]string, len(ids))
-	for i, id := range ids {
-		quoted[i] = QuoteIdentifier(id)
-	}
-	return quoted
-}
+}

sql/sqlfmt.go

@@ -14,11 +14,6 @@
 
 package sql
 
-import (
-	"fmt"
-	"strings"
-)
-
 // All functions here are used together to generate 'CREATE TABLE' statement. Each function takes what it requires
 // to build the definition, which are mostly exact names or values (e.g. columns, indexes names, types, etc.)
 // These functions allow creating the compatible 'CREATE TABLE' statement from both GMS and Dolt, which use different
@@ -27,133 +22,37 @@ import (
 // GenerateCreateTableStatement returns 'CREATE TABLE' statement with given table names
 // and column definition statements in order and the collation and character set names for the table
 func GenerateCreateTableStatement(tblName string, colStmts []string, temp, autoInc, tblCharsetName, tblCollName, comment string) string {
-	if comment != "" {
-		// Escape any single quotes in the comment and add the COMMENT keyword
-		comment = strings.ReplaceAll(comment, "'", "''")
-		comment = fmt.Sprintf(" COMMENT='%s'", comment)
-	}
-
-	if autoInc != "" {
-		autoInc = fmt.Sprintf(" AUTO_INCREMENT=%s", autoInc)
-	}
-
-	return fmt.Sprintf(
-		"CREATE%s TABLE %s (\n%s\n) ENGINE=InnoDB%s DEFAULT CHARSET=%s COLLATE=%s%s",
-		temp,
-		QuoteIdentifier(tblName),
-		strings.Join(colStmts, ",\n"),
-		autoInc,
-		tblCharsetName,
-		tblCollName,
-		comment,
-	)
+	return GlobalSchemaFormatter.GenerateCreateTableStatement(tblName, colStmts, temp, autoInc, tblCharsetName, tblCollName, comment)
 }
 
 // GenerateCreateTableColumnDefinition returns column definition string for 'CREATE TABLE' statement for given column.
 // This part comes first in the 'CREATE TABLE' statement.
 func GenerateCreateTableColumnDefinition(col *Column, colDefault, onUpdate string, tableCollation CollationID) string {
-	var colTypeString string
-	if collationType, ok := col.Type.(TypeWithCollation); ok {
-		colTypeString = collationType.StringWithTableCollation(tableCollation)
-	} else {
-		colTypeString = col.Type.String()
-	}
-	stmt := fmt.Sprintf("  %s %s", QuoteIdentifier(col.Name), colTypeString)
-	if !col.Nullable {
-		stmt = fmt.Sprintf("%s NOT NULL", stmt)
-	}
-
-	if col.AutoIncrement {
-		stmt = fmt.Sprintf("%s AUTO_INCREMENT", stmt)
-	}
-
-	if c, ok := col.Type.(SpatialColumnType); ok {
-		if s, d := c.GetSpatialTypeSRID(); d {
-			stmt = fmt.Sprintf("%s /*!80003 SRID %v */", stmt, s)
-		}
-	}
-
-	if col.Generated != nil {
-		storedStr := ""
-		if !col.Virtual {
-			storedStr = " STORED"
-		}
-		stmt = fmt.Sprintf("%s GENERATED ALWAYS AS %s%s", stmt, col.Generated.String(), storedStr)
-	}
-
-	if col.Default != nil && col.Generated == nil {
-		stmt = fmt.Sprintf("%s DEFAULT %s", stmt, colDefault)
-	}
-
-	if col.OnUpdate != nil {
-		stmt = fmt.Sprintf("%s ON UPDATE %s", stmt, onUpdate)
-	}
-
-	if col.Comment != "" {
-		stmt = fmt.Sprintf("%s COMMENT '%s'", stmt, col.Comment)
-	}
-	return stmt
+	return GlobalSchemaFormatter.GenerateCreateTableColumnDefinition(col, colDefault, onUpdate, tableCollation)
 }
 
 // GenerateCreateTablePrimaryKeyDefinition returns primary key definition string for 'CREATE TABLE' statement
 // for given column(s). This part comes after each column definitions.
 func GenerateCreateTablePrimaryKeyDefinition(pkCols []string) string {
-	return fmt.Sprintf("  PRIMARY KEY (%s)", strings.Join(QuoteIdentifiers(pkCols), ","))
+	return GlobalSchemaFormatter.GenerateCreateTablePrimaryKeyDefinition(pkCols)
 }
 
 // GenerateCreateTableIndexDefinition returns index definition string for 'CREATE TABLE' statement
 // for given index. This part comes after primary key definition if there is any.
 func GenerateCreateTableIndexDefinition(isUnique, isSpatial, isFullText, isVector bool, indexID string, indexCols []string, comment string) string {
-	unique := ""
-	if isUnique {
-		unique = "UNIQUE "
-	}
-
-	spatial := ""
-	if isSpatial {
-		unique = "SPATIAL "
-	}
-
-	fulltext := ""
-	if isFullText {
-		fulltext = "FULLTEXT "
-	}
-
-	vector := ""
-	if isVector {
-		vector = "VECTOR "
-	}
-
-	key := fmt.Sprintf("  %s%s%s%sKEY %s (%s)", unique, spatial, fulltext, vector, QuoteIdentifier(indexID), strings.Join(indexCols, ","))
-	if comment != "" {
-		key = fmt.Sprintf("%s COMMENT '%s'", key, comment)
-	}
-	return key
+	return GlobalSchemaFormatter.GenerateCreateTableIndexDefinition(isUnique, isSpatial, isFullText, isVector, indexID, indexCols, comment)
 }
 
 // GenerateCreateTableForiegnKeyDefinition returns foreign key constraint definition string for 'CREATE TABLE' statement
 // for given foreign key. This part comes after index definitions if there are any.
 func GenerateCreateTableForiegnKeyDefinition(fkName string, fkCols []string, parentTbl string, parentCols []string, onDelete, onUpdate string) string {
-	keyCols := strings.Join(QuoteIdentifiers(fkCols), ",")
-	refCols := strings.Join(QuoteIdentifiers(parentCols), ",")
-	fkey := fmt.Sprintf("  CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s)", QuoteIdentifier(fkName), keyCols, QuoteIdentifier(parentTbl), refCols)
-	if onDelete != "" {
-		fkey = fmt.Sprintf("%s ON DELETE %s", fkey, onDelete)
-	}
-	if onUpdate != "" {
-		fkey = fmt.Sprintf("%s ON UPDATE %s", fkey, onUpdate)
-	}
-	return fkey
+	return GlobalSchemaFormatter.GenerateCreateTableForiegnKeyDefinition(fkName, fkCols, parentTbl, parentCols, onDelete, onUpdate)
 }
 
 // GenerateCreateTableCheckConstraintClause returns check constraint clause string for 'CREATE TABLE' statement
 // for given check constraint. This part comes the last and after foreign key definitions if there are any.
 func GenerateCreateTableCheckConstraintClause(checkName, checkExpr string, enforced bool) string {
-	cc := fmt.Sprintf("  CONSTRAINT %s CHECK (%s)", QuoteIdentifier(checkName), checkExpr)
-	if !enforced {
-		cc = fmt.Sprintf("%s /*!80016 NOT ENFORCED */", cc)
-	}
-	return cc
+	return GlobalSchemaFormatter.GenerateCreateTableCheckConstraintClause(checkName, checkExpr, enforced)
 }
 
 // QuoteIdentifier wraps the specified identifier in backticks and escapes all occurrences of backticks in the