Changeset: 5a9bb822d5a8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5a9bb822d5a8
Modified Files:
sql/server/rel_rel.c
sql/server/rel_rel.h
sql/server/rel_updates.c
sql/server/rel_updates.h
Branch: default
Log Message:
some more relocation of code.
diffs (64 lines):
diff --git a/sql/server/rel_rel.c b/sql/server/rel_rel.c
--- a/sql/server/rel_rel.c
+++ b/sql/server/rel_rel.c
@@ -1064,3 +1064,16 @@ rel_or(mvc *sql, sql_rel *l, sql_rel *r,
}
return rel;
}
+
+sql_table *
+rel_ddl_table_get(sql_rel *r)
+{
+ if (r->flag == DDL_ALTER_TABLE || r->flag == DDL_CREATE_TABLE ||
r->flag == DDL_CREATE_VIEW) {
+ sql_exp *e = r->exps->t->data;
+ atom *a = e->l;
+
+ return a->data.val.pval;
+ }
+ return NULL;
+}
+
diff --git a/sql/server/rel_rel.h b/sql/server/rel_rel.h
--- a/sql/server/rel_rel.h
+++ b/sql/server/rel_rel.h
@@ -68,4 +68,6 @@ extern sql_rel *rel_push_select(mvc *sql
extern sql_rel *rel_push_join(mvc *sql, sql_rel *rel, sql_exp *ls, sql_exp
*rs, sql_exp *rs2, sql_exp *e);
extern sql_rel *rel_or(mvc *sql, sql_rel *l, sql_rel *r, list *oexps, list
*lexps, list *rexps);
+extern sql_table *rel_ddl_table_get(sql_rel *r);
+
#endif /* _REL_REL_H_ */
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
@@ -53,18 +53,6 @@ insert_exp_array(mvc *sql, sql_table *t,
#define get_basetable(rel) rel->l
-sql_table *
-rel_ddl_table_get(sql_rel *r)
-{
- if (r->flag == DDL_ALTER_TABLE || r->flag == DDL_CREATE_TABLE ||
r->flag == DDL_CREATE_VIEW) {
- sql_exp *e = r->exps->t->data;
- atom *a = e->l;
-
- return a->data.val.pval;
- }
- return NULL;
-}
-
static sql_table *
get_table( sql_rel *t)
{
diff --git a/sql/server/rel_updates.h b/sql/server/rel_updates.h
--- a/sql/server/rel_updates.h
+++ b/sql/server/rel_updates.h
@@ -16,8 +16,6 @@
#include "sql_mvc.h"
#include <sql_relation.h>
-extern sql_table *rel_ddl_table_get(sql_rel *r);
-
extern sql_exp **table_update_array(mvc *sql, sql_table *t);
extern sql_rel *rel_update(mvc *sql, sql_rel *t, sql_rel *uprel, sql_exp
**updates, list *exps);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
