Changeset: 11f535e50ac9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/11f535e50ac9
Modified Files:
sql/test/Users/Tests/userCallFunction.test
sql/test/merge-partitions/Tests/mergepart20.test
sql/test/merge-partitions/Tests/mergepart21.test
sql/test/mergetables/Tests/mergedb_create.test
sql/test/miscellaneous/Tests/simple_selects.test
sql/test/orderidx/Tests/simpletable.test
sql/test/orderidx/Tests/smalltable.test
sql/test/prepare/Tests/sample.15.stable.err
sql/test/subquery/Tests/correlated.test
sql/test/subquery/Tests/subquery4.test
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.test
sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.test
Branch: clean_parser
Log Message:
approved output
diffs (truncated from 335 to 300 lines):
diff --git a/sql/test/Users/Tests/userCallFunction.test
b/sql/test/Users/Tests/userCallFunction.test
--- a/sql/test/Users/Tests/userCallFunction.test
+++ b/sql/test/Users/Tests/userCallFunction.test
@@ -24,11 +24,11 @@ statement error 42000!SELECT: insufficie
SELECT s1.f1()
@connection(id=tc)
-statement error 42000!SELECT: insufficient privileges for unary operator
's1'.'f1'(tinyint)
+statement error 42000!SELECT: insufficient privileges for operator
's1'.'f1'(tinyint)
SELECT s1.f1(1)
@connection(id=tc)
-statement error 42000!SELECT: insufficient privileges for unary operator
's1'.'f1'(int)
+statement error 42000!SELECT: insufficient privileges for operator
's1'.'f1'(int)
SELECT s1.f1(cast(1 as int))
@connection(id=tc)
@@ -52,11 +52,11 @@ SELECT s1.f1()
10
@connection(id=tc)
-statement error 42000!SELECT: insufficient privileges for unary operator
's1'.'f1'(tinyint)
+statement error 42000!SELECT: insufficient privileges for operator
's1'.'f1'(tinyint)
SELECT s1.f1(1)
@connection(id=tc)
-statement error 42000!SELECT: insufficient privileges for unary operator
's1'.'f1'(int)
+statement error 42000!SELECT: insufficient privileges for operator
's1'.'f1'(int)
SELECT s1.f1(cast(1 as int))
statement ok
diff --git a/sql/test/merge-partitions/Tests/mergepart20.test
b/sql/test/merge-partitions/Tests/mergepart20.test
--- a/sql/test/merge-partitions/Tests/mergepart20.test
+++ b/sql/test/merge-partitions/Tests/mergepart20.test
@@ -69,7 +69,7 @@ query IT rowsort
SELECT column_id, expression FROM table_partitions
----
-statement error 42000!SELECT: no such unary operator 'iamdummy'(int)
+statement error 42000!SELECT: no such operator 'iamdummy'(int)
CREATE MERGE TABLE testme (a int, b varchar(32)) PARTITION BY RANGE USING
(iamdummy(a))
statement ok
diff --git a/sql/test/merge-partitions/Tests/mergepart21.test
b/sql/test/merge-partitions/Tests/mergepart21.test
--- a/sql/test/merge-partitions/Tests/mergepart21.test
+++ b/sql/test/merge-partitions/Tests/mergepart21.test
@@ -87,7 +87,7 @@ DROP FUNCTION dosomething
statement ok
CREATE FUNCTION dosomethingelse(i int) RETURNS TABLE (j int) BEGIN RETURN
TABLE(SELECT i); END
-statement error 42000!SELECT: no such unary operator 'dosomethingelse'(int)
+statement error 42000!SELECT: no such operator 'dosomethingelse'(int)
CREATE MERGE TABLE nexttest (a int, dd real) PARTITION BY VALUES USING
(dosomethingelse(a))
statement ok
diff --git a/sql/test/mergetables/Tests/mergedb_create.test
b/sql/test/mergetables/Tests/mergedb_create.test
--- a/sql/test/mergetables/Tests/mergedb_create.test
+++ b/sql/test/mergetables/Tests/mergedb_create.test
@@ -385,7 +385,7 @@ where true
query TII rowsort
select
cast(coalesce(ref_8.name,
- cast(nullif(ref_7.column,
+ cast(nullif(ref_7."column",
cast(null as clob)) as clob)) as clob) as c0,
ref_10.id as c1,
cast(coalesce(ref_6.action,
diff --git a/sql/test/miscellaneous/Tests/simple_selects.test
b/sql/test/miscellaneous/Tests/simple_selects.test
--- a/sql/test/miscellaneous/Tests/simple_selects.test
+++ b/sql/test/miscellaneous/Tests/simple_selects.test
@@ -1122,7 +1122,7 @@ ROLLBACK
statement error 42000!SELECT: no such binary operator
'scale_up'(decimal,tinyint)
select scale_up(12.1, 10)
-statement error 42000!SELECT: no such unary operator 'sql_exists'(tinyint)
+statement error 42000!SELECT: no such operator 'sql_exists'(tinyint)
select sql_exists(1)
statement error 42000!CREATE FUNCTION: name 'scale_down' cannot be used
diff --git a/sql/test/orderidx/Tests/simpletable.test
b/sql/test/orderidx/Tests/simpletable.test
--- a/sql/test/orderidx/Tests/simpletable.test
+++ b/sql/test/orderidx/Tests/simpletable.test
@@ -21,7 +21,7 @@ 4
7
query TTTTTIIIII rowsort
-SELECT schema, table, column, type, mode, count, hashes, phash, imprints,
orderidx > 0 FROM storage(current_schema, 'xtmp1')
+SELECT schema, "table", "column", type, mode, count, hashes, phash, imprints,
orderidx > 0 FROM storage(current_schema, 'xtmp1')
----
sys
xtmp1
@@ -41,7 +41,7 @@ statement ok
CREATE ORDERED INDEX sys_xtmp1_i_oidx ON xtmp1(i)
query TTTTTIIIII rowsort
-SELECT schema, table, column, type, mode, count, hashes, phash, imprints,
orderidx > 0 FROM storage(current_schema, 'xtmp1')
+SELECT schema, "table", "column", type, mode, count, hashes, phash, imprints,
orderidx > 0 FROM storage(current_schema, 'xtmp1')
----
sys
xtmp1
diff --git a/sql/test/orderidx/Tests/smalltable.test
b/sql/test/orderidx/Tests/smalltable.test
--- a/sql/test/orderidx/Tests/smalltable.test
+++ b/sql/test/orderidx/Tests/smalltable.test
@@ -2,7 +2,7 @@ statement ok
CREATE TABLE xtmp2(i integer)
query TTTTTIIIII rowsort
-SELECT schema, table, column, type, mode, count, hashes, phash, imprints,
orderidx > 0 FROM storage(current_schema, 'xtmp2')
+SELECT schema, "table", "column", type, mode, count, hashes, phash, imprints,
orderidx > 0 FROM storage(current_schema, 'xtmp2')
----
sys
xtmp2
@@ -22,7 +22,7 @@ statement ok
CREATE ORDERED INDEX sys_xtmp2_i_oidx ON xtmp2(i)
query TTTTTIIIII rowsort
-SELECT schema, table, column, type, mode, count, hashes, phash, imprints,
orderidx > 0 FROM storage(current_schema, 'xtmp2')
+SELECT schema, "table", "column", type, mode, count, hashes, phash, imprints,
orderidx > 0 FROM storage(current_schema, 'xtmp2')
----
sys
xtmp2
@@ -46,7 +46,7 @@ statement ok
INSERT INTO xtmp3 VALUES(3)
query TTTTTIIIII rowsort
-SELECT schema, table, column, type, mode, count, hashes, phash, imprints,
orderidx > 0 FROM storage(current_schema, 'xtmp3')
+SELECT schema, "table", "column", type, mode, count, hashes, phash, imprints,
orderidx > 0 FROM storage(current_schema, 'xtmp3')
----
sys
xtmp3
@@ -66,7 +66,7 @@ statement ok
CREATE ORDERED INDEX sys_xtmp3_i_oidx ON xtmp3(i)
query TTTTTIIIII rowsort
-SELECT schema, table, column, type, mode, count, hashes, phash, imprints,
orderidx > 0 from storage(current_schema, 'xtmp3')
+SELECT schema, "table", "column", type, mode, count, hashes, phash, imprints,
orderidx > 0 from storage(current_schema, 'xtmp3')
----
sys
xtmp3
@@ -91,7 +91,7 @@ statement ok
INSERT INTO xtmp4 VALUES (3),(0),(2)
query TTTTTIIIII rowsort
-SELECT schema, table, column, type, mode, count, hashes, phash, imprints,
orderidx > 0 FROM storage(current_schema, 'xtmp4')
+SELECT schema, "table", "column", type, mode, count, hashes, phash, imprints,
orderidx > 0 FROM storage(current_schema, 'xtmp4')
----
sys
xtmp4
@@ -111,7 +111,7 @@ statement ok
CREATE ORDERED INDEX sys_xtmp4_i_oidx ON xtmp4(i)
query TTTTTIIIII rowsort
-SELECT schema, table, column, type, mode, count, hashes, phash, imprints,
orderidx > 0 from storage(current_schema, 'xtmp4')
+SELECT schema, "table", "column", type, mode, count, hashes, phash, imprints,
orderidx > 0 from storage(current_schema, 'xtmp4')
----
sys
xtmp4
diff --git a/sql/test/prepare/Tests/sample.15.stable.err
b/sql/test/prepare/Tests/sample.15.stable.err
--- a/sql/test/prepare/Tests/sample.15.stable.err
+++ b/sql/test/prepare/Tests/sample.15.stable.err
@@ -3,5 +3,5 @@ QUERY = select * from GENERATE_SERIES(1,
ERROR = !Illegal argument p should be between 0 and 1.0
MAPI = monetdb@localhost:50000
QUERY = select * from GENERATE_SERIES(1,41) seed 1; --error, seed without
sample
-ERROR = !SEED: cannot have SEED without SAMPLE
+ERROR = !syntax error, unexpected SEED, expecting SCOLON or ':' in: "select *
from generate_series(1,41) seed"
CODE = 42000
diff --git a/sql/test/subquery/Tests/correlated.test
b/sql/test/subquery/Tests/correlated.test
--- a/sql/test/subquery/Tests/correlated.test
+++ b/sql/test/subquery/Tests/correlated.test
@@ -497,7 +497,7 @@ SELECT CAST((SELECT SUM(i1.i)) AS BIGINT
----
6
-statement error 42000!SELECT: no such unary operator 'first'(int)
+statement error 42000!SELECT: no such operator 'first'(int)
SELECT FIRST(i), CAST((SELECT SUM(i1.i)) AS BIGINT) FROM integers i1
query II nosort
diff --git a/sql/test/subquery/Tests/subquery4.test
b/sql/test/subquery/Tests/subquery4.test
--- a/sql/test/subquery/Tests/subquery4.test
+++ b/sql/test/subquery/Tests/subquery4.test
@@ -182,7 +182,7 @@ 1
2
3
-statement error 42000!syntax error, unexpected ',' in: "select i from integers
where (i,i) in ((select 1,2),"
+statement error 42000!Subquery has too few columns
SELECT i FROM integers WHERE (i,i) IN ((SELECT 1,2), (SELECT i UNION ALL
SELECT 2))
query I rowsort
diff --git
a/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.test
b/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.test
--- a/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.test
+++ b/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.test
@@ -299,15 +299,15 @@ SELECT * FROM sys.storage() WHERE schema
----
query TTTTTTIIIIIIIIIII rowsort
-SELECT * FROM sys.storage() WHERE table NOT IN (SELECT name FROM sys._tables
UNION ALL SELECT name FROM tmp._tables)
+SELECT * FROM sys.storage() WHERE "table" NOT IN (SELECT name FROM sys._tables
UNION ALL SELECT name FROM tmp._tables)
----
query TTTTTTIIIIIIIIIII rowsort
-SELECT * FROM sys.storage() WHERE (schema, table) NOT IN (SELECT sch.name,
tbl.name FROM sys.schemas AS sch JOIN sys.tables AS tbl ON sch.id =
tbl.schema_id)
+SELECT * FROM sys.storage() WHERE (schema, "table") NOT IN (SELECT sch.name,
tbl.name FROM sys.schemas AS sch JOIN sys.tables AS tbl ON sch.id =
tbl.schema_id)
----
query TTTTTTIIIIIIIIIII rowsort
-SELECT * FROM sys.storage() WHERE column NOT IN (SELECT name FROM sys._columns
UNION ALL SELECT name FROM tmp._columns UNION ALL SELECT name FROM sys.keys
UNION ALL SELECT name FROM tmp.keys UNION ALL SELECT name FROM sys.idxs UNION
ALL SELECT name FROM tmp.idxs)
+SELECT * FROM sys.storage() WHERE "column" NOT IN (SELECT name FROM
sys._columns UNION ALL SELECT name FROM tmp._columns UNION ALL SELECT name FROM
sys.keys UNION ALL SELECT name FROM tmp.keys UNION ALL SELECT name FROM
sys.idxs UNION ALL SELECT name FROM tmp.idxs)
----
query TTTTTTIIIIIIIIIII rowsort
@@ -319,15 +319,15 @@ SELECT * FROM sys.storage WHERE schema N
----
query TTTTTTIIIIIIIIIII rowsort
-SELECT * FROM sys.storage WHERE table NOT IN (SELECT name FROM sys._tables
UNION ALL SELECT name FROM tmp._tables)
+SELECT * FROM sys.storage WHERE "table" NOT IN (SELECT name FROM sys._tables
UNION ALL SELECT name FROM tmp._tables)
----
query TTTTTTIIIIIIIIIII rowsort
-SELECT * FROM sys.storage WHERE (schema, table) NOT IN (SELECT sch.name,
tbl.name FROM sys.schemas AS sch JOIN sys.tables AS tbl ON sch.id =
tbl.schema_id)
+SELECT * FROM sys.storage WHERE (schema, "table") NOT IN (SELECT sch.name,
tbl.name FROM sys.schemas AS sch JOIN sys.tables AS tbl ON sch.id =
tbl.schema_id)
----
query TTTTTTIIIIIIIIIII rowsort
-SELECT * FROM sys.storage WHERE column NOT IN (SELECT name FROM sys._columns
UNION ALL SELECT name FROM tmp._columns UNION ALL SELECT name FROM sys.keys
UNION ALL SELECT name FROM tmp.keys UNION ALL SELECT name FROM sys.idxs UNION
ALL SELECT name FROM tmp.idxs)
+SELECT * FROM sys.storage WHERE "column" NOT IN (SELECT name FROM sys._columns
UNION ALL SELECT name FROM tmp._columns UNION ALL SELECT name FROM sys.keys
UNION ALL SELECT name FROM tmp.keys UNION ALL SELECT name FROM sys.idxs UNION
ALL SELECT name FROM tmp.idxs)
----
query TTTTTTIIIIIIIIIII rowsort
@@ -339,11 +339,11 @@ SELECT * FROM sys.tablestorage WHERE sch
----
query TTIIIIIII rowsort
-SELECT * FROM sys.tablestorage WHERE table NOT IN (SELECT name FROM
sys._tables UNION ALL SELECT name FROM tmp._tables)
+SELECT * FROM sys.tablestorage WHERE "table" NOT IN (SELECT name FROM
sys._tables UNION ALL SELECT name FROM tmp._tables)
----
query TTIIIIIII rowsort
-SELECT * FROM sys.tablestorage WHERE (schema, table) NOT IN (SELECT sch.name,
tbl.name FROM sys.schemas AS sch JOIN sys.tables AS tbl ON sch.id =
tbl.schema_id)
+SELECT * FROM sys.tablestorage WHERE (schema, "table") NOT IN (SELECT
sch.name, tbl.name FROM sys.schemas AS sch JOIN sys.tables AS tbl ON sch.id =
tbl.schema_id)
----
query TIIIIII rowsort
@@ -355,15 +355,15 @@ SELECT * FROM sys.storagemodel WHERE sch
----
query TTTTIIIIIIIII rowsort
-SELECT * FROM sys.storagemodel WHERE table NOT IN (SELECT name FROM
sys._tables UNION ALL SELECT name FROM tmp._tables)
+SELECT * FROM sys.storagemodel WHERE "table" NOT IN (SELECT name FROM
sys._tables UNION ALL SELECT name FROM tmp._tables)
----
query TTTTIIIIIIIII rowsort
-SELECT * FROM sys.storagemodel WHERE (schema, table) NOT IN (SELECT sch.name,
tbl.name FROM sys.schemas AS sch JOIN sys.tables AS tbl ON sch.id =
tbl.schema_id)
+SELECT * FROM sys.storagemodel WHERE (schema, "table") NOT IN (SELECT
sch.name, tbl.name FROM sys.schemas AS sch JOIN sys.tables AS tbl ON sch.id =
tbl.schema_id)
----
query TTTTIIIIIIIII rowsort
-SELECT * FROM sys.storagemodel WHERE column NOT IN (SELECT name FROM
sys._columns UNION ALL SELECT name FROM tmp._columns UNION ALL SELECT name FROM
sys.keys UNION ALL SELECT name FROM tmp.keys UNION ALL SELECT name FROM
sys.idxs UNION ALL SELECT name FROM tmp.idxs)
+SELECT * FROM sys.storagemodel WHERE "column" NOT IN (SELECT name FROM
sys._columns UNION ALL SELECT name FROM tmp._columns UNION ALL SELECT name FROM
sys.keys UNION ALL SELECT name FROM tmp.keys UNION ALL SELECT name FROM
sys.idxs UNION ALL SELECT name FROM tmp.idxs)
----
query TTTTIIIIIIIII rowsort
@@ -375,15 +375,15 @@ SELECT * FROM sys.storagemodelinput WHER
----
query TTTTIIIIIIII rowsort
-SELECT * FROM sys.storagemodelinput WHERE table NOT IN (SELECT name FROM
sys._tables UNION ALL SELECT name FROM tmp._tables)
+SELECT * FROM sys.storagemodelinput WHERE "table" NOT IN (SELECT name FROM
sys._tables UNION ALL SELECT name FROM tmp._tables)
----
query TTTTIIIIIIII rowsort
-SELECT * FROM sys.storagemodelinput WHERE (schema, table) NOT IN (SELECT
sch.name, tbl.name FROM sys.schemas AS sch JOIN sys.tables AS tbl ON sch.id =
tbl.schema_id)
+SELECT * FROM sys.storagemodelinput WHERE (schema, "table") NOT IN (SELECT
sch.name, tbl.name FROM sys.schemas AS sch JOIN sys.tables AS tbl ON sch.id =
tbl.schema_id)
----
query TTTTIIIIIIII rowsort
-SELECT * FROM sys.storagemodelinput WHERE column NOT IN (SELECT name FROM
sys._columns UNION ALL SELECT name FROM tmp._columns UNION ALL SELECT name FROM
sys.keys UNION ALL SELECT name FROM tmp.keys UNION ALL SELECT name FROM
sys.idxs UNION ALL SELECT name FROM tmp.idxs)
+SELECT * FROM sys.storagemodelinput WHERE "column" NOT IN (SELECT name FROM
sys._columns UNION ALL SELECT name FROM tmp._columns UNION ALL SELECT name FROM
sys.keys UNION ALL SELECT name FROM tmp.keys UNION ALL SELECT name FROM
sys.idxs UNION ALL SELECT name FROM tmp.idxs)
----
query TTTTIIIIIIII rowsort
@@ -391,15 +391,15 @@ SELECT * FROM sys.storagemodelinput WHER
----
query TTIIIIII rowsort
-SELECT schema, table, rowcount, columnsize, heapsize, hashsize, imprintsize,
orderidxsize FROM sys.tablestoragemodel WHERE schema NOT IN (SELECT name FROM
sys.schemas)
+SELECT schema, "table", rowcount, columnsize, heapsize, hashsize, imprintsize,
orderidxsize FROM sys.tablestoragemodel WHERE schema NOT IN (SELECT name FROM
sys.schemas)
----
query TTIIIIII rowsort
-SELECT schema, table, rowcount, columnsize, heapsize, hashsize, imprintsize,
orderidxsize FROM sys.tablestoragemodel WHERE table NOT IN (SELECT name FROM
sys._tables UNION ALL SELECT name FROM tmp._tables)
+SELECT schema, "table", rowcount, columnsize, heapsize, hashsize, imprintsize,
orderidxsize FROM sys.tablestoragemodel WHERE "table" NOT IN (SELECT name FROM
sys._tables UNION ALL SELECT name FROM tmp._tables)
----
query TTIIIIII rowsort
-SELECT schema, table, rowcount, columnsize, heapsize, hashsize, imprintsize,
orderidxsize FROM sys.tablestoragemodel WHERE (schema, table) NOT IN (SELECT
sch.name, tbl.name FROM sys.schemas AS sch JOIN sys.tables AS tbl ON sch.id =
tbl.schema_id)
+SELECT schema, "table", rowcount, columnsize, heapsize, hashsize, imprintsize,
orderidxsize FROM sys.tablestoragemodel WHERE (schema, "table") NOT IN (SELECT
sch.name, tbl.name FROM sys.schemas AS sch JOIN sys.tables AS tbl ON sch.id =
tbl.schema_id)
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
