Multi-machine setups with dolt_auto_push_* rows in the metadata table cause recurring merge conflicts on every pull. This adds auto-resolution for metadata-only conflicts (take "theirs") and a migration to clean up stale dolt_auto_push_* rows from existing databases. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
189 lines
7 KiB
Go
189 lines
7 KiB
Go
package dolt
|
|
|
|
import (
|
|
"testing"
|
|
)
|
|
|
|
// TestPullAutoResolveMetadataConflicts verifies that merge conflicts limited to
|
|
// the metadata table are automatically resolved with "theirs" strategy (GH#2466).
|
|
// This simulates the scenario where two machines each write different
|
|
// dolt_auto_push_* values to the metadata table, causing recurring conflicts on pull.
|
|
func TestPullAutoResolveMetadataConflicts(t *testing.T) {
|
|
store, cleanup := setupTestStore(t)
|
|
defer cleanup()
|
|
|
|
ctx, cancel := testContext(t)
|
|
defer cancel()
|
|
|
|
db := store.db
|
|
|
|
// Record the current branch (our test branch).
|
|
var currentBranch string
|
|
if err := db.QueryRowContext(ctx, "SELECT active_branch()").Scan(¤tBranch); err != nil {
|
|
t.Fatalf("failed to get current branch: %v", err)
|
|
}
|
|
|
|
// Insert a metadata row on the current branch and commit.
|
|
if _, err := db.ExecContext(ctx, "INSERT INTO metadata (`key`, value) VALUES ('dolt_auto_push_commit', 'aaa')"); err != nil {
|
|
t.Fatalf("failed to insert metadata on current branch: %v", err)
|
|
}
|
|
if _, err := db.ExecContext(ctx, "CALL DOLT_COMMIT('-Am', 'local metadata')"); err != nil {
|
|
t.Fatalf("failed to commit on current branch: %v", err)
|
|
}
|
|
|
|
// Create a divergent branch to simulate the remote.
|
|
remoteBranch := currentBranch + "_remote"
|
|
// Branch from current branch's parent (HEAD~1).
|
|
if _, err := db.ExecContext(ctx, "CALL DOLT_BRANCH(?, 'HEAD~1')", remoteBranch); err != nil {
|
|
t.Fatalf("failed to create remote branch: %v", err)
|
|
}
|
|
defer func() {
|
|
db.ExecContext(ctx, "CALL DOLT_CHECKOUT(?)", currentBranch)
|
|
db.ExecContext(ctx, "CALL DOLT_BRANCH('-D', ?)", remoteBranch)
|
|
}()
|
|
|
|
// Switch to remote branch and insert conflicting metadata.
|
|
if _, err := db.ExecContext(ctx, "CALL DOLT_CHECKOUT(?)", remoteBranch); err != nil {
|
|
t.Fatalf("failed to checkout remote branch: %v", err)
|
|
}
|
|
if _, err := db.ExecContext(ctx, "INSERT INTO metadata (`key`, value) VALUES ('dolt_auto_push_commit', 'bbb')"); err != nil {
|
|
t.Fatalf("failed to insert metadata on remote branch: %v", err)
|
|
}
|
|
if _, err := db.ExecContext(ctx, "CALL DOLT_COMMIT('-Am', 'remote metadata')"); err != nil {
|
|
t.Fatalf("failed to commit on remote branch: %v", err)
|
|
}
|
|
|
|
// Switch back to current branch.
|
|
if _, err := db.ExecContext(ctx, "CALL DOLT_CHECKOUT(?)", currentBranch); err != nil {
|
|
t.Fatalf("failed to checkout current branch: %v", err)
|
|
}
|
|
|
|
// Merge the remote branch in a transaction with dolt_allow_commit_conflicts.
|
|
// This simulates what pullWithAutoResolve does internally.
|
|
tx, err := db.BeginTx(ctx, nil)
|
|
if err != nil {
|
|
t.Fatalf("failed to begin transaction: %v", err)
|
|
}
|
|
|
|
if _, err := tx.ExecContext(ctx, "SET @@dolt_allow_commit_conflicts = 1"); err != nil {
|
|
_ = tx.Rollback()
|
|
t.Fatalf("failed to set dolt_allow_commit_conflicts: %v", err)
|
|
}
|
|
|
|
_, mergeErr := tx.ExecContext(ctx, "CALL DOLT_MERGE(?)", remoteBranch)
|
|
// mergeErr may or may not be nil depending on Dolt version.
|
|
|
|
// Try auto-resolve.
|
|
resolved, resolveErr := store.tryAutoResolveMetadataConflicts(ctx, tx)
|
|
if resolveErr != nil {
|
|
_ = tx.Rollback()
|
|
t.Fatalf("tryAutoResolveMetadataConflicts error: %v (mergeErr: %v)", resolveErr, mergeErr)
|
|
}
|
|
if !resolved {
|
|
_ = tx.Rollback()
|
|
if mergeErr != nil {
|
|
t.Fatalf("merge failed and metadata conflicts were not auto-resolved: %v", mergeErr)
|
|
}
|
|
// Clean merge, no conflicts to resolve — verify the value.
|
|
t.Log("merge succeeded without conflicts (auto-merge)")
|
|
return
|
|
}
|
|
|
|
if err := tx.Commit(); err != nil {
|
|
t.Fatalf("failed to commit after auto-resolve: %v", err)
|
|
}
|
|
|
|
// Verify the metadata value is "theirs" (bbb from remote).
|
|
var value string
|
|
if err := db.QueryRowContext(ctx, "SELECT value FROM metadata WHERE `key` = 'dolt_auto_push_commit'").Scan(&value); err != nil {
|
|
t.Fatalf("failed to read resolved metadata: %v", err)
|
|
}
|
|
if value != "bbb" {
|
|
t.Errorf("expected metadata value 'bbb' (theirs), got %q", value)
|
|
}
|
|
}
|
|
|
|
// TestPullAutoResolveSkipsNonMetadataConflicts verifies that conflicts on
|
|
// tables other than metadata are NOT auto-resolved.
|
|
func TestPullAutoResolveSkipsNonMetadataConflicts(t *testing.T) {
|
|
store, cleanup := setupTestStore(t)
|
|
defer cleanup()
|
|
|
|
ctx, cancel := testContext(t)
|
|
defer cancel()
|
|
|
|
db := store.db
|
|
|
|
var currentBranch string
|
|
if err := db.QueryRowContext(ctx, "SELECT active_branch()").Scan(¤tBranch); err != nil {
|
|
t.Fatalf("failed to get current branch: %v", err)
|
|
}
|
|
|
|
// Create an issue on the current branch.
|
|
if _, err := db.ExecContext(ctx,
|
|
"INSERT INTO issues (id, title, description, design, acceptance_criteria, notes, status, priority, issue_type) VALUES ('conflict-test', 'Local Title', '', '', '', '', 'open', 2, 'task')"); err != nil {
|
|
t.Fatalf("failed to insert issue on current branch: %v", err)
|
|
}
|
|
if _, err := db.ExecContext(ctx, "CALL DOLT_COMMIT('-Am', 'local issue')"); err != nil {
|
|
t.Fatalf("failed to commit on current branch: %v", err)
|
|
}
|
|
|
|
// Create divergent branch from parent.
|
|
remoteBranch := currentBranch + "_remote2"
|
|
if _, err := db.ExecContext(ctx, "CALL DOLT_BRANCH(?, 'HEAD~1')", remoteBranch); err != nil {
|
|
t.Fatalf("failed to create remote branch: %v", err)
|
|
}
|
|
defer func() {
|
|
db.ExecContext(ctx, "CALL DOLT_CHECKOUT(?)", currentBranch)
|
|
db.ExecContext(ctx, "CALL DOLT_BRANCH('-D', ?)", remoteBranch)
|
|
}()
|
|
|
|
// Insert conflicting issue on remote branch (same PK, different title).
|
|
if _, err := db.ExecContext(ctx, "CALL DOLT_CHECKOUT(?)", remoteBranch); err != nil {
|
|
t.Fatalf("failed to checkout remote branch: %v", err)
|
|
}
|
|
if _, err := db.ExecContext(ctx,
|
|
"INSERT INTO issues (id, title, description, design, acceptance_criteria, notes, status, priority, issue_type) VALUES ('conflict-test', 'Remote Title', '', '', '', '', 'open', 2, 'task')"); err != nil {
|
|
t.Fatalf("failed to insert issue on remote branch: %v", err)
|
|
}
|
|
if _, err := db.ExecContext(ctx, "CALL DOLT_COMMIT('-Am', 'remote issue')"); err != nil {
|
|
t.Fatalf("failed to commit on remote branch: %v", err)
|
|
}
|
|
|
|
// Switch back and merge.
|
|
if _, err := db.ExecContext(ctx, "CALL DOLT_CHECKOUT(?)", currentBranch); err != nil {
|
|
t.Fatalf("failed to checkout current branch: %v", err)
|
|
}
|
|
|
|
tx, err := db.BeginTx(ctx, nil)
|
|
if err != nil {
|
|
t.Fatalf("failed to begin transaction: %v", err)
|
|
}
|
|
|
|
if _, err := tx.ExecContext(ctx, "SET @@dolt_allow_commit_conflicts = 1"); err != nil {
|
|
_ = tx.Rollback()
|
|
t.Fatalf("failed to set dolt_allow_commit_conflicts: %v", err)
|
|
}
|
|
|
|
_, mergeErr := tx.ExecContext(ctx, "CALL DOLT_MERGE(?)", remoteBranch)
|
|
|
|
// Issues table conflict should NOT be auto-resolved.
|
|
resolved, resolveErr := store.tryAutoResolveMetadataConflicts(ctx, tx)
|
|
_ = tx.Rollback()
|
|
|
|
if mergeErr == nil && resolveErr == nil && !resolved {
|
|
// Clean merge — Dolt auto-merged the issue changes.
|
|
t.Skip("merge succeeded without conflicts — cannot test non-metadata conflict path")
|
|
return
|
|
}
|
|
|
|
if resolveErr != nil {
|
|
// Error checking conflicts is acceptable for some Dolt versions.
|
|
t.Logf("tryAutoResolveMetadataConflicts returned error: %v", resolveErr)
|
|
return
|
|
}
|
|
|
|
if resolved {
|
|
t.Error("expected non-metadata conflicts NOT to be auto-resolved")
|
|
}
|
|
}
|