diff --git a/go/libraries/doltcore/sqle/dsess/transactions.go b/go/libraries/doltcore/sqle/dsess/transactions.go index 8023364ebd4..492680860a3 100644 --- a/go/libraries/doltcore/sqle/dsess/transactions.go +++ b/go/libraries/doltcore/sqle/dsess/transactions.go @@ -690,7 +690,7 @@ func (tx *DoltTransaction) validateWorkingSetForCommit(ctx *sql.Context, working "\tTable: %s,\n"+ "\tReferencedTable: %s,\n"+ "\tIndex: %s,\n"+ - "\tReferencedIndex: %s", m.ForeignKey, m.Table, m.ReferencedIndex, m.Index, m.ReferencedIndex) + "\tReferencedIndex: %s", m.ForeignKey, m.Table, m.ReferencedTable, m.Index, m.ReferencedIndex) case prolly.ArtifactTypeUniqueKeyViol: var m merge.UniqCVMeta diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_transaction_queries.go b/go/libraries/doltcore/sqle/enginetest/dolt_transaction_queries.go index 3dfd25d3785..9c62227c883 100755 --- a/go/libraries/doltcore/sqle/enginetest/dolt_transaction_queries.go +++ b/go/libraries/doltcore/sqle/enginetest/dolt_transaction_queries.go @@ -2106,15 +2106,12 @@ var DoltConstraintViolationTransactionTests = []queries.TransactionTest{ }, { Query: "/* client b */ COMMIT;", - ExpectedErrStr: "Committing this transaction resulted in a working set with constraint violations, transaction rolled back. " + - "This constraint violation may be the result of a previous merge or the result of transaction sequencing. " + - "Constraint violations from a merge can be resolved using the dolt_constraint_violations table before committing the transaction. " + - "To allow transactions to be committed with constraint violations from a merge or transaction sequencing set @@dolt_force_transaction_commit=1.\n" + + ExpectedErrStr: "Committing this transaction resulted in a working set with constraint violations, transaction rolled back. This constraint violation may be the result of a previous merge or the result of transaction sequencing. Constraint violations from a merge can be resolved using the dolt_constraint_violations table before committing the transaction. To allow transactions to be committed with constraint violations from a merge or transaction sequencing set @@dolt_force_transaction_commit=1.\n" + "Constraint violations: \n" + "Type: Foreign Key Constraint Violation\n" + "\tForeignKey: child_ibfk_1,\n" + "\tTable: child,\n" + - "\tReferencedTable: ,\n" + + "\tReferencedTable: parent,\n" + "\tIndex: parent_fk,\n" + "\tReferencedIndex: ", }, @@ -2237,7 +2234,7 @@ var DoltConstraintViolationTransactionTests = []queries.TransactionTest{ "Type: Foreign Key Constraint Violation\n" + "\tForeignKey: fk_name,\n" + "\tTable: child,\n" + - "\tReferencedTable: v1,\n" + + "\tReferencedTable: parent,\n" + "\tIndex: fk_name,\n" + "\tReferencedIndex: v1", },