Changeset: eecc832d24d0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eecc832d24d0
Modified Files:
sql/server/rel_select.c
sql/test/analytics/Tests/analytics09.sql
sql/test/analytics/Tests/analytics09.stable.err
sql/test/analytics/Tests/analytics09.stable.out
Branch: default
Log Message:
Compilation fix and approve test output.
diffs (62 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
@@ -4721,7 +4721,7 @@ rel_rankop(mvc *sql, sql_rel **rel, symb
char *aname = NULL, *sname = NULL, *window_ident = NULL;
sql_subfunc *wf = NULL;
sql_exp *in = NULL, *pe = NULL, *oe = NULL, *call = NULL, *start =
NULL, *eend = NULL, *fstart = NULL, *fend = NULL;
- sql_rel *r = *rel, *p, *pp, *op;
+ sql_rel *r = *rel, *p, *pp, *op = NULL;
list *gbe = NULL, *obe = NULL, *args = NULL, *types = NULL, *fargs =
NULL;
sql_schema *s = sql->session->schema;
dnode *dn = window_function->data.lval->h;
diff --git a/sql/test/analytics/Tests/analytics09.sql
b/sql/test/analytics/Tests/analytics09.sql
--- a/sql/test/analytics/Tests/analytics09.sql
+++ b/sql/test/analytics/Tests/analytics09.sql
@@ -79,4 +79,12 @@ select min(aa) over (partition by sum(aa
select rank() over (order by sum(aa)) from analytics;
+select rank() over (order by sum(aa), sum(bb)) from analytics;
+
+select rank() over (order by sum(aa), bb) from analytics; --error
+
+select min(aa) over (order by sum(bb)) from analytics; --error
+
+--select dense_rank() over (partition by sum(aa) order by avg(bb)) from
analytics; TODO
+
drop table analytics;
diff --git a/sql/test/analytics/Tests/analytics09.stable.err
b/sql/test/analytics/Tests/analytics09.stable.err
--- a/sql/test/analytics/Tests/analytics09.stable.err
+++ b/sql/test/analytics/Tests/analytics09.stable.err
@@ -55,6 +55,14 @@ MAPI = (monetdb) /var/tmp/mtest-9405/.s
QUERY = select min(aa) over (partition by sum(aa)) from analytics; ---error
ERROR = !SELECT: cannot use non GROUP BY column 'aa' in query results without
an aggregate function
CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-9623/.s.monetdb.34265
+QUERY = select rank() over (order by sum(aa), bb) from analytics; --error
+ERROR = !SELECT: cannot use non GROUP BY column 'bb' in query results without
an aggregate function
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-9623/.s.monetdb.34265
+QUERY = select min(aa) over (order by sum(bb)) from analytics; --error
+ERROR = !SELECT: cannot use non GROUP BY column 'aa' in query results without
an aggregate function
+CODE = 42000
# 13:13:17 >
# 13:13:17 > "Done."
diff --git a/sql/test/analytics/Tests/analytics09.stable.out
b/sql/test/analytics/Tests/analytics09.stable.out
--- a/sql/test/analytics/Tests/analytics09.stable.out
+++ b/sql/test/analytics/Tests/analytics09.stable.out
@@ -283,6 +283,12 @@ Ready.
% int # type
% 1 # length
[ 1 ]
+#select rank() over (order by sum(aa), sum(bb)) from analytics;
+% sys.L7 # table_name
+% L7 # name
+% int # type
+% 1 # length
+[ 1 ]
#drop table analytics;
# 13:13:17 >
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
