Changeset: 1500361bf3fd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1500361bf3fd
Modified Files:
        sql/server/rel_select.c
        sql/test/subquery/Tests/subquery4.test
Branch: returning
Log Message:

restore error message


diffs (24 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
@@ -3473,7 +3473,7 @@ static sql_exp *
                        return sql_error(sql, 02, SQLSTATE(42000) "%s: 
aggregate functions not allowed in WHERE clause", toUpperCopy(uaname, aname));
                } else if (is_sql_update_set(f) || is_sql_psm(f)) {
                        char *uaname = SA_NEW_ARRAY(sql->ta, char, 
strlen(aname) + 1);
-                       return sql_error(sql, 02, SQLSTATE(42000) "%s: 
aggregate functions not allowed in SET, WHILE, IF, ELSE, CASE, WHEN, RETURN, 
ANALYZE, RETURNING clauses (use subquery)", toUpperCopy(uaname, aname));
+                       return sql_error(sql, 02, SQLSTATE(42000) "%s: 
aggregate functions not allowed in SET, WHILE, IF, ELSE, CASE, WHEN, RETURN, 
ANALYZE clauses (use subquery)", toUpperCopy(uaname, aname));
                } else if (is_sql_aggr(f)) {
                        char *uaname = SA_NEW_ARRAY(sql->ta, char, 
strlen(aname) + 1);
                        return sql_error(sql, 02, SQLSTATE(42000) "%s: 
aggregate functions cannot be nested", toUpperCopy(uaname, aname));
diff --git a/sql/test/subquery/Tests/subquery4.test 
b/sql/test/subquery/Tests/subquery4.test
--- a/sql/test/subquery/Tests/subquery4.test
+++ b/sql/test/subquery/Tests/subquery4.test
@@ -348,7 +348,7 @@ select iamok()
 statement ok
 drop function iamok
 
-statement error 42000!MIN: aggregate functions not allowed in SET, WHILE, IF, 
ELSE, CASE, WHEN, RETURN, ANALYZE, RETURNING clauses (use subquery)
+statement error 42000!MIN: aggregate functions not allowed in SET, WHILE, IF, 
ELSE, CASE, WHEN, RETURN, ANALYZE clauses (use subquery)
 UPDATE another_T SET col1 = MIN(col1)
 
 statement error 42000!SUM: aggregate functions not allowed in WHERE clause
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to