Changeset: 07b12e97e045 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/07b12e97e045
Modified Files:
sql/include/sql_catalog.h
sql/server/rel_multiset.c
Branch: nestedtypes
Log Message:
alias replacements
diffs (63 lines):
diff --git a/sql/include/sql_catalog.h b/sql/include/sql_catalog.h
--- a/sql/include/sql_catalog.h
+++ b/sql/include/sql_catalog.h
@@ -940,7 +940,7 @@ typedef struct pl {
typedef int msid_t;
typedef int msindex_t;
-#define MSID_NAME "multisetid";
-#define MSINDEX_NAME "multisetnr";
+#define MSID_NAME "multisetid"
+#define MSINDEX_NAME "multisetnr"
#endif /* SQL_CATALOG_H */
diff --git a/sql/server/rel_multiset.c b/sql/server/rel_multiset.c
--- a/sql/server/rel_multiset.c
+++ b/sql/server/rel_multiset.c
@@ -341,12 +341,12 @@ fm_project_ms(visitor *v, sql_exp *e, sq
mse->nid = mse->alias.label;
append(nexps, mse);
}
- mse = exp_column(v->sql->sa, cn, "multisetid", inttype, 1,1, 1, 1);
+ mse = exp_column(v->sql->sa, cn, MSID_NAME, inttype, 1,1, 1, 1);
mse->alias.label = (++label);
mse->nid = mse->alias.label;
append(nexps, mse);
if (t->multiset == MS_ARRAY) {
- mse = exp_column(v->sql->sa, cn, "multisetnr", inttype, 1,1, 1,
1);
+ mse = exp_column(v->sql->sa, cn, MSINDEX_NAME, inttype, 1,1, 1,
1);
mse->alias.label = (++label);
mse->nid = mse->alias.label;
append(nexps, mse);
@@ -382,13 +382,13 @@ fm_project_ms_bt(visitor *v, sql_exp *e,
}
sql_exp *msid = exps_bind_column2(exps, cn, "id", NULL);
if (!msid)
- msid = exps_bind_column2(exps, cn, "multisetid", NULL);
+ msid = exps_bind_column2(exps, cn, MSID_NAME, NULL);
msid = exp_ref(v->sql, msid);
append(nexps, msid);
if (t->multiset == MS_ARRAY) {
sql_exp *msnr = exps_bind_column2(exps, cn, "nr", NULL);
if (!msnr)
- msnr = exps_bind_column2(exps, cn, "multisetnr", NULL);
+ msnr = exps_bind_column2(exps, cn, MSINDEX_NAME, NULL);
msnr = exp_ref(v->sql, msnr);
append(nexps, msnr);
}
@@ -505,13 +505,13 @@ fm_project(visitor *v, sql_rel *rel)
}
sql_exp *msid = exps_bind_column2(exps,
cn, "id", NULL);
if (!msid)
- msid = exps_bind_column2(exps,
cn, "multisetid", NULL);
+ msid = exps_bind_column2(exps,
cn, MSID_NAME, NULL);
msid = exp_ref(v->sql, msid);
append(nexps, msid);
if (t->multiset == MS_ARRAY) {
sql_exp *msnr =
exps_bind_column2(exps, cn, "nr", NULL);
if (!msnr)
- msnr =
exps_bind_column2(exps, cn, "multisetnr", NULL);
+ msnr =
exps_bind_column2(exps, cn, MSINDEX_NAME, NULL);
msnr = exp_ref(v->sql, msnr);
append(nexps, msnr);
}
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
