Changeset: 991c996a689b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/991c996a689b
Modified Files:
sql/server/rel_select.c
Branch: default
Log Message:
Bailout earlier on error
diffs (21 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
@@ -5356,6 +5356,8 @@ rel_table_exp(sql_query *query, sql_rel
}
}
if ((exps || (exps = rel_table_projections(sql, project, tname,
0)) != NULL) && !list_empty(exps)) {
+ if (!(exps = check_distinct_exp_names(sql, exps)))
+ return sql_error(sql, 02, SQLSTATE(42000)
"Duplicate column names in table%s%s%s projection list", tname ? " '" : "",
tname ? tname : "", tname ? "'" : "");
if (groupby) {
groupby->exps =
list_distinct(list_merge(groupby->exps, exps, (fdup) NULL), (fcmp) exp_equal,
(fdup) NULL);
for (node *n = groupby->exps->h ; n ; n =
n->next) {
@@ -5369,8 +5371,6 @@ rel_table_exp(sql_query *query, sql_rel
}
}
}
- if (!(exps = check_distinct_exp_names(sql, exps)))
- return sql_error(sql, 02, SQLSTATE(42000)
"Duplicate column names in table%s%s%s projection list", tname ? " '" : "",
tname ? tname : "", tname ? "'" : "");
return exps;
}
if (!tname)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
