Merge pull request #2995 from dolthub/tim/fix-enum-ecaping

Fixed enum escaping issue

Author: timsehn

sql/types/enum.go

@@ -359,7 +359,11 @@ func (t EnumType) WithNewCollation(collation sql.CollationID) (sql.Type, error)
 
 // StringWithTableCollation implements sql.TypeWithCollation interface.
 func (t EnumType) StringWithTableCollation(tableCollation sql.CollationID) string {
-	s := fmt.Sprintf("enum('%v')", strings.Join(t.idxToVal, `','`))
+	escapedValues := make([]string, len(t.idxToVal))
+	for i, value := range t.idxToVal {
+		escapedValues[i] = strings.ReplaceAll(value, "'", "''")
+	}
+	s := fmt.Sprintf("enum('%s')", strings.Join(escapedValues, `','`))
 	if t.CharacterSet() != tableCollation.CharacterSet() {
 		s += " CHARACTER SET " + t.CharacterSet().String()
 	}

sql/types/set.go

@@ -306,7 +306,12 @@ func (t SetType) WithNewCollation(collation sql.CollationID) (sql.Type, error) {
 
 // StringWithTableCollation implements sql.TypeWithCollation interface.
 func (t SetType) StringWithTableCollation(tableCollation sql.CollationID) string {
-	s := fmt.Sprintf("set('%v')", strings.Join(t.Values(), `','`))
+	values := t.Values()
+	escapedValues := make([]string, len(values))
+	for i, value := range values {
+		escapedValues[i] = strings.ReplaceAll(value, "'", "''")
+	}
+	s := fmt.Sprintf("set('%s')", strings.Join(escapedValues, `','`))
 	if t.CharacterSet() != tableCollation.CharacterSet() {
 		s += " CHARACTER SET " + t.CharacterSet().String()
 	}