Changeset: 7a81ae56c023 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7a81ae56c023
Modified Files:
sql/server/rel_updates.c
sql/server/sql_statement.c
sql/test/Tests/order_by_complex_exp.stable.out
Branch: default
Log Message:
readded missing case for st_Nop (needed for proper handling of 'next value
for'), not sure why it got lost
properly rename expressions in insert into
diffs (35 lines):
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -411,7 +411,7 @@ insert_into(mvc *sql, dlist *qname, dlis
/* In case of missing project, order by or distinct, we need to add
and projection */
if (r->op != op_project || r->r || need_distinct(r))
- r = rel_project(sql->sa, r, rel_projections(sql, r, NULL, 0,
0));
+ r = rel_project(sql->sa, r, rel_projections(sql, r, NULL, 1,
0));
if ((r->exps && list_length(r->exps) != list_length(collist)) ||
(!r->exps && collist))
return sql_error(sql, 02, "INSERT INTO: query result doesn't
match number of columns in table '%s'", tname);
diff --git a/sql/server/sql_statement.c b/sql/server/sql_statement.c
--- a/sql/server/sql_statement.c
+++ b/sql/server/sql_statement.c
@@ -732,6 +732,7 @@ push_project(sql_allocator *sa, stmt *ro
val->op1 = push_project(sa, rows, val->op1);
break;
case st_func:
+ case st_Nop:
if (val->op4.funcval->func->side_effect) {
stmt *l = val->op1;
node *n = l->op4.lval->h;
diff --git a/sql/test/Tests/order_by_complex_exp.stable.out
b/sql/test/Tests/order_by_complex_exp.stable.out
--- a/sql/test/Tests/order_by_complex_exp.stable.out
+++ b/sql/test/Tests/order_by_complex_exp.stable.out
@@ -40,7 +40,7 @@ Ready.
% 109 # length
project (
| group by (
-| | table(sys.test02) [ test02.col1 NOT NULL, test02.%TID% NOT NULL ]
+| | table(sys.test02) [ test02.col1 NOT NULL, test02.%TID% NOT NULL ] COUNT
| ) [ test02.col1 NOT NULL ] [ test02.col1 NOT NULL, sys.count no nil
(test02.col1 NOT NULL) NOT NULL as L4 ]
) [ test02.col1 NOT NULL ] [ L4 ASC NOT NULL ]
#select col1
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
