MonetDB: Apr2019 - Check for invalid usage of aggregate earlier ...

[Pedro Ferreira]

Changeset: 3418007c76cb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3418007c76cb
Modified Files:
        sql/server/rel_select.c
Branch: Apr2019
Log Message:

Check for invalid usage of aggregate earlier for a better error message in case 
of misusage of a global aggregate


diffs (33 lines):

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
@@ -3687,6 +3687,13 @@ static sql_exp *
                if (uaname)
                        GDKfree(uaname);
                return e;
+       } else if (is_sql_where(f)) {
+               char *uaname = GDKmalloc(strlen(aname) + 1);
+               sql_exp *e = sql_error(sql, 02, SQLSTATE(42000) "%s: not 
allowed in WHERE clause",
+                                      uaname ? toUpperCopy(uaname, aname) : 
aname);
+               if (uaname)
+                       GDKfree(uaname);
+               return e;
        }
 
        if (groupby->op != op_groupby) {                /* implicit groupby */
@@ -3706,15 +3713,6 @@ static sql_exp *
        if (!*rel)
                return NULL;
 
-       if (is_sql_where(f)) {
-               char *uaname = GDKmalloc(strlen(aname) + 1);
-               sql_exp *e = sql_error(sql, 02, SQLSTATE(42000) "%s: not 
allowed in WHERE clause",
-                                      uaname ? toUpperCopy(uaname, aname) : 
aname);
-               if (uaname)
-                       GDKfree(uaname);
-               return e;
-       }
-
        if (!args->data.sym) {  /* count(*) case */
                sql_exp *e;
                sql_rel *l = NULL;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list