Changeset: 1f04aebbc14f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1f04aebbc14f
Modified Files:
sql/test/merge-statements/Tests/mergestmt00.test
sql/test/merge-statements/Tests/mergestmt01.test
sql/test/merge-statements/Tests/mergestmt02.test
sql/test/merge-statements/Tests/mergestmt03.test
sql/test/merge-statements/Tests/mergestmt04.test
Branch: default
Log Message:
Added row counts on merge statement tests
diffs (284 lines):
diff --git a/sql/test/merge-statements/Tests/mergestmt00.test
b/sql/test/merge-statements/Tests/mergestmt00.test
--- a/sql/test/merge-statements/Tests/mergestmt00.test
+++ b/sql/test/merge-statements/Tests/mergestmt00.test
@@ -1,25 +1,25 @@
statement ok
create table merging (aa int, bb clob)
-statement ok
+statement ok rowcount 1
insert into merging values (-100, 1)
statement ok
create table predata (aa int, bb int)
-statement ok
+statement ok rowcount 10
insert into predata values (15, 3), (3, 1), (2, 1), (5, 3), (NULL, 2), (3, 2),
(4, 1), (6, 3), (8, 2), (NULL, 4)
-statement ok
+statement ok rowcount 3
merge into predata using (select aa, bb from merging) sub on predata.bb =
sub.bb when matched then delete
-statement ok
+statement ok rowcount 0
merge into predata using (select aa, bb from merging) sub on predata.bb =
sub.bb when matched then update set bb = 1
-statement ok
+statement ok rowcount 1
update merging set bb = 2 where bb = 1
-statement ok
+statement ok rowcount 3
merge into predata using (select aa, bb from merging) sub on predata.bb =
sub.bb when matched then update set bb = 1
query II rowsort
@@ -40,7 +40,7 @@ 1
NULL
4
-statement ok
+statement ok rowcount 1
merge into predata using (select aa, bb from merging) sub on predata.bb =
sub.bb when not matched then insert values (5, 5)
query II rowsort
@@ -63,7 +63,7 @@ 1
NULL
4
-statement ok
+statement ok rowcount 1
merge into predata as othern using (select aa, bb from merging) sub on
othern.bb = sub.bb when not matched then insert values (5, 5)
statement error
diff --git a/sql/test/merge-statements/Tests/mergestmt01.test
b/sql/test/merge-statements/Tests/mergestmt01.test
--- a/sql/test/merge-statements/Tests/mergestmt01.test
+++ b/sql/test/merge-statements/Tests/mergestmt01.test
@@ -7,13 +7,13 @@ create table predata (aa int, bb int)
statement ok
start transaction
-statement ok
+statement ok rowcount 1
insert into merging values (-100, 1)
-statement ok
+statement ok rowcount 6
insert into predata values (15, 3), (3, 1), (2, 1), (5, 3), (NULL, 2), (3, 2)
-statement ok
+statement ok rowcount 2
merge into predata using (select aa, bb from merging) sub on predata.bb =
sub.bb
when matched then delete when not matched then insert values (6, 6)
@@ -29,13 +29,13 @@ 3
NULL
2
-statement ok
+statement ok rowcount 4
delete from predata
-statement ok
+statement ok rowcount 6
insert into predata values (15, 3), (3, 1), (2, 1), (5, 3), (4, 1), (6, 3)
-statement ok
+statement ok rowcount 3
merge into predata using (select aa, bb from merging) sub on predata.bb =
sub.bb
when not matched then insert values (null, null) when matched then
update set bb = 3
@@ -55,17 +55,17 @@ 3
6
3
-statement ok
+statement ok rowcount 6
delete from predata
-statement ok
+statement ok rowcount 6
insert into predata values (15, 3), (3, 1), (2, 1), (5, 3), (8, 2), (NULL, 4)
-statement ok
+statement ok rowcount 2
merge into predata using (select aa, bb from merging) as sub on predata.bb =
sub.bb
when matched then update set bb = predata.bb + 1
-statement ok
+statement ok rowcount 0
merge into predata othertt using (select aa, bb from merging) as sub on
othertt.bb = sub.bb
when matched then update set bb = othertt.bb + sub.bb
@@ -85,16 +85,16 @@ 2
NULL
4
-statement ok
+statement ok rowcount 6
delete from predata
-statement ok
+statement ok rowcount 4
insert into predata values (15, 1), (3, 1), (6, 3), (8, 2)
-statement ok
+statement ok rowcount 1
insert into merging values (-500, -300)
-statement ok
+statement ok rowcount 1
merge into predata using (select aa, bb from merging) as sub on predata.bb =
sub.bb
when not matched then insert values (sub.aa, 2)
@@ -112,10 +112,10 @@ 3
8
2
-statement ok
+statement ok rowcount 1
insert into merging values (1900, 2)
-statement ok
+statement ok rowcount 1
merge into predata othertt using (select aa, bb from merging) as sub on
othertt.bb = sub.bb
when not matched then insert values (sub.aa + 5, sub.bb * 2)
@@ -135,13 +135,13 @@ 3
8
2
-statement ok
+statement ok rowcount 6
delete from predata
-statement ok
+statement ok rowcount 1
insert into predata values (2, 2)
-statement ok
+statement ok rowcount 2
merge into predata using (select aa, bb from merging) thee on predata.bb =
thee.bb
when not matched then insert
@@ -158,10 +158,10 @@ NULL
statement ok
rollback
-statement ok
+statement ok rowcount 1
insert into predata values (1, 1)
-statement ok
+statement ok rowcount 2
insert into merging values (1, 1), (2, 1)
statement error
diff --git a/sql/test/merge-statements/Tests/mergestmt02.test
b/sql/test/merge-statements/Tests/mergestmt02.test
--- a/sql/test/merge-statements/Tests/mergestmt02.test
+++ b/sql/test/merge-statements/Tests/mergestmt02.test
@@ -4,11 +4,11 @@ create table merging (aa int, bb int)
statement ok
create table predata (aa int, bb int not null)
-statement ok
+statement ok rowcount 0
merge into predata using (select * from merging) other on predata.bb = other.bb
when not matched then insert
-statement ok
+statement ok rowcount 1
insert into merging
statement error
@@ -24,10 +24,10 @@ alter table predata alter bb set null
statement ok
alter table predata add constraint uniquebb unique (bb)
-statement ok
+statement ok rowcount 2
insert into merging values (1,1), (0,1)
-statement ok
+statement ok rowcount 1
insert into predata values (1,1)
statement error
diff --git a/sql/test/merge-statements/Tests/mergestmt03.test
b/sql/test/merge-statements/Tests/mergestmt03.test
--- a/sql/test/merge-statements/Tests/mergestmt03.test
+++ b/sql/test/merge-statements/Tests/mergestmt03.test
@@ -19,7 +19,7 @@ alter table uppert add table subtable1 a
statement ok
alter table uppert add table subtable2 as partition from '1' to '100'
-statement ok
+statement ok rowcount 1
insert into merging values (-100, 1)
statement error
diff --git a/sql/test/merge-statements/Tests/mergestmt04.test
b/sql/test/merge-statements/Tests/mergestmt04.test
--- a/sql/test/merge-statements/Tests/mergestmt04.test
+++ b/sql/test/merge-statements/Tests/mergestmt04.test
@@ -1,27 +1,27 @@
statement ok
CREATE TABLE food_store (id INT, "name" TEXT, new_item BOOL)
-statement ok
+statement ok rowcount 5
INSERT INTO food_store VALUES (1, 'bread', false), (2, 'coffee', false), (3,
'tea', false), (4, 'butter', false), (5, 'chocolate', false)
statement ok
CREATE TABLE releases (id INT, reason CLOB)
-statement ok
+statement ok rowcount 2
INSERT INTO releases VALUES (5, 'too warm to eat chocolate'), (6, 'end of
chestnuts season')
statement ok
CREATE TABLE incoming (id INT, "name" CLOB)
-statement ok
+statement ok rowcount 1
INSERT INTO incoming VALUES (6, 'ice cream')
-statement ok
+statement ok rowcount 1
MERGE INTO food_store AS to_update USING releases AS food_updates
ON to_update.id = food_updates.id
WHEN MATCHED THEN DELETE
-statement ok
+statement ok rowcount 1
MERGE INTO food_store USING (SELECT id, "name" FROM incoming) AS new_food
ON food_store.id = new_food.id
WHEN NOT MATCHED THEN INSERT VALUES (new_food.id, new_food."name", true)
@@ -45,13 +45,13 @@ 6
ice cream
1
-statement ok
+statement ok rowcount 1
TRUNCATE incoming
-statement ok
+statement ok rowcount 3
INSERT INTO incoming VALUES (1, 'cookies'), (2, 'cake'), (7, 'peanuts')
-statement ok
+statement ok rowcount 3
MERGE INTO food_store USING (SELECT id, "name" FROM incoming) AS food_updates
ON food_store.id = food_updates.id
WHEN NOT MATCHED THEN INSERT VALUES (food_updates.id, food_updates."name",
true)
@@ -79,10 +79,10 @@ 7
peanuts
1
-statement ok
+statement ok rowcount 2
TRUNCATE releases
-statement ok
+statement ok rowcount 2
INSERT INTO releases VALUES (1, 'chocolate cookies'), (1, 'gluten cookies')
statement error
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
