Changeset: 97accbdb33ab for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/97accbdb33ab
Modified Files:
sql/server/rel_unnest.c
Branch: default
Log Message:
merged
diffs (38 lines):
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -2050,7 +2050,7 @@ rel_in_value_exp(sql_query *query, sql_r
}
}
if (!e) {
- if (add_select && rel && *rel &&
!is_project((*rel)->op) && !is_select((*rel)->op))
+ if (add_select && rel && *rel &&
!is_project((*rel)->op) && !is_select((*rel)->op) && !is_base((*rel)->op))
*rel = rel_select(sql->sa, *rel, NULL);
e = exp_in_func(sql, le, values, (sc->token == SQL_IN),
is_tuple);
}
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
@@ -1522,9 +1522,7 @@ push_up_set(mvc *sql, sql_rel *rel, list
set_processed(ns);
if (single || is_single(s))
set_single(ns);
- if (need_distinct(s))
- set_distinct(ns);
- if (need_distinct)
+ if (need_distinct || need_distinct(s))
set_distinct(ns);
if (is_join(rel->op)) {
diff --git a/sql/test/subquery/Tests/subquery6.test
b/sql/test/subquery/Tests/subquery6.test
--- a/sql/test/subquery/Tests/subquery6.test
+++ b/sql/test/subquery/Tests/subquery6.test
@@ -407,7 +407,7 @@ select 1 = any(ColID), max(totalsales) f
statement error 42000!SELECT: cannot use non GROUP BY column
'tbl_productsales.colid' in query results without an aggregate function
select 1 in (ColID), max(totalsales) from tbl_ProductSales
-statement error 42000!SELECT: cannot use non GROUP BY column in query results
without an aggregate function
+statement error 42000!SELECT: cannot use non GROUP BY column
'tbl_productsales.colid' in query results without an aggregate function
select 1 in (ColID, (select 1)), max(totalsales) from tbl_ProductSales
statement error 42000!Tuple matching at projections not implemented in the
backend yet
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
