add versioned err

Author: elianddb

enginetest/queries/script_queries.go

@@ -10536,7 +10536,7 @@ where
 			},
 			{
 				Query:       "insert into child_dec_4_1 values (78.9);",
-				ExpectedErr: sql.ErrForeignKeyChildViolation,
+				ExpectedErr: sql.ErrForeignKeyChildViolationMySQL845,
 			},
 
 			{
@@ -10559,15 +10559,15 @@ where
 			},
 			{
 				Query:       "insert into child_dec_65_30 values (1.23);",
-				ExpectedErr: sql.ErrForeignKeyChildViolation,
+				ExpectedErr: sql.ErrForeignKeyChildViolationMySQL845,
 			},
 			{
 				Query:       "insert into child_dec_4_2 values (99.99);",
-				ExpectedErr: sql.ErrForeignKeyChildViolation,
+				ExpectedErr: sql.ErrForeignKeyChildViolationMySQL845,
 			},
 			{
 				Query:       "insert into child_dec_4_1 values (99.9);",
-				ExpectedErr: sql.ErrForeignKeyChildViolation,
+				ExpectedErr: sql.ErrForeignKeyChildViolationMySQL845,
 			},
 		},
 	},

sql/errors.go

@@ -22,14 +22,6 @@ import (
 	"gopkg.in/src-d/go-errors.v1"
 )
 
-// MySQL84 contains error definitions that match MySQL 8.4 behavior and formatting
-var MySQL84 = struct {
-	// ErrForeignKeyChildViolation is the MySQL 8.4 compatible error format for foreign key child violations
-	ErrForeignKeyChildViolation *errors.Kind
-}{
-	ErrForeignKeyChildViolation: errors.NewKind("cannot add or update a child row: a foreign key constraint fails (`%s`.`%s`, CONSTRAINT `%s` FOREIGN KEY (`%s`) REFERENCES `%s` (`%s`))"),
-}
-
 var (
 	// ErrSyntaxError is returned when a syntax error in vitess is encountered.
 	ErrSyntaxError = errors.NewKind("%s")
@@ -427,7 +419,8 @@ var (
 	ErrInsertIntoNonNullableProvidedNull = errors.NewKind("column name '%v' is non-nullable but attempted to set a value of null")
 
 	// ErrForeignKeyChildViolation is called when a rows is added but there is no parent row, and a foreign key constraint fails. Add the parent row first.
-	ErrForeignKeyChildViolation = errors.NewKind("cannot add or update a child row - Foreign key violation on fk: `%s`, table: `%s`, referenced table: `%s`, key: `%s`")
+	ErrForeignKeyChildViolation         = errors.NewKind("cannot add or update a child row - Foreign key violation on fk: `%s`, table: `%s`, referenced table: `%s`, key: `%s`")
+	ErrForeignKeyChildViolationMySQL845 = errors.NewKind("cannot add or update a child row: a foreign key constraint fails (`%s`.`%s`, CONSTRAINT `%s` FOREIGN KEY (`%s`) REFERENCES `%s` (`%s`))")
 
 	// ErrForeignKeyParentViolation is called when a parent row that is deleted has children, and a foreign key constraint fails. Delete the children first.
 	ErrForeignKeyParentViolation = errors.NewKind("cannot delete or update a parent row - Foreign key violation on fk: `%s`, table: `%s`, referenced table: `%s`, key: `%s`")
@@ -989,10 +982,9 @@ func CastSQLError(err error) *mysql.SQLError {
 		code = mysql.ERDupEntry
 	case ErrPartitionNotFound.Is(err):
 		code = 1526 // TODO: Needs to be added to vitess
+	case ErrForeignKeyChildViolationMySQL845.Is(err):
 	case ErrForeignKeyChildViolation.Is(err):
 		code = mysql.ErNoReferencedRow2 // test with mysql returns 1452 vs 1216
-	case MySQL84.ErrForeignKeyChildViolation.Is(err):
-		code = mysql.ErNoReferencedRow2 // test with mysql returns 1452 vs 1216
 	case ErrForeignKeyParentViolation.Is(err):
 		code = mysql.ERRowIsReferenced2 // test with mysql returns 1451 vs 1215
 	case ErrDuplicateEntry.Is(err):

sql/plan/foreign_key_editor.go

@@ -514,9 +514,8 @@ func (reference *ForeignKeyReferenceHandler) CheckReference(ctx *sql.Context, ro
 	if err == nil {
 		// We have a parent row, but for DECIMAL types we need to be strict about precision/scale
 		if shouldReject := reference.validateDecimalMatch(ctx, row); shouldReject {
-			// Use MySQL 8.4 compatible format for DECIMAL foreign key violations
-			return sql.MySQL84.ErrForeignKeyChildViolation.New(reference.ForeignKey.Database, reference.ForeignKey.Table,
-				reference.ForeignKey.Name, strings.Join(reference.ForeignKey.Columns, ", "), 
+			return sql.ErrForeignKeyChildViolationMySQL845.New(reference.ForeignKey.Database, reference.ForeignKey.Table,
+				reference.ForeignKey.Name, strings.Join(reference.ForeignKey.Columns, ", "),
 				reference.ForeignKey.ParentTable, strings.Join(reference.ForeignKey.ParentColumns, ", "))
 		}
 		// We have a parent row so throw no error
@@ -542,9 +541,8 @@ func (reference *ForeignKeyReferenceHandler) CheckReference(ctx *sql.Context, ro
 		}
 	}
 
-	// Use MySQL 8.4 compatible format for all foreign key violations going forward
-	return sql.MySQL84.ErrForeignKeyChildViolation.New(reference.ForeignKey.Database, reference.ForeignKey.Table,
-		reference.ForeignKey.Name, strings.Join(reference.ForeignKey.Columns, ", "), 
+	return sql.ErrForeignKeyChildViolationMySQL845.New(reference.ForeignKey.Database, reference.ForeignKey.Table,
+		reference.ForeignKey.Name, strings.Join(reference.ForeignKey.Columns, ", "),
 		reference.ForeignKey.ParentTable, strings.Join(reference.ForeignKey.ParentColumns, ", "))
 }
 
@@ -624,7 +622,7 @@ func (mapper *ForeignKeyRowMapper) GetIter(ctx *sql.Context, row sql.Row, refChe
 		}
 
 		targetType := mapper.SourceSch[rowPos].Type
-		
+
 		// Transform the type of the value in this row to the one in the other table for the index lookup, if necessary
 		if mapper.TargetTypeConversions != nil && mapper.TargetTypeConversions[rowPos] != nil {
 			var err error
@@ -748,7 +746,6 @@ func GetForeignKeyTypeConversions(
 				return nil, nil
 			}
 
-
 			fromType := childExtendedType
 			toType := parentExtendedType
 			if direction == ParentToChild {