Changeset: ea7199a7fa19 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ea7199a7fa19
Modified Files:
sql/backends/monet5/sql.c
Branch: Jan2014
Log Message:
clean up error messages with out schema names (declared tables)
diffs (33 lines):
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -942,6 +942,7 @@ create_trigger(mvc *sql, char *sname, ch
sql->sa = sa_create();
buf = sa_strdup(sql->sa, query);
r = rel_parse(sql, buf, m_deps);
+ /* TODO use relational part to find dependencies */
if (r) {
stmt *sqs = rel_bin(sql, r);
list *col_l = stmt_list_dependencies(sql->sa, sqs,
COLUMN_DEPENDENCY);
@@ -1633,7 +1634,9 @@ mvc_bind_wrap(Client cntxt, MalBlkPtr mb
}
return MAL_SUCCEED;
}
- throw(SQL, "sql.bind", "unable to find %s.%s(%s)", *sname, *tname,
*cname);
+ if (*sname)
+ throw(SQL, "sql.bind", "unable to find %s.%s(%s)", *sname,
*tname, *cname);
+ throw(SQL, "sql.bind", "unable to find %s(%s)", *tname, *cname);
}
/* str mvc_bind_idxbat_wrap(int *bid, str *sname, str *tname, str *iname, int
*access); */
@@ -1696,7 +1699,9 @@ mvc_bind_idxbat_wrap(Client cntxt, MalBl
}
return MAL_SUCCEED;
}
- throw(SQL, "sql.idxbind", "unable to find index %s for %s.%s", *iname,
*sname, *tname);
+ if (*sname)
+ throw(SQL, "sql.idxbind", "unable to find index %s for %s.%s",
*iname, *sname, *tname);
+ throw(SQL, "sql.idxbind", "unable to find index %s for %s", *iname,
*tname);
}
/*mvc_append_wrap(int *bid, str *sname, str *tname, str *cname, ptr d) */
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
