MonetDB: sq2default - Look for void type at zero_or_one

[Pedro Ferreira]

Changeset: ab5f9cae926c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ab5f9cae926c
Modified Files:
        sql/backends/monet5/sql_subquery.c
Branch: sq2default
Log Message:

Look for void type at zero_or_one


diffs (21 lines):

diff --git a/sql/backends/monet5/sql_subquery.c 
b/sql/backends/monet5/sql_subquery.c
--- a/sql/backends/monet5/sql_subquery.c
+++ b/sql/backends/monet5/sql_subquery.c
@@ -32,6 +32,8 @@ zero_or_one_error(ptr ret, const bat *bi
                throw(SQL, "sql.zero_or_one", SQLSTATE(21000) "Cardinality 
violation, scalar value expected");
        }
        _s = ATOMsize(ATOMtype(b->ttype));
+       if (b->ttype == TYPE_void)
+               p = &oid_nil;
        if (ATOMextern(b->ttype)) {
                _s = ATOMlen(ATOMtype(b->ttype), p);
                *(ptr *) ret = GDKmalloc(_s);
@@ -42,7 +44,7 @@ zero_or_one_error(ptr ret, const bat *bi
                memcpy(*(ptr *) ret, p, _s);
        } else if (b->ttype == TYPE_bat) {
                bat bid = *(bat *) p;
-               if((*(BAT **) ret = BATdescriptor(bid)) == NULL){
+               if ((*(BAT **) ret = BATdescriptor(bid)) == NULL){
                        BBPunfix(b->batCacheid);
                        throw(SQL, "sql.zero_or_one", SQLSTATE(HY005) "Cannot 
access column descriptor");
                }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list