MonetDB: Dec2016 - output a column not a wrongly casted sql_idx.

[Niels Nes]

Changeset: 947957af7128 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=947957af7128
Modified Files:
        sql/server/rel_optimizer.c
Branch: Dec2016
Log Message:

output a column not a wrongly casted sql_idx.


diffs (23 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
@@ -85,12 +85,14 @@ name_find_column( sql_rel *rel, char *rn
                }
                if (t->idxs.set)
                for (cn = t->idxs.set->h; cn; cn = cn->next) {
-                       sql_idx *c = cn->data;
-                       if (strcmp(c->base.name, name+1 /* skip % */) == 0) {
+                       sql_idx *i = cn->data;
+                       if (strcmp(i->base.name, name+1 /* skip % */) == 0) {
                                *bt = rel;
-                               if (pnr < 0 || (c->t->p &&
-                                   list_position(c->t->p->tables.set, c->t) == 
pnr))
-                                       return c;
+                               if (pnr < 0 || (i->t->p &&
+                                   list_position(i->t->p->tables.set, i->t) == 
pnr)) {
+                                       sql_kc *c = i->columns->h->data;
+                                       return c->c;
+                               }
                        }
                }
                break;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list