Changeset: 8ecb3e93c823 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8ecb3e93c823
Modified Files:
sql/server/rel_unnest.c
Branch: default
Log Message:
Merged with Jan2022
diffs (58 lines):
diff --git a/sql/server/rel_unnest.c b/sql/server/rel_unnest.c
--- a/sql/server/rel_unnest.c
+++ b/sql/server/rel_unnest.c
@@ -875,7 +875,7 @@ push_up_project(mvc *sql, sql_rel *rel,
if (cexps) {
sql_rel *p = l->l = rel_project(
sql->sa, l->l,
rel_projections(sql, l->l,
NULL, 1, 1));
- p->exps = list_merge(p->exps, cexps,
(fdup)NULL);
+ p->exps =
list_distinct(list_merge(p->exps, cexps, (fdup)NULL), (fcmp)exp_equal,
(fdup)NULL);
if (list_empty(nexps)) {
rel->r = l; /* remove empty
project */
} else {
diff --git a/sql/test/BugTracker-2015/Tests/crash.Bug-3736.test
b/sql/test/BugTracker-2015/Tests/crash.Bug-3736.test
--- a/sql/test/BugTracker-2015/Tests/crash.Bug-3736.test
+++ b/sql/test/BugTracker-2015/Tests/crash.Bug-3736.test
@@ -125,7 +125,7 @@ single left outer join (
| | | | crossproduct (
| | | | | project (
| | | | | | table("sys"."bidder") [ "bidder"."id" NOT NULL UNIQUE HASHCOL as
"b3"."id", "bidder"."increase" NOT NULL as "b3"."increase", "bidder"."%TID%"
NOT NULL UNIQUE as "b3"."%TID%" ]
-| | | | | ) [ "b3"."id" NOT NULL UNIQUE HASHCOL , "b3"."increase" NOT NULL,
"b3"."%TID%" NOT NULL UNIQUE, "b3"."id" NOT NULL HASHCOL , "b3"."increase" NOT
NULL, "b3"."%TID%" NOT NULL, "b3"."increase" NOT NULL as "%2"."%2" ],
+| | | | | ) [ "b3"."id" NOT NULL UNIQUE HASHCOL , "b3"."increase" NOT NULL,
"b3"."%TID%" NOT NULL UNIQUE, "b3"."increase" NOT NULL as "%2"."%2" ],
| | | | | group by (
| | | | | | join (
| | | | | | | group by (
@@ -152,7 +152,7 @@ project (
| | | | | | | crossproduct (
| | | | | | | | project (
| | | | | | | | | table("sys"."bidder") [ "bidder"."id" NOT NULL UNIQUE
HASHCOL as "b2"."id", "bidder"."increase" NOT NULL as "b2"."increase" ]
-| | | | | | | | ) [ "b2"."id" NOT NULL HASHCOL , "b2"."increase" NOT NULL as
"%4"."%4" ],
+| | | | | | | | ) [ "b2"."id" NOT NULL UNIQUE HASHCOL , "b2"."increase" NOT
NULL as "%4"."%4" ],
| | | | | | | | group by (
| | | | | | | | | join (
| | | | | | | | | | single group by (
diff --git a/sql/test/SQLancer/Tests/sqlancer22.test
b/sql/test/SQLancer/Tests/sqlancer22.test
--- a/sql/test/SQLancer/Tests/sqlancer22.test
+++ b/sql/test/SQLancer/Tests/sqlancer22.test
@@ -83,5 +83,21 @@ with x(x) as (select 4) select 2 > all(s
----
0
+statement ok rowcount 0
+update t0 set c0 = (with x(x) as (select 3)
+select 79 from x join (select 1) as y(y) on v17.c0 <= -4 where x.x > 1) from
t0 v17
+
+statement ok rowcount 1
+INSERT INTO t0 VALUES (1)
+
+statement ok rowcount 1
+update t0 set c0 = (with x(x) as (select 3)
+select 79 from x join (select 1) as y(y) on v17.c0 <= -4 where x.x > 1) from
t0 v17
+
+query I nosort
+SELECT c0 FROM t0
+----
+NULL
+
statement ok
ROLLBACK
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
