Changeset: e9ed5bd351d2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e9ed5bd351d2
Modified Files:
sql/server/rel_psm.c
sql/server/rel_sequence.c
sql/server/rel_updates.c
sql/test/merge-partitions/Tests/mergepart28.stable.err
Branch: default
Log Message:
Simplify
diffs (truncated from 369 to 300 lines):
diff --git a/sql/server/rel_psm.c b/sql/server/rel_psm.c
--- a/sql/server/rel_psm.c
+++ b/sql/server/rel_psm.c
@@ -815,7 +815,7 @@ rel_create_func(sql_query *query, dlist
mvc *sql = query->sql;
const char *fname = qname_table(qname);
const char *sname = qname_schema(qname);
- sql_schema *s = NULL;
+ sql_schema *s = cur_schema(sql);
sql_func *f = NULL;
sql_subfunc *sf;
dnode *n;
@@ -852,8 +852,6 @@ rel_create_func(sql_query *query, dlist
if (sname && !(s = mvc_bind_schema(sql, sname)))
return sql_error(sql, 02, SQLSTATE(3F000) "CREATE %s: no such
schema '%s'", F, sname);
- if (s == NULL)
- s = cur_schema(sql);
type_list = create_type_list(sql, params, 1);
if ((sf = sql_bind_func_(sql->sa, s, fname, type_list, type)) != NULL
&& create) {
@@ -1144,7 +1142,7 @@ rel_drop_func(mvc *sql, dlist *qname, dl
{
const char *name = qname_table(qname);
const char *sname = qname_schema(qname);
- sql_schema *s = NULL;
+ sql_schema *s = cur_schema(sql);
sql_func *func = NULL;
char *F = NULL, *fn = NULL;
@@ -1154,9 +1152,6 @@ rel_drop_func(mvc *sql, dlist *qname, dl
if (sname && !(s = mvc_bind_schema(sql, sname)))
return sql_error(sql, 02, SQLSTATE(3F000) "DROP %s: no such
schema '%s'", F, sname);
- if (s == NULL)
- s = cur_schema(sql);
-
func = resolve_func(sql, s, name, typelist, type, "DROP", if_exists);
if (!func && !sname) {
s = tmp_schema(sql);
@@ -1174,7 +1169,7 @@ rel_drop_all_func(mvc *sql, dlist *qname
{
const char *name = qname_table(qname);
const char *sname = qname_schema(qname);
- sql_schema *s = NULL;
+ sql_schema *s = cur_schema(sql);
list * list_func = NULL;
char *F = NULL, *fn = NULL;
@@ -1182,8 +1177,6 @@ rel_drop_all_func(mvc *sql, dlist *qname
if (sname && !(s = mvc_bind_schema(sql, sname)))
return sql_error(sql, 02, SQLSTATE(3F000) "DROP %s: no such
schema '%s'", F, sname);
- if (s == NULL)
- s = cur_schema(sql);
list_func = schema_bind_func(sql, s, name, type);
if (!list_func)
@@ -1250,9 +1243,6 @@ create_trigger(sql_query *query, dlist *
dlist *stmts = triggered_action->h->next->next->data.lval;
symbol *condition = triggered_action->h->next->data.sym;
- if (!sname)
- sname = ss->base.name;
-
if (sname && !(ss = mvc_bind_schema(sql, sname)))
return sql_error(sql, 02, SQLSTATE(3F000) "%s TRIGGER: no such
schema '%s'", base, sname);
@@ -1280,7 +1270,7 @@ create_trigger(sql_query *query, dlist *
return sql_error(sql, 02, SQLSTATE(42000) "%s TRIGGER: trigger
and respective table must belong to the same schema", base);
if (create && (st = mvc_bind_trigger(sql, ss, triggername)) != NULL) {
if (replace) {
- if(mvc_drop_trigger(sql, ss, st))
+ if (mvc_drop_trigger(sql, ss, st))
return sql_error(sql, 02, SQLSTATE(HY013) "%s
TRIGGER: %s", base, MAL_MALLOC_FAIL);
} else {
return sql_error(sql, 02, SQLSTATE(42000) "%s TRIGGER:
name '%s' already in use", base, triggername);
@@ -1390,9 +1380,6 @@ drop_trigger(mvc *sql, dlist *qname, int
const char *tname = qname_table(qname);
sql_schema *ss = cur_schema(sql);
- if (!sname)
- sname = ss->base.name;
-
if (sname && !(ss = mvc_bind_schema(sql, sname)))
return sql_error(sql, 02, SQLSTATE(3F000) "DROP TRIGGER: no
such schema '%s'", sname);
@@ -1483,7 +1470,7 @@ static sql_rel*
create_table_from_loader(sql_query *query, dlist *qname, symbol *fcall)
{
mvc *sql = query->sql;
- sql_schema *s = NULL;
+ sql_schema *s = cur_schema(sql);
char *sname = qname_schema(qname);
char *tname = qname_table(qname);
sql_subfunc *loader = NULL;
@@ -1491,8 +1478,6 @@ create_table_from_loader(sql_query *quer
if (sname && !(s = mvc_bind_schema(sql, sname)))
return sql_error(sql, 02, SQLSTATE(3F000) "CREATE TABLE FROM
LOADER: no such schema '%s'", sname);
- if (s == NULL)
- s = cur_schema(sql);
if (!mvc_schema_privs(sql, s))
return sql_error(sql, 02, SQLSTATE(42000) "CREATE TABLE FROM
LOADER: insufficient privileges for user '%s' in schema '%s'",
stack_get_string(sql, "current_user"), s->base.name);
if (mvc_bind_table(sql, s, tname))
diff --git a/sql/server/rel_sequence.c b/sql/server/rel_sequence.c
--- a/sql/server/rel_sequence.c
+++ b/sql/server/rel_sequence.c
@@ -88,12 +88,10 @@ rel_create_seq(
sql_sequence *seq = NULL;
char *name = qname_table(qname);
char *sname = qname_schema(qname);
- sql_schema *s = NULL;
+ sql_schema *s = ss;
if (sname && !(s = mvc_bind_schema(sql, sname)))
return sql_error(sql, 02, SQLSTATE(3F000) "CREATE SEQUENCE: no
such schema '%s'", sname);
- if (s == NULL)
- s = ss;
(void) tpe;
if (find_sql_sequence(s, name)) {
return sql_error(sql, 02, SQLSTATE(42000) "CREATE SEQUENCE:
name '%s' already in use", name);
@@ -249,7 +247,7 @@ rel_alter_seq(
char* name = qname_table(qname);
char *sname = qname_schema(qname);
sql_sequence *seq;
- sql_schema *s = NULL;
+ sql_schema *s = ss;
int start_type = start_list->h->data.i_val;
sql_rel *r = NULL;
@@ -258,8 +256,6 @@ rel_alter_seq(
assert(start_list->h->type == type_int);
if (sname && !(s = mvc_bind_schema(sql, sname)))
return sql_error(sql, 02, SQLSTATE(3F000) "ALTER SEQUENCE: no
such schema '%s'", sname);
- if (!s)
- s = ss;
(void) tpe;
if (!(seq = find_sql_sequence(s, name))) {
return sql_error(sql, 02, SQLSTATE(42000) "ALTER SEQUENCE: no
such sequence '%s'", name);
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
@@ -613,16 +613,12 @@ insert_into(sql_query *query, dlist *qna
mvc *sql = query->sql;
char *sname = qname_schema(qname);
char *tname = qname_table(qname);
- sql_schema *s = NULL;
+ sql_schema *s = cur_schema(sql);
sql_table *t = NULL;
sql_rel *r = NULL;
- if (sname && !(s=mvc_bind_schema(sql, sname))) {
- (void) sql_error(sql, 02, SQLSTATE(3F000) "INSERT INTO: no such
schema '%s'", sname);
- return NULL;
- }
- if (!s)
- s = cur_schema(sql);
+ if (sname && !(s = mvc_bind_schema(sql, sname)))
+ return sql_error(sql, 02, SQLSTATE(3F000) "INSERT INTO: no such
schema '%s'", sname);
t = mvc_bind_table(sql, s, tname);
if (!t && !sname) {
s = tmp_schema(sql);
@@ -1113,15 +1109,11 @@ update_table(sql_query *query, dlist *qn
mvc *sql = query->sql;
char *sname = qname_schema(qname);
char *tname = qname_table(qname);
- sql_schema *s = NULL;
+ sql_schema *s = cur_schema(sql);
sql_table *t = NULL;
- if (sname && !(s=mvc_bind_schema(sql,sname))) {
- (void) sql_error(sql, 02, SQLSTATE(3F000) "UPDATE: no such
schema '%s'", sname);
- return NULL;
- }
- if (!s)
- s = cur_schema(sql);
+ if (sname && !(s = mvc_bind_schema(sql,sname)))
+ return sql_error(sql, 02, SQLSTATE(3F000) "UPDATE: no such
schema '%s'", sname);
t = mvc_bind_table(sql, s, tname);
if (!t && !sname) {
s = tmp_schema(sql);
@@ -1224,15 +1216,11 @@ delete_table(sql_query *query, dlist *qn
mvc *sql = query->sql;
char *sname = qname_schema(qname);
char *tname = qname_table(qname);
- sql_schema *schema = NULL;
+ sql_schema *schema = cur_schema(sql);
sql_table *t = NULL;
- if (sname && !(schema=mvc_bind_schema(sql, sname))) {
- (void) sql_error(sql, 02, SQLSTATE(3F000) "DELETE FROM: no such
schema '%s'", sname);
- return NULL;
- }
- if (!schema)
- schema = cur_schema(sql);
+ if (sname && !(schema = mvc_bind_schema(sql, sname)))
+ return sql_error(sql, 02, SQLSTATE(3F000) "DELETE FROM: no such
schema '%s'", sname);
t = mvc_bind_table(sql, schema, tname);
if (!t && !sname) {
schema = tmp_schema(sql);
@@ -1285,15 +1273,11 @@ truncate_table(mvc *sql, dlist *qname, i
{
char *sname = qname_schema(qname);
char *tname = qname_table(qname);
- sql_schema *schema = NULL;
+ sql_schema *schema = cur_schema(sql);
sql_table *t = NULL;
- if (sname && !(schema=mvc_bind_schema(sql, sname))) {
- (void) sql_error(sql, 02, SQLSTATE(3F000) "TRUNCATE: no such
schema '%s'", sname);
- return NULL;
- }
- if (!schema)
- schema = cur_schema(sql);
+ if (sname && !(schema = mvc_bind_schema(sql, sname)))
+ return sql_error(sql, 02, SQLSTATE(3F000) "TRUNCATE: no such
schema '%s'", sname);
t = mvc_bind_table(sql, schema, tname);
if (!t && !sname) {
schema = tmp_schema(sql);
@@ -1364,7 +1348,7 @@ merge_into_table(sql_query *query, dlist
{
mvc *sql = query->sql;
char *sname = qname_schema(qname), *tname = qname_table(qname),
*alias_name;
- sql_schema *s = NULL;
+ sql_schema *s = cur_schema(sql);
sql_table *t = NULL;
sql_rel *bt, *joined, *join_rel = NULL, *extra_project, *insert = NULL,
*upd_del = NULL, *res = NULL, *extra_select;
sql_exp *nils, *project_first;
@@ -1372,10 +1356,8 @@ merge_into_table(sql_query *query, dlist
assert(tref && search_cond && merge_list);
- if (sname && !(s=mvc_bind_schema(sql, sname)))
+ if (sname && !(s = mvc_bind_schema(sql, sname)))
return sql_error(sql, 02, SQLSTATE(3F000) "MERGE: no such
schema '%s'", sname);
- if (!s)
- s = cur_schema(sql);
t = mvc_bind_table(sql, s, tname);
if (!t && !sname) {
s = tmp_schema(sql);
@@ -1639,7 +1621,7 @@ copyfrom(sql_query *query, dlist *qname,
sql_rel *rel = NULL;
char *sname = qname_schema(qname);
char *tname = qname_table(qname);
- sql_schema *s = NULL;
+ sql_schema *s = cur_schema(sql);
sql_table *t = NULL, *nt = NULL;
const char *tsep = seps->h->data.sval;
const char *rsep = seps->h->next->data.sval;
@@ -1651,12 +1633,9 @@ copyfrom(sql_query *query, dlist *qname,
int reorder = 0;
assert(!nr_offset || nr_offset->h->type == type_lng);
assert(!nr_offset || nr_offset->h->next->type == type_lng);
- if (sname && !(s=mvc_bind_schema(sql, sname))) {
- (void) sql_error(sql, 02, SQLSTATE(3F000) "COPY INTO: no such
schema '%s'", sname);
- return NULL;
- }
- if (!s)
- s = cur_schema(sql);
+
+ if (sname && !(s = mvc_bind_schema(sql, sname)))
+ return sql_error(sql, 02, SQLSTATE(3F000) "COPY INTO: no such
schema '%s'", sname);
t = mvc_bind_table(sql, s, tname);
if (!t && !sname) {
s = tmp_schema(sql);
@@ -1849,9 +1828,8 @@ bincopyfrom(sql_query *query, dlist *qna
mvc *sql = query->sql;
char *sname = qname_schema(qname);
char *tname = qname_table(qname);
- sql_schema *s = NULL;
+ sql_schema *s = cur_schema(sql);
sql_table *t = NULL;
-
dnode *dn;
node *n;
sql_rel *res;
@@ -1864,18 +1842,12 @@ bincopyfrom(sql_query *query, dlist *qna
int i;
assert(f);
- if (!copy_allowed(sql, 1)) {
- (void) sql_error(sql, 02, SQLSTATE(42000) "COPY INTO:
insufficient privileges: "
+ if (!copy_allowed(sql, 1))
+ return sql_error(sql, 02, SQLSTATE(42000) "COPY INTO:
insufficient privileges: "
"binary COPY INTO requires database
administrator rights");
- return NULL;
- }
- if (sname && !(s=mvc_bind_schema(sql, sname))) {
- (void) sql_error(sql, 02, SQLSTATE(3F000) "COPY INTO: no such
schema '%s'", sname);
- return NULL;
- }
- if (!s)
- s = cur_schema(sql);
+ if (sname && !(s = mvc_bind_schema(sql, sname)))
+ return sql_error(sql, 02, SQLSTATE(3F000) "COPY INTO: no such
schema '%s'", sname);
t = mvc_bind_table(sql, s, tname);
if (!t && !sname) {
s = tmp_schema(sql);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
