Update of /cvsroot/monetdb/sql/src/server
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29798

Modified Files:
        sql_select.mx 
Log Message:
Implement the coalesce in the where clause...

The implementation was done, but not been used.
Niels suggested to remove the else clauses ;)



Index: sql_select.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_select.mx,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -d -r1.211 -r1.212
--- sql_select.mx       6 Dec 2007 10:17:29 -0000       1.211
+++ sql_select.mx       2 Jan 2008 17:24:36 -0000       1.212
@@ -677,9 +677,7 @@
                        list_destroy(results);
                        return sql_error(sql, 02, "CASE: subset not found");
                }
-       } else if (f != sql_sel) {
-               return sql_error(sql, 02, "CASE: currently not supported here");
-       }
+       } 
        if (opt_else || else_stmt) {
                stmt *result = else_stmt;
 
@@ -699,7 +697,7 @@
                        return NULL;
                }
 
-               if (result->nrcols <= 0 && (f != sql_sel || subset)) {
+               if (res && result->nrcols <= 0 && (f != sql_sel || subset)) {
                        res = stmt_const(res, result);
                } else {
                        if (res)
@@ -719,10 +717,7 @@
                        res = stmt_const(res, a);
                } else if (!subset) {
                        res = a;
-               } else {
-                       stmt_destroy(a);
-                       return sql_error(sql, 02, "CASE: currently not 
supported here");
-               }
+               } 
        }
 
        for (n = conds->h, m = results->h; n && m; n = n->next, m = m->next) {


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to