Changeset: 94c3eac0efcd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/94c3eac0efcd
Modified Files:
sql/backends/monet5/rel_bin.c
sql/server/sql_parser.y
Branch: nested
Log Message:
handle new non reserved keyword unnest
fixed crash because of allowed reorder of table project expressions
diffs (23 lines):
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -2800,6 +2800,8 @@ rel2bin_basetable(backend *be, sql_rel *
s = (i == fi) ? col : stmt_idx(be, i,
complex?dels:NULL, dels->partition);
} else {
cn = find_next_sql_column(t, cn, oname);
+ if (!cn)
+ cn = find_next_sql_column(t,
ol_first_node(t->columns), oname);
assert(cn);
sql_column *c = cn->data;
if (exp->f && (c->type.multiset ||
c->type.type->composite)) {
diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y
--- a/sql/server/sql_parser.y
+++ b/sql/server/sql_parser.y
@@ -6928,6 +6928,7 @@ non_reserved_keyword:
| SQL_TRACE { $$ = ma_strdup(SA, "trace"); }
| TYPE { $$ = ma_strdup(SA, "type"); }
| UNLOGGED { $$ = ma_strdup(SA, "unlogged"); }
+ | UNNEST { $$ = ma_strdup(SA, "unnest"); }
| WEEK { $$ = ma_strdup(SA, "week"); }
| ZONE { $$ = ma_strdup(SA, "zone"); }
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
