diff --git a/integration-tests/bats/triggers.bats b/integration-tests/bats/triggers.bats index fe56ec1321..699d9dcf69 100644 --- a/integration-tests/bats/triggers.bats +++ b/integration-tests/bats/triggers.bats @@ -138,8 +138,15 @@ SQL [ "$status" -eq "0" ] [[ "$output" =~ "CREATE TRIGGER trigger2 BEFORE INSERT ON x FOR EACH ROW SET new.a = (new.a * 2) + 10" ]] || false [[ "$output" =~ "CREATE TRIGGER trigger3 BEFORE INSERT ON x FOR EACH ROW SET new.a = (new.a * 2) + 100" ]] || false - dolt sql -q "INSERT INTO dolt_schemas VALUES ('trigger', 'trigger3', 'CREATE TRIGGER trigger3 BEFORE INSERT ON x FOR EACH ROW SET new.a = (new.a * 2) + 100', 3)" - dolt conflicts resolve dolt_schemas 2 + + skip "SQL conflict resolution not working below" + + dolt sql --disable-batch <