Various bug fixes for checking foreign key constraints during merge

go/libraries/doltcore/merge/mutable_secondary_index.go

@@ -85,7 +85,7 @@ func GetMutableSecondaryIdxsWithPending(ctx *sql.Context, ns tree.NodeStore, our
 			idxKeyDesc = idxKeyDesc.PrefixDesc(idxKeyDesc.Count() - 1)
 		}
 
-		if !idxKeyDesc.Equals(index.Schema().GetKeyDescriptorWithNoConversion(ns)) {
+		if !idxKeyDesc.Equals(index.Schema().GetKeyDescriptor(ns)) {
 			continue
 		}
 

go/libraries/doltcore/merge/violations_fk.go

@@ -67,9 +67,15 @@ type FKViolationReceiver interface {
 	ProllyFKViolationFound(ctx context.Context, rowKey, rowValue val.Tuple) error
 }
 
-// GetForeignKeyViolations returns the violations that have been created as a
-// result of the diff between |baseRoot| and |newRoot|. It sends the violations to |receiver|.
-func GetForeignKeyViolations(ctx *sql.Context, tableResolver doltdb.TableResolver, newRoot, baseRoot doltdb.RootValue, tables *doltdb.TableNameSet, receiver FKViolationReceiver) error {
+// RegisterForeignKeyViolations emits constraint violations that have been created as a
+// result of the diff between |baseRoot| and |newRoot|. It sends violations to |receiver|.
+func RegisterForeignKeyViolations(
+	ctx *sql.Context,
+	tableResolver doltdb.TableResolver,
+	newRoot, baseRoot doltdb.RootValue,
+	tables *doltdb.TableNameSet,
+	receiver FKViolationReceiver,
+) error {
 	fkColl, err := newRoot.GetForeignKeyCollection(ctx)
 	if err != nil {
 		return err
@@ -158,7 +164,7 @@ func GetForeignKeyViolations(ctx *sql.Context, tableResolver doltdb.TableResolve
 // todo(andy): pass doltdb.Rootish
 func AddForeignKeyViolations(ctx *sql.Context, tableResolver doltdb.TableResolver, newRoot, baseRoot doltdb.RootValue, tables *doltdb.TableNameSet, theirRootIsh hash.Hash) (doltdb.RootValue, *doltdb.TableNameSet, error) {
 	violationWriter := &foreignKeyViolationWriter{tableResolver: tableResolver, rootValue: newRoot, theirRootIsh: theirRootIsh, violatedTables: doltdb.NewTableNameSet(nil)}
-	err := GetForeignKeyViolations(ctx, tableResolver, newRoot, baseRoot, tables, violationWriter)
+	err := RegisterForeignKeyViolations(ctx, tableResolver, newRoot, baseRoot, tables, violationWriter)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -169,7 +175,7 @@ func AddForeignKeyViolations(ctx *sql.Context, tableResolver doltdb.TableResolve
 // violations based on the diff between |newRoot| and |baseRoot|.
 func GetForeignKeyViolatedTables(ctx *sql.Context, tableResolver doltdb.TableResolver, newRoot, baseRoot doltdb.RootValue, tables *doltdb.TableNameSet) (*doltdb.TableNameSet, error) {
 	handler := &foreignKeyViolationTracker{tableSet: doltdb.NewTableNameSet(nil)}
-	err := GetForeignKeyViolations(ctx, tableResolver, newRoot, baseRoot, tables, handler)
+	err := RegisterForeignKeyViolations(ctx, tableResolver, newRoot, baseRoot, tables, handler)
 	if err != nil {
 		return nil, err
 	}
@@ -426,6 +432,7 @@ func childFkConstraintViolations(
 	if err != nil {
 		return err
 	}
+
 	return prollyChildSecDiffFkConstraintViolations(ctx, foreignKey, postParent, postChild, m, receiver)
 }
 
@@ -689,7 +696,13 @@ func childFkConstraintViolationsProcess(
 
 // newConstraintViolationsLoadedTable returns a *constraintViolationsLoadedTable. Returns false if the table was loaded
 // but the index could not be found. If the table could not be found, then an error is returned.
-func newConstraintViolationsLoadedTable(ctx *sql.Context, tableResolver doltdb.TableResolver, tblName doltdb.TableName, idxName string, root doltdb.RootValue) (*constraintViolationsLoadedTable, bool, error) {
+func newConstraintViolationsLoadedTable(
+	ctx *sql.Context,
+	tableResolver doltdb.TableResolver,
+	tblName doltdb.TableName,
+	idxName string,
+	root doltdb.RootValue,
+) (*constraintViolationsLoadedTable, bool, error) {
 	trueTblName, tbl, ok, err := tableResolver.ResolveTableInsensitive(ctx, root, tblName)
 	if err != nil {
 		return nil, false, err