Changeset: 00af865f94e9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/00af865f94e9
Modified Files:
sql/test/miscellaneous/Tests/groupby_prepare.test
sql/test/rel-optimizers/Tests/isnull-isnotnull-equality-exp.test
sql/test/rel-optimizers/Tests/merge-ors-single-col-eq-to-cmp_in.test
Branch: reducedstack
Log Message:
approved some more tests
diffs (237 lines):
diff --git a/sql/test/miscellaneous/Tests/groupby_prepare.test
b/sql/test/miscellaneous/Tests/groupby_prepare.test
--- a/sql/test/miscellaneous/Tests/groupby_prepare.test
+++ b/sql/test/miscellaneous/Tests/groupby_prepare.test
@@ -323,21 +323,8 @@ NULL
statement error
prepare select case when col0 = 0 then ? when col0 = 1 then ? else ? end from
tab0
-query TIITTT nosort
+statement error 42000!Cannot have a parameter (?) for IS NULL operator
prepare select ? is null from tab0
-----
-boolean
-1
-0
-(empty)
-%1
-%1
-varchar
-0
-0
-NULL
-NULL
-NULL
statement error
prepare select max(?)
diff --git a/sql/test/rel-optimizers/Tests/isnull-isnotnull-equality-exp.test
b/sql/test/rel-optimizers/Tests/isnull-isnotnull-equality-exp.test
--- a/sql/test/rel-optimizers/Tests/isnull-isnotnull-equality-exp.test
+++ b/sql/test/rel-optimizers/Tests/isnull-isnotnull-equality-exp.test
@@ -1,17 +1,17 @@
statement ok
-create table foo (n int, m text);
+create table foo (n int, m text)
statement ok
-insert into foo values (1, 'one'), (NULL, 'mighty null'), (2, 'two');
+insert into foo values (1, 'one'), (NULL, 'mighty null'), (2, 'two')
query IT rowsort
-select * from foo where n is null;
+select * from foo where n is null
----
NULL
mighty null
-query T
-plan select * from foo where n is null;
+query T nosort
+plan select * from foo where n is null
----
project (
| select (
@@ -20,15 +20,32 @@ project (
) [ "foo"."n", "foo"."m" NOT NULL ]
query IT rowsort
-select * from foo where not n is null;
+select * from foo where not n is null
----
1
one
2
two
-query T
-plan select * from foo where not n is null;
+query T nosort
+plan select * from foo where not n is null
+----
+project (
+| select (
+| | table("sys"."foo") [ "foo"."n", "foo"."m" NOT NULL ]
+| ) [ ("foo"."n") * != (int(2) NULL) ]
+) [ "foo"."n", "foo"."m" NOT NULL ]
+
+query IT rowsort
+select * from foo where n is not null
+----
+1
+one
+2
+two
+
+query T nosort
+plan select * from foo where n is not null
----
project (
| select (
@@ -37,30 +54,13 @@ project (
) [ "foo"."n" NOT NULL, "foo"."m" NOT NULL ]
query IT rowsort
-select * from foo where n is not null;
-----
-1
-one
-2
-two
-
-query T
-plan select * from foo where n is not null;
-----
-project (
-| select (
-| | table("sys"."foo") [ "foo"."n", "foo"."m" NOT NULL ]
-| ) [ ("foo"."n") ! * = (int(2) NULL) ]
-) [ "foo"."n" NOT NULL, "foo"."m" NOT NULL ]
-
-query IT rowsort
-select * from foo where not n is not null;
+select * from foo where not n is not null
----
NULL
mighty null
-query T
-plan select * from foo where not n is not null;
+query T nosort
+plan select * from foo where not n is not null
----
project (
| select (
@@ -74,7 +74,7 @@ select * from foo where sys.isnull(n) =
NULL
mighty null
-query T
+query T nosort
plan select * from foo where sys.isnull(n) = true
----
project (
@@ -91,7 +91,7 @@ one
2
two
-query T
+query T nosort
plan select * from foo where sys.isnull(n) = false
----
project (
@@ -108,7 +108,7 @@ one
2
two
-query T
+query T nosort
plan select * from foo where sys.isnull(n) != true
----
project (
@@ -123,13 +123,13 @@ select * from foo where sys.isnull(n) !=
NULL
mighty null
-query T
+query T nosort
plan select * from foo where sys.isnull(n) != false
----
project (
| select (
| | table("sys"."foo") [ "foo"."n", "foo"."m" NOT NULL ]
-| ) [ ("foo"."n") ! * != (int(2) NULL) ]
+| ) [ ("foo"."n") * = (int(2) NULL) ]
) [ "foo"."n", "foo"."m" NOT NULL ]
query IT rowsort
@@ -140,7 +140,7 @@ one
2
two
-query T
+query T nosort
plan select * from foo where sys.isnotnull(n) = true
----
project (
@@ -155,7 +155,7 @@ select * from foo where sys.isnotnull(n)
NULL
mighty null
-query T
+query T nosort
plan select * from foo where sys.isnotnull(n) = false
----
project (
@@ -170,13 +170,13 @@ select * from foo where sys.isnotnull(n)
NULL
mighty null
-query T
+query T nosort
plan select * from foo where sys.isnotnull(n) != true
----
project (
| select (
| | table("sys"."foo") [ "foo"."n", "foo"."m" NOT NULL ]
-| ) [ ("foo"."n") ! * != (int(2) NULL) ]
+| ) [ ("foo"."n") * = (int(2) NULL) ]
) [ "foo"."n", "foo"."m" NOT NULL ]
query IT rowsort
@@ -187,7 +187,7 @@ one
2
two
-query T
+query T nosort
plan select * from foo where sys.isnotnull(n) != false
----
project (
diff --git
a/sql/test/rel-optimizers/Tests/merge-ors-single-col-eq-to-cmp_in.test
b/sql/test/rel-optimizers/Tests/merge-ors-single-col-eq-to-cmp_in.test
--- a/sql/test/rel-optimizers/Tests/merge-ors-single-col-eq-to-cmp_in.test
+++ b/sql/test/rel-optimizers/Tests/merge-ors-single-col-eq-to-cmp_in.test
@@ -111,7 +111,7 @@ where (n = 3 and m = 60)
project (
| select (
| | table("sys"."f") [ "f"."n" NOT NULL, "f"."m" NOT NULL ]
-| ) [ (("f"."n" NOT NULL) in (int(4) "1", int(4) "2")) or (("f"."n" NOT NULL)
= (int(4) "3"), ("f"."m" NOT NULL) = (int(8) "60")), ("f"."n" NOT NULL) in
(int(4) "3", int(4) "1", int(4) "2") ]
+| ) [ (("f"."n" NOT NULL) in (int(4) "1", int(4) "2")) or (("f"."n" NOT NULL)
= (int(4) "3"), ("f"."m" NOT NULL) = (int(8) "60")), ("f"."n" NOT NULL) in
(int(4) "1", int(4) "2", int(4) "3") ]
) [ "f"."n" NOT NULL, "f"."m" NOT NULL ]
query T nosort
@@ -123,7 +123,7 @@ where n = 1
project (
| select (
| | table("sys"."f") [ "f"."n" NOT NULL, "f"."m" NOT NULL ]
-| ) [ (("f"."n" NOT NULL) in (int(4) "1", int(4) "2")) or (("f"."n" NOT NULL)
= (int(4) "3"), ("f"."m" NOT NULL) = (int(8) "60")), ("f"."n" NOT NULL) in
(int(4) "3", int(4) "1", int(4) "2") ]
+| ) [ (("f"."n" NOT NULL) in (int(4) "1", int(4) "2")) or (("f"."n" NOT NULL)
= (int(4) "3"), ("f"."m" NOT NULL) = (int(8) "60")), ("f"."n" NOT NULL) in
(int(4) "1", int(4) "2", int(4) "3") ]
) [ "f"."n" NOT NULL, "f"."m" NOT NULL ]
query T nosort
@@ -135,6 +135,6 @@ where n = 1
project (
| select (
| | table("sys"."f") [ "f"."n" NOT NULL, "f"."m" NOT NULL ]
-| ) [ (("f"."n" NOT NULL) in (int(4) "1", int(4) "2")) or (("f"."n" NOT NULL)
= (int(4) "3"), ("f"."m" NOT NULL) = (int(8) "60")), ("f"."n" NOT NULL) in
(int(4) "3", int(4) "1", int(4) "2") ]
+| ) [ (("f"."n" NOT NULL) in (int(4) "1", int(4) "2")) or (("f"."n" NOT NULL)
= (int(4) "3"), ("f"."m" NOT NULL) = (int(8) "60")), ("f"."n" NOT NULL) in
(int(4) "1", int(4) "2", int(4) "3") ]
) [ "f"."n" NOT NULL, "f"."m" NOT NULL ]
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
