Changeset: 8078fd71bad5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8078fd71bad5
Modified Files:
sql/server/rel_dump.c
Branch: Jun2020
Log Message:
Check for '%' on hte first character only. Also test for missing index
diffs (22 lines):
diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -771,7 +771,8 @@ read_prop( mvc *sql, sql_exp *exp, char
return sql_error(sql, -1, SQLSTATE(42000) "Schema %s
missing\n", sname);
if (!find_prop(exp->p, PROP_JOINIDX)) {
p = exp->p = prop_create(sql->sa, PROP_JOINIDX, exp->p);
- p->value = mvc_bind_idx(sql, s, iname);
+ if (!(p->value = mvc_bind_idx(sql, s, iname)))
+ return sql_error(sql, -1, SQLSTATE(42000)
"Index %s missing\n", iname);
}
r[*pos] = old;
skipWS(r,pos);
@@ -873,7 +874,7 @@ exp_read(mvc *sql, sql_rel *lrel, sql_re
if (!exp && rrel)
exp = rel_bind_column2(sql, rrel, tname, cname,
0);
} else if (!exp) {
- exp = exp_column(sql->sa, tname, cname, NULL,
CARD_ATOM, 1, (strchr(cname,'%') != NULL));
+ exp = exp_column(sql->sa, tname, cname, NULL,
CARD_ATOM, 1, cname[0] == '%');
}
break;
/* atom */
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
