Changeset: 98b96737ce7b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=98b96737ce7b Modified Files: sql/test/merge-partitions/Tests/mergepart21.sql sql/test/merge-partitions/Tests/mergepart21.stable.err sql/test/merge-partitions/Tests/mergepart23.py Branch: merge-partitions Log Message:
Fix test outputs diffs (38 lines): diff --git a/sql/test/merge-partitions/Tests/mergepart21.sql b/sql/test/merge-partitions/Tests/mergepart21.sql --- a/sql/test/merge-partitions/Tests/mergepart21.sql +++ b/sql/test/merge-partitions/Tests/mergepart21.sql @@ -19,7 +19,7 @@ CREATE TABLE subtable2 (a int, b int, dd INSERT INTO subtable1 VALUES (4, 2, 1.2); -ALTER TABLE nexttest ADD TABLE subtable1 AS PARTITION IN ('ups', 'me'); --error +ALTER TABLE nexttest ADD TABLE subtable1 AS PARTITION IN ('ups'); --error ALTER TABLE nexttest ADD TABLE subtable1 AS PARTITION IN (1, 2, 10); ALTER TABLE nexttest ADD TABLE subtable2 AS PARTITION IN (11, 12, 20); diff --git a/sql/test/merge-partitions/Tests/mergepart21.stable.err b/sql/test/merge-partitions/Tests/mergepart21.stable.err --- a/sql/test/merge-partitions/Tests/mergepart21.stable.err +++ b/sql/test/merge-partitions/Tests/mergepart21.stable.err @@ -48,8 +48,8 @@ MAPI = (monetdb) /var/tmp/mtest-9195/.s QUERY = DROP FUNCTION dosomething; --error ERROR = !DROP FUNCTION: there are database objects dependent on function dosomething; CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-9195/.s.monetdb.34012 -QUERY = ALTER TABLE nexttest ADD TABLE subtable1 AS PARTITION IN ('ups', 'me'); --error +MAPI = (monetdb) /var/tmp/mtest-28263/.s.monetdb.31060 +QUERY = ALTER TABLE nexttest ADD TABLE subtable1 AS PARTITION IN ('ups'); --error ERROR = !conversion of string 'ups' to type lng failed. CODE = 22018 MAPI = (monetdb) /var/tmp/mtest-4817/.s.monetdb.33584 diff --git a/sql/test/merge-partitions/Tests/mergepart23.py b/sql/test/merge-partitions/Tests/mergepart23.py --- a/sql/test/merge-partitions/Tests/mergepart23.py +++ b/sql/test/merge-partitions/Tests/mergepart23.py @@ -47,7 +47,7 @@ ALTER TABLE testme DROP TABLE subtable1; ALTER TABLE testme DROP TABLE subtable2;\ ALTER TABLE anothertest DROP TABLE subtable3;\ ALTER TABLE anothertest DROP TABLE subtable4;\ -SELECT "minimum", "maximum" FROM range_partitions; +SELECT "minimum", "maximum" FROM range_partitions;\ DROP TABLE testme;\ DROP TABLE subtable1;\ DROP TABLE subtable2;\ _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list