Changeset: 8e2e4bcad4bb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8e2e4bcad4bb
Added Files:
sql/test/BugTracker-2014/Tests/non_groupby_column.Bug-3524.sql
sql/test/BugTracker-2014/Tests/non_groupby_column.Bug-3524.stable.err
sql/test/BugTracker-2014/Tests/non_groupby_column.Bug-3524.stable.out
Modified Files:
sql/server/rel_select.c
sql/test/BugTracker-2013/Tests/cannot_use_columns_after_groupby.Bug-3340.stable.err
sql/test/BugTracker-2014/Tests/All
Branch: Jan2014
Log Message:
fixed bug 3524, ie improved error message for using non group by columns in
group by result
diffs (147 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
@@ -1771,8 +1771,12 @@ rel_column_ref(mvc *sql, sql_rel **rel,
}
if (!exp && var)
return rel_var_ref(sql, name, 0);
- if (!exp && !var)
- return sql_error(sql, 02, "SELECT: identifier '%s'
unknown", name);
+ if (!exp && !var) {
+ if (rel && *rel && (*rel)->card == CARD_AGGR && f ==
sql_sel)
+ return sql_error(sql, 02, "SELECT: cannot use
non GROUP BY column '%s' in query results without an aggregate function", name);
+ else
+ return sql_error(sql, 02, "SELECT: identifier
'%s' unknown", name);
+ }
} else if (dlist_length(l) == 2) {
char *tname = l->h->data.sval;
@@ -1795,8 +1799,12 @@ rel_column_ref(mvc *sql, sql_rel **rel,
exp = rel_bind_column(sql, *rel, cname, f);
}
}
- if (!exp)
- return sql_error(sql, 02, "42S22!SELECT: no such column
'%s.%s'", tname, cname);
+ if (!exp) {
+ if (rel && *rel && (*rel)->card == CARD_AGGR && f ==
sql_sel)
+ return sql_error(sql, 02, "SELECT: cannot use
non GROUP BY column '%s.%s' in query results without an aggregate function",
tname, cname);
+ else
+ return sql_error(sql, 02, "42S22!SELECT: no
such column '%s.%s'", tname, cname);
+ }
} else if (dlist_length(l) >= 3) {
return sql_error(sql, 02, "TODO: column names of level >= 3");
}
diff --git
a/sql/test/BugTracker-2013/Tests/cannot_use_columns_after_groupby.Bug-3340.stable.err
b/sql/test/BugTracker-2013/Tests/cannot_use_columns_after_groupby.Bug-3340.stable.err
---
a/sql/test/BugTracker-2013/Tests/cannot_use_columns_after_groupby.Bug-3340.stable.err
+++
b/sql/test/BugTracker-2013/Tests/cannot_use_columns_after_groupby.Bug-3340.stable.err
@@ -28,9 +28,9 @@ stderr of test 'cannot_use_columns_after
# 20:54:49 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-27846" "--port=35773"
# 20:54:49 >
-MAPI = (monetdb) /var/tmp/mtest-27846/.s.monetdb.35773
+MAPI = (monetdb) /var/tmp/mtest-5110/.s.monetdb.34599
QUERY = select "function", (sum(fv.claim_tb) - sum(fv.used_tb)) * 100 /
toc.total_overcapacity from sys.filer_volumes as fv, (select sum(claim_tb) -
sum(used_tb) as total_overcapacity from sys.filer_volumes) as toc group by
fv."function" order by fv."function";
-ERROR = !SELECT: no such column 'toc.total_overcapacity'
+ERROR = !SELECT: cannot use non GROUP BY column 'toc.total_overcapacity' in
query results without an aggregate function
# 20:54:49 >
# 20:54:49 > "Done."
diff --git a/sql/test/BugTracker-2014/Tests/All
b/sql/test/BugTracker-2014/Tests/All
--- a/sql/test/BugTracker-2014/Tests/All
+++ b/sql/test/BugTracker-2014/Tests/All
@@ -23,3 +23,4 @@ stringfloatshtcompare.Bug-3512
oid-table-assert.Bug-3514
round-properties.Bug-3515
union_with_subqueries.Bug-3518
+non_groupby_column.Bug-3524
diff --git a/sql/test/BugTracker-2014/Tests/non_groupby_column.Bug-3524.sql
b/sql/test/BugTracker-2014/Tests/non_groupby_column.Bug-3524.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/non_groupby_column.Bug-3524.sql
@@ -0,0 +1,4 @@
+start transaction;
+
+create table agg_error (a bool, b bool);
+select max(a), b from agg_error group by a;
diff --git
a/sql/test/BugTracker-2014/Tests/non_groupby_column.Bug-3524.stable.err
b/sql/test/BugTracker-2014/Tests/non_groupby_column.Bug-3524.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/non_groupby_column.Bug-3524.stable.err
@@ -0,0 +1,38 @@
+stderr of test 'non_groupby_column.Bug-3524` in directory
'sql/test/BugTracker-2014` itself:
+
+
+# 11:15:00 >
+# 11:15:00 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32287" "--set"
"mapi_usock=/var/tmp/mtest-4352/.s.monetdb.32287" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0"
+# 11:15:00 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 32287
+# cmdline opt mapi_usock = /var/tmp/mtest-4352/.s.monetdb.32287
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014
+# cmdline opt mal_listing = 0
+
+# 11:15:00 >
+# 11:15:00 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-4352" "--port=32287"
+# 11:15:00 >
+
+MAPI = (monetdb) /var/tmp/mtest-4352/.s.monetdb.32287
+QUERY = select max(a), b from agg_error group by a;
+ERROR = !SELECT: cannot use non GROUP BY column 'b' in query results without
an aggregate function
+
+# 11:15:00 >
+# 11:15:00 > "Done."
+# 11:15:00 >
+
diff --git
a/sql/test/BugTracker-2014/Tests/non_groupby_column.Bug-3524.stable.out
b/sql/test/BugTracker-2014/Tests/non_groupby_column.Bug-3524.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/non_groupby_column.Bug-3524.stable.out
@@ -0,0 +1,34 @@
+stdout of test 'non_groupby_column.Bug-3524` in directory
'sql/test/BugTracker-2014` itself:
+
+
+# 11:15:00 >
+# 11:15:00 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32287" "--set"
"mapi_usock=/var/tmp/mtest-4352/.s.monetdb.32287" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0"
+# 11:15:00 >
+
+# MonetDB 5 server v11.17.22
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2014', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 7.334 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:32287/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-4352/.s.monetdb.32287
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 11:15:00 >
+# 11:15:00 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-4352" "--port=32287"
+# 11:15:00 >
+
+#start transaction;
+#create table agg_error (a bool, b bool);
+
+# 11:15:00 >
+# 11:15:00 > "Done."
+# 11:15:00 >
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
