Changeset: 658a114ec0f0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=658a114ec0f0
Modified Files:
sql/test/BugTracker-2010/Tests/crashonschema.Bug-2547.test
sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.test
sql/test/BugTracker-2015/Tests/create-temp-table-using-like.Bug-3767.test
sql/test/BugTracker-2015/Tests/schema_view2.Bug-3766.test
sql/test/Dependencies/Tests/dependency_loop.test
sql/test/Dependencies/Tests/dependency_owner_schema_3.test
sql/test/merge-partitions/Tests/mergepart20.test
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.test
sql/test/sys-schema/Tests/check_Not_Nullable_columns.test
Branch: indirect-privs
Log Message:
Updated test outputs due to scoping changes
diffs (222 lines):
diff --git a/sql/test/BugTracker-2010/Tests/crashonschema.Bug-2547.test
b/sql/test/BugTracker-2010/Tests/crashonschema.Bug-2547.test
--- a/sql/test/BugTracker-2010/Tests/crashonschema.Bug-2547.test
+++ b/sql/test/BugTracker-2010/Tests/crashonschema.Bug-2547.test
@@ -23,14 +23,14 @@ drop schema intro1
statement ok
create table t2010(i int)
-statement error
+statement ok
create schema intro3
grant insert on t2010 to monetdb
statement ok
drop table t2010
-statement error
+statement ok
drop schema intro3
diff --git
a/sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.test
b/sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.test
--- a/sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.test
+++ b/sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.test
@@ -14,13 +14,13 @@ create table dc.lta(
tag timestamp
)
-statement error
+statement ok
create procedure dc.archive()
begin
insert into runningcatalog select * from dc.lta;
end
-statement error
+statement ok
call dc.archive()
statement ok
diff --git
a/sql/test/BugTracker-2015/Tests/create-temp-table-using-like.Bug-3767.test
b/sql/test/BugTracker-2015/Tests/create-temp-table-using-like.Bug-3767.test
--- a/sql/test/BugTracker-2015/Tests/create-temp-table-using-like.Bug-3767.test
+++ b/sql/test/BugTracker-2015/Tests/create-temp-table-using-like.Bug-3767.test
@@ -1,13 +1,14 @@
statement ok
create table t1 (i int)
-statement error
+statement ok
create temp table tmp (like t1)
-statement error
+query I rowsort
select * from tmp
+----
-statement error
+statement ok
drop table tmp
statement ok
diff --git a/sql/test/BugTracker-2015/Tests/schema_view2.Bug-3766.test
b/sql/test/BugTracker-2015/Tests/schema_view2.Bug-3766.test
--- a/sql/test/BugTracker-2015/Tests/schema_view2.Bug-3766.test
+++ b/sql/test/BugTracker-2015/Tests/schema_view2.Bug-3766.test
@@ -4,20 +4,22 @@ create table t1 (i int)
statement ok
create schema tst
-statement error
+statement ok
create view tst.v1 (i) as select * from t1
-statement error
+query I rowsort
select * from tst.v1
+----
-query ITITITII rowsort
-select * from sys._tables where name like '%v1%'
+query T rowsort
+select "name" from sys._tables where name like '%v1%'
----
+v1
statement error
create view tst.v1 (i) as select * from t1
-statement error
+statement ok
drop view tst.v1
statement ok
diff --git a/sql/test/Dependencies/Tests/dependency_loop.test
b/sql/test/Dependencies/Tests/dependency_loop.test
--- a/sql/test/Dependencies/Tests/dependency_loop.test
+++ b/sql/test/Dependencies/Tests/dependency_loop.test
@@ -174,6 +174,6 @@ UNION
query I rowsort
select count(*) from dependencies where depend_type = 5
----
-584
+585
diff --git a/sql/test/Dependencies/Tests/dependency_owner_schema_3.test
b/sql/test/Dependencies/Tests/dependency_owner_schema_3.test
--- a/sql/test/Dependencies/Tests/dependency_owner_schema_3.test
+++ b/sql/test/Dependencies/Tests/dependency_owner_schema_3.test
@@ -117,7 +117,7 @@ DEP_FUNC
query TTT rowsort
SELECT c.name, v.name, 'DEP_VIEW' from sys.columns as c, sys.tables as v,
sys.dependencies as dep where c.id = dep.id AND v.id = dep.depend_id AND
dep.depend_type = 5 AND v.type in (1, 11, 21, 31) order by c.name, v.name
----
-1131 values hashing to 217c0dddc280dd654bc83c6dc79720c4
+1134 values hashing to 9b1d4d4cac08bf1ea7e754c7a552595c
query TTT rowsort
SELECT c.name, k.name, 'DEP_KEY' from sys.columns as c, sys.objects as kc,
sys.keys as k where kc."name" = c.name AND kc.id = k.id AND k.table_id =
c.table_id AND k.rkey = -1 order by c.name, k.name
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
@@ -1,5 +1,5 @@
statement ok
-CREATE MERGE TABLE testme (a int, b varchar(32)) PARTITION BY RANGE USING
(md5(a))
+CREATE MERGE TABLE testme (a int, b varchar(32)) PARTITION BY RANGE USING
(sys.md5(a))
statement ok
CREATE TABLE subtable1 (a int, b varchar(32))
@@ -76,7 +76,7 @@ statement ok
CREATE FUNCTION iamdummy(a int) RETURNS INT BEGIN RETURN a + 1; END
statement ok
-CREATE MERGE TABLE testme (a int, b varchar(32)) PARTITION BY RANGE USING
(iamdummy(a))
+CREATE MERGE TABLE testme (a int, b varchar(32)) PARTITION BY RANGE USING
(sys.iamdummy(a))
statement ok
CREATE TABLE subtable1 (a int, b varchar(32))
@@ -111,7 +111,16 @@ INSERT INTO subtable1 VALUES (2, 'sevent
query IT rowsort
SELECT a, b FROM testme
----
-10 values hashing to 98058c0a0e81754fc8e158c85a13f554
+1
+first
+10
+second
+12
+sixth
+15
+fourth
+2
+third
query IT rowsort
SELECT a, b FROM subtable1
@@ -156,7 +165,7 @@ statement ok
CREATE FUNCTION iamdummy(a int, b int, c int) RETURNS INT BEGIN RETURN a + b +
c; END
statement ok
-CREATE MERGE TABLE testme(d int, e int, f int) PARTITION BY RANGE USING
(iamdummy(d, e, f))
+CREATE MERGE TABLE testme(d int, e int, f int) PARTITION BY RANGE USING
(sys.iamdummy(d, e, f))
query IT rowsort
SELECT column_id, expression FROM table_partitions
@@ -171,11 +180,10 @@ statement ok
DROP FUNCTION iamdummy
statement ok
-
CREATE FUNCTION iamdummy(a int) RETURNS INT BEGIN RETURN SELECT a UNION ALL
SELECT a; END
statement ok
-CREATE MERGE TABLE testme(a int) PARTITION BY RANGE USING (iamdummy(a))
+CREATE MERGE TABLE testme(a int) PARTITION BY RANGE USING (sys.iamdummy(a))
statement ok
CREATE TABLE subtable1 (a int)
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
@@ -190,19 +190,19 @@ query ITI rowsort
SELECT * FROM sys.auths WHERE grantor NOT IN (SELECT id FROM sys.auths) AND
grantor > 0
----
-query TTI rowsort
+query TTIT rowsort
SELECT * FROM sys.users WHERE name NOT IN (SELECT name FROM sys.auths)
----
-query TTI rowsort
+query TTIT rowsort
SELECT * FROM sys.users WHERE default_schema NOT IN (SELECT id FROM
sys.schemas)
----
-query TTI rowsort
+query TTIT rowsort
SELECT * FROM sys.db_user_info WHERE name NOT IN (SELECT name FROM sys.auths)
----
-query TTI rowsort
+query TTIT rowsort
SELECT * FROM sys.db_user_info WHERE default_schema NOT IN (SELECT id FROM
sys.schemas)
----
diff --git a/sql/test/sys-schema/Tests/check_Not_Nullable_columns.test
b/sql/test/sys-schema/Tests/check_Not_Nullable_columns.test
--- a/sql/test/sys-schema/Tests/check_Not_Nullable_columns.test
+++ b/sql/test/sys-schema/Tests/check_Not_Nullable_columns.test
@@ -218,15 +218,15 @@ query IITI rowsort
SELECT "grantor", * FROM "sys"."auths" WHERE "grantor" IS NULL
----
-query TTTI rowsort
+query TTTIT rowsort
SELECT "name", * FROM "sys"."db_user_info" WHERE "name" IS NULL
----
-query TTTI rowsort
+query TTTIT rowsort
SELECT "fullname", * FROM "sys"."db_user_info" WHERE "fullname" IS NULL
----
-query ITTI rowsort
+query ITTIT rowsort
SELECT "default_schema", * FROM "sys"."db_user_info" WHERE "default_schema" IS
NULL
----
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
