Skip to content

fixed output bug for foreign key constraints #10347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zachmu merged 5 commits into from
Jan 22, 2026
Merged

fixed output bug for foreign key constraints #10347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
59cf914
fixed output bug for foreign key constraints
zachmu Jan 21, 2026
c135f26
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/upda…
zachmu Jan 21, 2026
60f0c52
fixed test
zachmu Jan 21, 2026
36463bb
Merge branch 'zachmu/merge-bug' of github.com:dolthub/dolt into zachm…
zachmu Jan 21, 2026
cbde862
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/upda…
zachmu Jan 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go/libraries/doltcore/sqle/dsess/transactions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 3 additions & 6 deletions go/libraries/doltcore/sqle/enginetest/dolt_transaction_queries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ",
},
Expand Down Expand Up @@ -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",
},
Expand Down
Loading