MonetDB: sciql - fix compilation after merge

[Jennie Zhang]

Changeset: 86434485fa20 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=86434485fa20
Modified Files:
        sql/server/rel_optimizer.c
        sql/server/rel_select.c
        sql/server/rel_updates.c
Branch: sciql
Log Message:

fix compilation after merge


diffs (66 lines):

diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -648,7 +648,7 @@ rel_find_column( sql_allocator *sa, sql_
        if (rel->exps && (is_project(rel->op) || is_base(rel->op))) {
                sql_exp *e = exps_bind_column2(rel->exps, tname, cname);
                if (e)
-                       return exp_alias(sa, e->rname, exp_name(e), tname, 
cname, exp_subtype(e), e->card, has_nil(e), is_intern(e));
+                       return exp_alias(sa, e->rname, exp_name(e), tname, 
cname, exp_subtype(e), e->card, has_nil(e), is_intern(e), e->type == 
e_column?e->f:NULL);
        }
        if (is_project(rel->op) && rel->l) {
                return rel_find_column(sa, rel->l, tname, cname);
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -763,7 +763,7 @@ rel_basetable(mvc *sql, sql_table *t, ch
                }
                append(rel->exps, e);
        }
-       append(rel->exps, exp_alias(sa, atname, TID, tname, TID, 
sql_bind_localtype("oid"), CARD_MULTI, 0, 1));
+       append(rel->exps, exp_alias(sa, atname, TID, tname, TID, 
sql_bind_localtype("oid"), CARD_MULTI, 0, 1, NULL));
 
        if (t->idxs.set) {
                for (cn = t->idxs.set->h; cn; cn = cn->next) {
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
@@ -236,7 +236,7 @@ rel_insert_join_idx(mvc *sql, sql_idx *i
        nnlls->exps = join_exps;
        nnlls = rel_project(sql->sa, nnlls, pexps);
        /* add row numbers */
-       e = exp_column(sql->sa, rel_name(rt), TID, sql_bind_localtype("oid"), 
CARD_MULTI, 0, 1);
+       e = exp_column(sql->sa, rel_name(rt), TID, sql_bind_localtype("oid"), 
CARD_MULTI, 0, 1, NULL);
        exp_setname(sql->sa, e, i->t->base.name, iname);
        append(nnlls->exps, e);
 
@@ -781,7 +781,7 @@ rel_update_join_idx(mvc *sql, sql_idx *i
        nnlls->exps = join_exps;
        nnlls = rel_project(sql->sa, nnlls, pexps);
        /* add row numbers */
-       e = exp_column(sql->sa, rel_name(rt), TID, sql_bind_localtype("oid"), 
CARD_MULTI, 0, 1);
+       e = exp_column(sql->sa, rel_name(rt), TID, sql_bind_localtype("oid"), 
CARD_MULTI, 0, 1, NULL);
        exp_setname(sql->sa, e, i->t->base.name, iname);
        append(nnlls->exps, e);
 
@@ -967,9 +967,9 @@ update_table(mvc *sql, dlist *qname, dli
                /* We simply create a relation TID, updates */
 
                /* first create the project */
-               e = exp_column(sql->sa, rel_name(r), TID, 
sql_bind_localtype("oid"), CARD_MULTI, 0, 1);
+               e = exp_column(sql->sa, rel_name(r), TID, 
sql_bind_localtype("oid"), CARD_MULTI, 0, 1, NULL);
                r = rel_project(sql->sa, r, append(new_exp_list(sql->sa),e));
-               e = exp_column(sql->sa, rel_name(r), TID, 
sql_bind_localtype("oid"), CARD_MULTI, 0, 1);
+               e = exp_column(sql->sa, rel_name(r), TID, 
sql_bind_localtype("oid"), CARD_MULTI, 0, 1, NULL);
                append(exps, e);
                updates = table_update_array(sql, t);
                for (n = assignmentlist->h; n; n = n->next) {
@@ -1121,7 +1121,7 @@ delete_table(mvc *sql, dlist *qname, sym
                        if (!r) {
                                return NULL;
                        } else {
-                               sql_exp *e = exp_column(sql->sa, rel_name(r), 
TID, sql_bind_localtype("oid"), CARD_MULTI, 0, 1);
+                               sql_exp *e = exp_column(sql->sa, rel_name(r), 
TID, sql_bind_localtype("oid"), CARD_MULTI, 0, 1, NULL);
 
                                r = rel_project(sql->sa, r, 
append(new_exp_list(sql->sa), e));
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list