Changeset: d1b2b779a6d4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d1b2b779a6d4
Modified Files:
sql/backends/monet5/sql_optimizer.c
sql/server/rel_updates.c
sql/server/sql_mvc.c
sql/storage/sql_storage.h
sql/storage/store.c
Branch: scoping
Log Message:
Removed dt_schema references and small fix from previous merge
diffs (76 lines):
diff --git a/sql/backends/monet5/sql_optimizer.c
b/sql/backends/monet5/sql_optimizer.c
--- a/sql/backends/monet5/sql_optimizer.c
+++ b/sql/backends/monet5/sql_optimizer.c
@@ -93,10 +93,10 @@ SQLgetSpace(mvc *m, MalBlkPtr mb, int pr
sql_table *t = 0;
sql_column *c = 0;
- if (!s || strcmp(s->base.name, dt_schema) == 0)
+ if (!s)
continue;
t = mvc_bind_table(m, s, tname);
- if (!t)
+ if (!t || isDeclaredTable(t))
continue;
c = mvc_bind_column(m, t, cname);
if (!s)
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
@@ -628,8 +628,6 @@ insert_into(sql_query *query, dlist *qna
if (!t && !sname) {
s = tmp_schema(sql);
t = mvc_bind_table(sql, s, tname);
- if (!t)
- t = mvc_bind_table(sql, NULL, tname);
}
if (insert_allowed(sql, t, tname, "INSERT INTO", "insert into") ==
NULL)
return NULL;
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -1054,9 +1054,7 @@ mvc_bind_table(mvc *m, sql_schema *s, co
sql_table *t = stack_find_table(m, s, tname);
if (!t)
- t = find_sql_table(s, tname);
- if (!t)
- return NULL;
+ t = find_sql_table(s, tname);
TRC_DEBUG(SQL_TRANS, "Bind table: %s.%s\n", s ? s->base.name :
"<noschema>", tname);
return t;
}
@@ -1476,7 +1474,7 @@ sql_column *
mvc_create_column(mvc *m, sql_table *t, const char *name, sql_subtype *tpe)
{
TRC_DEBUG(SQL_TRANS, "Create column: %s %s %s\n", t->base.name, name,
tpe->type->sqlname);
- if (t->persistence == SQL_DECLARED_TABLE && (!t->s ||
strcmp(t->s->base.name, dt_schema)))
+ if (t->persistence == SQL_DECLARED_TABLE)
/* declared tables should not end up in the catalog */
return create_sql_column(m->session->tr, t, name, tpe);
else
diff --git a/sql/storage/sql_storage.h b/sql/storage/sql_storage.h
--- a/sql/storage/sql_storage.h
+++ b/sql/storage/sql_storage.h
@@ -22,8 +22,7 @@
#define isGlobal(x) ((x)->persistence!=SQL_LOCAL_TEMP && \
(x)->persistence!=SQL_DECLARED_TABLE)
#define isGlobalTemp(x) ((x)->persistence==SQL_GLOBAL_TEMP)
-#define isTempSchema(x) (strcmp((x)->base.name, "tmp") == 0 || \
- strcmp((x)->base.name, dt_schema) == 0)
+#define isTempSchema(x) (strcmp((x)->base.name, "tmp") == 0)
#define isDeclaredTable(x) ((x)->persistence==SQL_DECLARED_TABLE)
extern int catalog_version;
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -1933,8 +1933,6 @@ store_load(void) {
}
}
- (void) bootstrap_create_schema(tr, dt_schema, ROLE_SYSADMIN,
USER_MONETDB);
-
if (first) {
insert_types(tr, types);
insert_functions(tr, funcs, args);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
