Skip to content
Merged
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions testing/go/enginetest/doltgres_engine_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1258,6 +1258,7 @@ func TestDoltMerge(t *testing.T) {
"dolt_merge() (3way) with a gap in an auto increment key", // sequencing doesn't work globally after merge, need to decide product behavior
Comment thread
fulghum marked this conversation as resolved.
"dolt_merge() with a gap in an auto increment key", // unsupported insert statements (need to call next_val, not insert NULL)
"Merge does not panic when FK is dropped and re-added on one branch and child has composite PK with mixed types", // different foreign key syntax
"three-way merge of table with vector index", // MySQL VECTOR type has no Postgres equivalent
})
denginetest.RunDoltMergeTests(t, h)
}
Expand Down
Loading