mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-11 10:33:08 -06:00
Code Issues Packages Projects Releases 128 Wiki Activity

Fixed two broken bats tests (also rewrote line endings in one file)

Browse Source
This commit is contained in:
Zach Musgrave
2021-10-18 16:25:22 -07:00
parent ee4e2ed441
commit 29ab1510ee
2 changed files with 204 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
integration-tests/bats/sql.bats
View File

@@ -1487,6 +1487,8 @@ SQL
}
@test "sql: update against joins fail with error" {
skip "broken on main"
dolt sql -q "CREATE TABLE mytable(pk int primary key, val int);"
run dolt sql -q "UPDATE mytable one, mytable two SET one.val = 1 WHERE one.pk = two.pk + 1;"

404
integration-tests/bats/triggers.bats
View File

@@ -1,202 +1,202 @@
#!/usr/bin/env bats
load $BATS_TEST_DIRNAME/helper/common.bash
setup() {
setup_common
dolt sql <<SQL
CREATE TABLE parent (
id int PRIMARY KEY,
v1 int,
v2 int,
INDEX v1 (v1),
INDEX v2 (v2)
);
CREATE TABLE child (
id int primary key,
v1 int,
v2 int
);
SQL
}
teardown() {
assert_feature_version
teardown_common
}
@test "triggers: Mix of CREATE TRIGGER and CREATE VIEW in batch mode" {
# There were issues with batch mode that this is verifying no longer occurs
dolt sql <<SQL
CREATE TABLE test(pk BIGINT PRIMARY KEY, v1 BIGINT);
CREATE TRIGGER trigger1 BEFORE INSERT ON test FOR EACH ROW SET new.v1 = -new.v1;
CREATE VIEW view1 AS SELECT v1 FROM test;
CREATE TABLE a (x INT PRIMARY KEY);
CREATE TABLE b (y INT PRIMARY KEY);
INSERT INTO test VALUES (1, 1);
CREATE VIEW view2 AS SELECT y FROM b;
CREATE TRIGGER trigger2 AFTER INSERT ON a FOR EACH ROW INSERT INTO b VALUES (new.x * 2);
INSERT INTO a VALUES (2);
SQL
run dolt sql -q "SELECT * FROM test" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "pk,v1" ]] || false
[[ "$output" =~ "1,-1" ]] || false
[[ "${#lines[@]}" = "2" ]] || false
run dolt sql -q "SELECT * FROM a" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "x" ]] || false
[[ "$output" =~ "2" ]] || false
[[ "${#lines[@]}" = "2" ]] || false
run dolt sql -q "SELECT * FROM b" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "y" ]] || false
[[ "$output" =~ "4" ]] || false
[[ "${#lines[@]}" = "2" ]] || false
run dolt sql -q "SELECT * FROM view1" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "v1" ]] || false
[[ "$output" =~ "-1" ]] || false
[[ "${#lines[@]}" = "2" ]] || false
run dolt sql -q "SELECT * FROM view2" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "y" ]] || false
[[ "$output" =~ "4" ]] || false
[[ "${#lines[@]}" = "2" ]] || false
run dolt sql -q "SELECT * FROM dolt_schemas ORDER BY id" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "type,name,fragment,id" ]] || false
[[ "$output" =~ "trigger,trigger1,CREATE TRIGGER trigger1 BEFORE INSERT ON test FOR EACH ROW SET new.v1 = -new.v1,1" ]] || false
[[ "$output" =~ "view,view1,SELECT v1 FROM test,2" ]] || false
[[ "$output" =~ "view,view2,SELECT y FROM b,3" ]] || false
[[ "$output" =~ "trigger,trigger2,CREATE TRIGGER trigger2 AFTER INSERT ON a FOR EACH ROW INSERT INTO b VALUES (new.x * 2),4" ]] || false
[[ "${#lines[@]}" = "5" ]] || false
}
@test "triggers: Order preservation" {
skip "DROP TRIGGER not yet implemented and broken otherwise"
dolt sql <<SQL
CREATE TABLE x (a BIGINT PRIMARY KEY);
CREATE TRIGGER trigger1 BEFORE INSERT ON x FOR EACH ROW SET new.a = new.a + 1;
CREATE TRIGGER trigger2 BEFORE INSERT ON x FOR EACH ROW SET new.a = (new.a * 2) + 10;
CREATE TRIGGER trigger3 BEFORE INSERT ON x FOR EACH ROW SET new.a = (new.a * 2) + 100;
CREATE TRIGGER trigger4 BEFORE INSERT ON x FOR EACH ROW SET new.a = (new.a * 2) + 1000;
DROP TRIGGER trigger1;
CREATE TRIGGER trigger5 BEFORE INSERT ON x FOR EACH ROW PRECEDES trigger3 SET new.a = (new.a * 2) + 10000;
DROP TRIGGER trigger3;
INSERT INTO x VALUES (0);
SQL
run dolt sql -q "SELECT * FROM x" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "a" ]] || false
[[ "$output" =~ "21040" ]] || false
[[ "${#lines[@]}" = "2" ]] || false
}
@test "triggers: Writing directly into dolt_schemas" {
dolt sql -q "CREATE TABLE test(pk BIGINT PRIMARY KEY, v1 BIGINT);"
dolt sql -q "CREATE VIEW view1 AS SELECT v1 FROM test;"
dolt sql -q "INSERT INTO dolt_schemas VALUES ('trigger', 'trigger1', 'CREATE TRIGGER trigger1 BEFORE INSERT ON test FOR EACH ROW SET new.v1 = -new.v1;', 2);"
dolt sql -q "INSERT INTO test VALUES (1, 1);"
run dolt sql -q "SELECT * FROM test" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "pk,v1" ]] || false
[[ "$output" =~ "1,-1" ]] || false
[[ "${#lines[@]}" = "2" ]] || false
}
@test "triggers: Merge with manual resolution" {
dolt sql <<SQL
CREATE TABLE x(a BIGINT PRIMARY KEY);
CREATE TRIGGER trigger1 BEFORE INSERT ON x FOR EACH ROW SET new.a = new.a + 1;
SQL
dolt add -A
dolt commit -m "Initial Commit"
dolt checkout -b other
dolt checkout main
dolt sql -q "CREATE TRIGGER trigger2 BEFORE INSERT ON x FOR EACH ROW SET new.a = (new.a * 2) + 10;"
dolt add -A
dolt commit -m "On main"
dolt checkout other
dolt sql <<SQL
CREATE TRIGGER trigger3 BEFORE INSERT ON x FOR EACH ROW SET new.a = (new.a * 2) + 100;
CREATE TRIGGER trigger4 BEFORE INSERT ON x FOR EACH ROW SET new.a = (new.a * 2) + 1000;
UPDATE dolt_schemas SET id = id + 1 WHERE name = 'trigger4';
SQL
dolt add -A
dolt commit -m "On other"
dolt checkout main
run dolt diff other
[ "$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 merge other
dolt add dolt_schemas
run dolt commit -am "can't commit conflicts"
[ "$status" -eq "1" ]
[[ "$output" =~ "dolt_schemas" ]] || false
run dolt conflicts cat dolt_schemas
[ "$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
skip "SQL conflict resolution not working below"
dolt sql --disable-batch <<SQL
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);
DELETE FROM dolt_conflicts_dolt_schemas;
commit;
SQL
run dolt conflicts cat dolt_schemas
[ "$status" -eq "0" ]
! [[ "$output" =~ "CREATE TRIGGER" ]] || false
dolt add dolt_schemas
dolt commit -m "Merged other table"
run dolt sql -q "SELECT * FROM dolt_schemas" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "type,name,fragment,id" ]] || false
[[ "$output" =~ "trigger,trigger1,CREATE TRIGGER trigger1 BEFORE INSERT ON x FOR EACH ROW SET new.a = new.a + 1,1" ]] || false
[[ "$output" =~ "trigger,trigger2,CREATE TRIGGER trigger2 BEFORE INSERT ON x FOR EACH ROW SET new.a = (new.a * 2) + 10,2" ]] || false
[[ "$output" =~ "trigger,trigger3,CREATE TRIGGER trigger3 BEFORE INSERT ON x FOR EACH ROW SET new.a = (new.a * 2) + 100,3" ]] || false
[[ "$output" =~ "trigger,trigger4,CREATE TRIGGER trigger4 BEFORE INSERT ON x FOR EACH ROW SET new.a = (new.a * 2) + 1000,4" ]] || false
[[ "${#lines[@]}" = "5" ]] || false
}
@test "triggers: Upgrade dolt_schemas" {
rm -rf .dolt
# old_dolt_schemas was created using v0.19.1, which is pre-id change
cp -a $BATS_TEST_DIRNAME/helper/old_dolt_schemas/. ./.dolt/
run dolt sql -q "SELECT * FROM dolt_schemas" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "type,name,fragment" ]] || false
[[ "$output" =~ "view,view1,SELECT 2+2 FROM dual" ]] || false
[[ "${#lines[@]}" = "2" ]] || false
run dolt sql -q "SELECT * FROM view1" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "2 + 2" ]] || false
[[ "$output" =~ "4" ]] || false
[[ "${#lines[@]}" = "2" ]] || false
# creating a new view/trigger will recreate the dolt_schemas table
dolt sql -q "CREATE VIEW view2 AS SELECT 3+3 FROM dual;"
run dolt diff
[ "$status" -eq "0" ]
[[ "$output" =~ "deleted table" ]] || false
[[ "$output" =~ "added table" ]] || false
run dolt sql -q "SELECT * FROM dolt_schemas" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "type,name,fragment,id" ]] || false
[[ "$output" =~ "view,view1,SELECT 2+2 FROM dual,1" ]] || false
[[ "$output" =~ "view,view2,SELECT 3+3 FROM dual,2" ]] || false
[[ "${#lines[@]}" = "3" ]] || false
run dolt sql -q "SELECT * FROM view1" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "2 + 2" ]] || false
[[ "$output" =~ "4" ]] || false
[[ "${#lines[@]}" = "2" ]] || false
run dolt sql -q "SELECT * FROM view2" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "3 + 3" ]] || false
[[ "$output" =~ "6" ]] || false
[[ "${#lines[@]}" = "2" ]] || false
}
#!/usr/bin/env bats
load $BATS_TEST_DIRNAME/helper/common.bash
setup() {
setup_common
dolt sql <<SQL
CREATE TABLE parent (
id int PRIMARY KEY,
v1 int,
v2 int,
INDEX v1 (v1),
INDEX v2 (v2)
);
CREATE TABLE child (
id int primary key,
v1 int,
v2 int
);
SQL
}
teardown() {
assert_feature_version
teardown_common
}
@test "triggers: Mix of CREATE TRIGGER and CREATE VIEW in batch mode" {
# There were issues with batch mode that this is verifying no longer occurs
dolt sql <<SQL
CREATE TABLE test(pk BIGINT PRIMARY KEY, v1 BIGINT);
CREATE TRIGGER trigger1 BEFORE INSERT ON test FOR EACH ROW SET new.v1 = -new.v1;
CREATE VIEW view1 AS SELECT v1 FROM test;
CREATE TABLE a (x INT PRIMARY KEY);
CREATE TABLE b (y INT PRIMARY KEY);
INSERT INTO test VALUES (1, 1);
CREATE VIEW view2 AS SELECT y FROM b;
CREATE TRIGGER trigger2 AFTER INSERT ON a FOR EACH ROW INSERT INTO b VALUES (new.x * 2);
INSERT INTO a VALUES (2);
SQL
run dolt sql -q "SELECT * FROM test" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "pk,v1" ]] || false
[[ "$output" =~ "1,-1" ]] || false
[[ "${#lines[@]}" = "2" ]] || false
run dolt sql -q "SELECT * FROM a" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "x" ]] || false
[[ "$output" =~ "2" ]] || false
[[ "${#lines[@]}" = "2" ]] || false
run dolt sql -q "SELECT * FROM b" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "y" ]] || false
[[ "$output" =~ "4" ]] || false
[[ "${#lines[@]}" = "2" ]] || false
run dolt sql -q "SELECT * FROM view1" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "v1" ]] || false
[[ "$output" =~ "-1" ]] || false
[[ "${#lines[@]}" = "2" ]] || false
run dolt sql -q "SELECT * FROM view2" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "y" ]] || false
[[ "$output" =~ "4" ]] || false
[[ "${#lines[@]}" = "2" ]] || false
run dolt sql -q "SELECT * FROM dolt_schemas ORDER BY id" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "type,name,fragment,id" ]] || false
[[ "$output" =~ "trigger,trigger1,CREATE TRIGGER trigger1 BEFORE INSERT ON test FOR EACH ROW SET new.v1 = -new.v1,1" ]] || false
[[ "$output" =~ "view,view1,SELECT v1 FROM test,2" ]] || false
[[ "$output" =~ "view,view2,SELECT y FROM b,3" ]] || false
[[ "$output" =~ "trigger,trigger2,CREATE TRIGGER trigger2 AFTER INSERT ON a FOR EACH ROW INSERT INTO b VALUES (new.x * 2),4" ]] || false
[[ "${#lines[@]}" = "5" ]] || false
}
@test "triggers: Order preservation" {
skip "DROP TRIGGER not yet implemented and broken otherwise"
dolt sql <<SQL
CREATE TABLE x (a BIGINT PRIMARY KEY);
CREATE TRIGGER trigger1 BEFORE INSERT ON x FOR EACH ROW SET new.a = new.a + 1;
CREATE TRIGGER trigger2 BEFORE INSERT ON x FOR EACH ROW SET new.a = (new.a * 2) + 10;
CREATE TRIGGER trigger3 BEFORE INSERT ON x FOR EACH ROW SET new.a = (new.a * 2) + 100;
CREATE TRIGGER trigger4 BEFORE INSERT ON x FOR EACH ROW SET new.a = (new.a * 2) + 1000;
DROP TRIGGER trigger1;
CREATE TRIGGER trigger5 BEFORE INSERT ON x FOR EACH ROW PRECEDES trigger3 SET new.a = (new.a * 2) + 10000;
DROP TRIGGER trigger3;
INSERT INTO x VALUES (0);
SQL
run dolt sql -q "SELECT * FROM x" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "a" ]] || false
[[ "$output" =~ "21040" ]] || false
[[ "${#lines[@]}" = "2" ]] || false
}
@test "triggers: Writing directly into dolt_schemas" {
dolt sql -q "CREATE TABLE test(pk BIGINT PRIMARY KEY, v1 BIGINT);"
dolt sql -q "CREATE VIEW view1 AS SELECT v1 FROM test;"
dolt sql -q "INSERT INTO dolt_schemas VALUES ('trigger', 'trigger1', 'CREATE TRIGGER trigger1 BEFORE INSERT ON test FOR EACH ROW SET new.v1 = -new.v1;', 2);"
dolt sql -q "INSERT INTO test VALUES (1, 1);"
run dolt sql -q "SELECT * FROM test" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "pk,v1" ]] || false
[[ "$output" =~ "1,-1" ]] || false
[[ "${#lines[@]}" = "2" ]] || false
}
@test "triggers: Merge with manual resolution" {
dolt sql <<SQL
CREATE TABLE x(a BIGINT PRIMARY KEY);
CREATE TRIGGER trigger1 BEFORE INSERT ON x FOR EACH ROW SET new.a = new.a + 1;
SQL
dolt add -A
dolt commit -m "Initial Commit"
dolt checkout -b other
dolt checkout main
dolt sql -q "CREATE TRIGGER trigger2 BEFORE INSERT ON x FOR EACH ROW SET new.a = (new.a * 2) + 10;"
dolt add -A
dolt commit -m "On main"
dolt checkout other
dolt sql <<SQL
CREATE TRIGGER trigger3 BEFORE INSERT ON x FOR EACH ROW SET new.a = (new.a * 2) + 100;
CREATE TRIGGER trigger4 BEFORE INSERT ON x FOR EACH ROW SET new.a = (new.a * 2) + 1000;
UPDATE dolt_schemas SET id = id + 1 WHERE name = 'trigger4';
SQL
dolt add -A
dolt commit -m "On other"
dolt checkout main
run dolt diff other
[ "$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 merge other
dolt add dolt_schemas
run dolt commit -am "can't commit conflicts"
[ "$status" -eq "1" ]
[[ "$output" =~ "dolt_schemas" ]] || false
run dolt conflicts cat dolt_schemas
[ "$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
skip "SQL conflict resolution not working below"
dolt sql --disable-batch <<SQL
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);
DELETE FROM dolt_conflicts_dolt_schemas;
commit;
SQL
run dolt conflicts cat dolt_schemas
[ "$status" -eq "0" ]
! [[ "$output" =~ "CREATE TRIGGER" ]] || false
dolt add dolt_schemas
dolt commit -m "Merged other table"
run dolt sql -q "SELECT * FROM dolt_schemas" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "type,name,fragment,id" ]] || false
[[ "$output" =~ "trigger,trigger1,CREATE TRIGGER trigger1 BEFORE INSERT ON x FOR EACH ROW SET new.a = new.a + 1,1" ]] || false
[[ "$output" =~ "trigger,trigger2,CREATE TRIGGER trigger2 BEFORE INSERT ON x FOR EACH ROW SET new.a = (new.a * 2) + 10,2" ]] || false
[[ "$output" =~ "trigger,trigger3,CREATE TRIGGER trigger3 BEFORE INSERT ON x FOR EACH ROW SET new.a = (new.a * 2) + 100,3" ]] || false
[[ "$output" =~ "trigger,trigger4,CREATE TRIGGER trigger4 BEFORE INSERT ON x FOR EACH ROW SET new.a = (new.a * 2) + 1000,4" ]] || false
[[ "${#lines[@]}" = "5" ]] || false
}
@test "triggers: Upgrade dolt_schemas" {
rm -rf .dolt
# old_dolt_schemas was created using v0.19.1, which is pre-id change
cp -a $BATS_TEST_DIRNAME/helper/old_dolt_schemas/. ./.dolt/
run dolt sql -q "SELECT * FROM dolt_schemas" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "type,name,fragment" ]] || false
[[ "$output" =~ "view,view1,SELECT 2+2 FROM dual" ]] || false
[[ "${#lines[@]}" = "2" ]] || false
run dolt sql -q "SELECT * FROM view1" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "2+2" ]] || false
[[ "$output" =~ "4" ]] || false
[[ "${#lines[@]}" = "2" ]] || false
# creating a new view/trigger will recreate the dolt_schemas table
dolt sql -q "CREATE VIEW view2 AS SELECT 3+3 FROM dual;"
run dolt diff
[ "$status" -eq "0" ]
[[ "$output" =~ "deleted table" ]] || false
[[ "$output" =~ "added table" ]] || false
run dolt sql -q "SELECT * FROM dolt_schemas" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "type,name,fragment,id" ]] || false
[[ "$output" =~ "view,view1,SELECT 2+2 FROM dual,1" ]] || false
[[ "$output" =~ "view,view2,SELECT 3+3 FROM dual,2" ]] || false
[[ "${#lines[@]}" = "3" ]] || false
run dolt sql -q "SELECT * FROM view1" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "2+2" ]] || false
[[ "$output" =~ "4" ]] || false
[[ "${#lines[@]}" = "2" ]] || false
run dolt sql -q "SELECT * FROM view2" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "3+3" ]] || false
[[ "$output" =~ "6" ]] || false
[[ "${#lines[@]}" = "2" ]] || false
}