Changeset: b85a832d6d02 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b85a832d6d02
Modified Files:
sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.out
sql/test/subquery/Tests/subquery3.stable.err
Branch: default
Log Message:
approved output
diffs (46 lines):
diff --git
a/sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
b/sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
---
a/sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
+++
b/sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
@@ -171,7 +171,7 @@ top N (
| | | | ) [ "table12"."t12cola1" = "table1"."t1cola1" ]
| | | ) [ (((((((((((((((clob[char["table1"."t1cold1"]] as "table1"."t1cold1")
FILTER ilike (clob "%a%", clob "")) or ((clob[char["table1"."t1cola1"]] as
"table1"."t1cola1") FILTER ilike (clob "%a%", clob ""))) or
((clob[char["table1"."t1colb1"]] as "table1"."t1colb1") FILTER ilike (clob
"%a%", clob ""))) or ((clob[char["table1"."t1cola11"]] as "table1"."t1cola11")
FILTER ilike (clob "%business%", clob ""))) or ("table1"."t1colc91" >=
timestamp(7)[char(19) "2016-03-21 05:00:00"])) or ("table1"."t1cola101" =
tinyint "1")) or ((clob[char["table1"."t1cola12"]] as "table1"."t1cola12")
FILTER ilike (clob "%Vijay%", clob ""))) or ((clob[char["table2"."t2cola1"]] as
"table2"."t2cola1") ! FILTER ilike (clob "%gmail%", clob ""),
(clob[char["table2"."t2cola1"]] as "table2"."t2cola1") ! FILTER ilike (clob
"%yahoo%", clob ""))) or ((clob[char["table2"."t2cola1"]] as
"table2"."t2cola1") FILTER ilike (clob "%efequitygroup.com%", clob ""))) or
("table4"."t4cola1" = clob "Customer")) or (sys.isnull
("table4"."t4cola2") = boolean "false")) or ("table2"."t2cola81" >= date
"2009-08-31")) or ((("table5"."t5cola1" = clob "BAT") or
((clob[char["table5"."t5cola2"]] as "table5"."t5cola2") FILTER ilike (clob
"%AUSTRALIA%", clob ""))) or ((clob[char["table5"."t5cola2"]] as
"table5"."t5cola2") FILTER ilike (clob "%Monet%", clob ""), "table5"."t5cola3"
= clob "Facebook", "table5"."t5cola5" = clob "new", "table5"."t5cola81" > date
"2015-07-30"))) or ((("table10"."t10cola1" != clob "Completed",
"table9"."t9cola1" = clob "Tasks", "table9"."t9cola91" >= timestamp(7)[char(19)
"2012-01-01 04:32:27"], "table10"."t10cola91" <= timestamp(7)[char(19)
"2013-01-01 04:32:27"]) or ("table9"."t9cola1" = clob "Events",
timestamp(7)[char(19) "2012-01-01 04:32:27"] <= "table11"."t11cola91" <=
timestamp(7)[char(19) "2013-01-01 04:32:27"])) or ("table9"."t9cola1" = clob
"Calls", timestamp(7)[char(19) "2012-01-01 04:32:27"] <= "table10"."t10cola91"
<= timestamp(7)[char(19) "2013-01-01 04:32:27"])), sys.or(sys
.or(sys.or(sys.or(sys.or(sys.or(sys.or(sys.or(sys.or(sys.or(sys.=("table1"."t1cold111",
bigint "15842000014793046"), sys.=("table1"."t1cold111", bigint
"15842000017701488")), sys.=("table1"."t1cold111", bigint
"15842000000024019")), sys.=("table1"."t1cold111", bigint
"15842000000074007")), sys.=("table1"."t1cold111", bigint
"15842000009358096")), sys.=("table1"."t1cold111", bigint
"15842000010487625")), sys.=("table1"."t1cold111", bigint
"15842000006731919")), sys.=("table1"."t1cold111", bigint
"15842000002590112")), sys.=("table1"."t1cold111", bigint
"15842000000019001")), sys.=("table1"."t1cold111", bigint
"15842000014923682")), sys.=("table1"."t1cold111", bigint "15842000027547249"))
= boolean "true") or (sys.or(sys.=("table12"."t12cola1", clob[bigint
"15842000280111951"]), sys.=("table12"."t12cola1", clob[bigint
"15842000280163015"])) = boolean "true") ]
| | ) [ "table1"."t1pkcol" NOT NULL HASHCOL , "table1"."t1cola82",
"table2"."t2cola10", "table1"."t1cola1", "table1"."t1cola91", "a1"."t3cola1",
"table2"."t2cola82" ]
-| ) [ "table1"."t1pkcol" NOT NULL HASHCOL , "table1"."t1cola82",
"table2"."t2cola10", "table1"."t1cola1", "table1"."t1cola91", "a1"."t3cola1" ]
[ "table2"."t2cola82" ]
+| ) [ "table1"."t1pkcol" NOT NULL HASHCOL , "table1"."t1cola82",
"table2"."t2cola10", "table1"."t1cola1", "table1"."t1cola91", "a1"."t3cola1" ]
[ "table2"."t2cola82" NULLS LAST ]
) [ bigint "10", bigint "0" ]
#ROLLBACK;
diff --git
a/sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.out
b/sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.out
---
a/sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.out
+++
b/sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.out
@@ -115,7 +115,7 @@ project (
| | | | | | | | | | ) [ "f"."id", "p"."number" ]
| | | | | | | | | ) [ "f"."id", "p"."number" ] [ "f"."id" ASC, "p"."number"
ASC ]
| | | | | | | | ) [ "f"."id", "p"."number" ]
-| | | | | | | ) [ "f"."id", "p"."number" ] [ "f"."id" ASC, "p"."number" ]
+| | | | | | | ) [ "f"."id", "p"."number" ] [ "f"."id" ASC, "p"."number" NULLS
LAST ]
| | | | | | ) [ "f"."id", "p"."number" ]
| | | | | ) [ "f"."id", "p"."number" ] [ "f"."id" ASC, "p"."number" ASC ]
| | | | ) [ "f"."id", "p"."number", sys.row_number("f"."id", boolean "false",
sys.diff(sys.diff("f"."id" ASC), "p"."number" ASC)) as "line" ]
diff --git a/sql/test/subquery/Tests/subquery3.stable.err
b/sql/test/subquery/Tests/subquery3.stable.err
--- a/sql/test/subquery/Tests/subquery3.stable.err
+++ b/sql/test/subquery/Tests/subquery3.stable.err
@@ -98,6 +98,18 @@ QUERY = SELECT
FROM another_T t1; --error, subqueries not allowed inside PARTITION BY
ERROR = !PARTITION BY: subqueries not allowed in PARTITION BY clause
CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-6419/.s.monetdb.37915
+QUERY = SELECT
+ (SELECT SUM(t1.col1) OVER (ORDER BY (VALUES(1)) ROWS UNBOUNDED
PRECEDING) FROM tbl_ProductSales)
+ FROM another_T t1;
+ERROR = !zero_or_one: cardinality violation, scalar expression expected
+CODE = M0M29
+MAPI = (monetdb) /var/tmp/mtest-6419/.s.monetdb.37915
+QUERY = SELECT
+ (SELECT SUM(t1.col1) OVER (ORDER BY (SELECT SUM(t1.col1 + t2.col1)
FROM another_T t2) ROWS UNBOUNDED PRECEDING) FROM tbl_ProductSales)
+ FROM another_T t1;
+ERROR = !zero_or_one: cardinality violation, scalar expression expected
+CODE = M0M29
# 17:40:41 >
# 17:40:41 > "Done."
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list