Changeset: 2125a1386a61 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2125a1386a61
Modified Files:
sql/server/rel_rel.h
sql/server/rel_select.c
Branch: Nov2019
Log Message:
Removed unused sql_partitionby macro
diffs (55 lines):
diff --git a/sql/server/rel_rel.h b/sql/server/rel_rel.h
--- a/sql/server/rel_rel.h
+++ b/sql/server/rel_rel.h
@@ -18,10 +18,9 @@
#define sql_having 8
#define sql_orderby 16
#define sql_groupby 32 //ORed
-#define sql_partitionby 64 //ORed
-#define sql_aggr 128 //ORed
-#define sql_farg 256 //ORed
-#define sql_window 512 //ORed
+#define sql_aggr 64 //ORed
+#define sql_farg 128 //ORed
+#define sql_window 256 //ORed
#define is_sql_from(X) ((X & sql_from) == sql_from)
#define is_sql_where(X) ((X & sql_where) == sql_where)
@@ -29,7 +28,6 @@
#define is_sql_having(X) ((X & sql_having) == sql_having)
#define is_sql_orderby(X) ((X & sql_orderby) == sql_orderby)
#define is_sql_groupby(X) ((X & sql_groupby) == sql_groupby)
-#define is_sql_partitionby(X) ((X & sql_partitionby) == sql_partitionby)
#define is_sql_aggr(X) ((X & sql_aggr) == sql_aggr)
#define is_sql_farg(X) ((X & sql_farg) == sql_farg)
#define is_sql_window(X) ((X & sql_window) == sql_window)
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
@@ -4060,11 +4060,10 @@ rel_aggr_intern(sql_query *query, sql_re
if (uaname)
GDKfree(uaname);
return e;
- } else if (is_sql_groupby(f) || (is_sql_partitionby(f) && groupby->op
!= op_groupby)) {
- const char *clause = is_sql_groupby(f) ? "GROUP BY":"PARTITION
BY";
+ } else if (is_sql_groupby(f)) {
char *uaname = GDKmalloc(strlen(aname) + 1);
- sql_exp *e = sql_error(sql, 02, SQLSTATE(42000) "%s: aggregate
function '%s' not allowed in %s clause",
- uaname ?
toUpperCopy(uaname, aname) : aname, aname, clause);
+ sql_exp *e = sql_error(sql, 02, SQLSTATE(42000) "%s: aggregate
function '%s' not allowed in GROUP BY clause",
+ uaname ?
toUpperCopy(uaname, aname) : aname, aname);
if (uaname)
GDKfree(uaname);
return e;
@@ -5371,9 +5370,9 @@ rel_rankop(sql_query *query, sql_rel **r
supports_frames = (window_function->token != SQL_RANK) || is_nth_value
||
(strcmp(s->base.name, "sys") == 0 &&
((strcmp(aname, "first_value") == 0) || strcmp(aname, "last_value") == 0));
- if (is_sql_where(f) || is_sql_groupby(f) || is_sql_having(f) ||
is_sql_partitionby(f)) {
+ if (is_sql_where(f) || is_sql_groupby(f) || is_sql_having(f)) {
char *uaname = GDKmalloc(strlen(aname) + 1);
- const char *clause =
is_sql_where(f)?"WHERE":is_sql_groupby(f)?"GROUP
BY":is_sql_having(f)?"HAVING":is_sql_orderby(f)?"ORDER BY":"PARTITION BY";
+ const char *clause =
is_sql_where(f)?"WHERE":is_sql_groupby(f)?"GROUP BY":"HAVING";
(void) sql_error(sql, 02, SQLSTATE(42000) "%s: window function
'%s' not allowed in %s clause",
uaname ? toUpperCopy(uaname,
aname) : aname, aname, clause);
if (uaname)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
