From 786e892f1ce87e16e941ee94ff6dda0575beb8ae Mon Sep 17 00:00:00 2001
From: James Cor <james@dolthub.com>
Date: Wed, 28 Sep 2022 14:11:45 -0700
Subject: [PATCH] fix tests again

---
 integration-tests/bats/foreign-keys.bats | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/integration-tests/bats/foreign-keys.bats b/integration-tests/bats/foreign-keys.bats
index 134e2db5ef..ce8d05f328 100644
--- a/integration-tests/bats/foreign-keys.bats
+++ b/integration-tests/bats/foreign-keys.bats
@@ -1314,11 +1314,16 @@ SQL
     dolt commit -m "added 2s"
     dolt checkout main
     dolt merge other -m "merge other"
-    dolt sql -q "set @@dolt_allow_commit_conflicts = 1"
-    run dolt sql -q "call dolt_conflicts_resolve('--theirs', 'parent')"
+    run dolt sql <<SQL
+set @@dolt_allow_commit_conflicts = 1;
+call dolt_conflicts_resolve('--theirs', 'parent');
+SQL
     [ "$status" -eq 1 ]
     [[ "$output" =~ "violation" ]] || false
-    run dolt sql -q "call dolt_conflicts_resolve('--theirs', 'child')"
+    run dolt sql <<SQL
+set @@dolt_allow_commit_conflicts = 1;
+call dolt_conflicts_resolve('--theirs', 'child');
+    SQL
     [ "$status" -eq 1 ]
     [[ "$output" =~ "violation" ]] || false
 }