Changeset: 796b82e6111d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=796b82e6111d
Added Files:
sql/test/BugTracker-2017/Tests/incorrect_error.Bug-6141.sql
sql/test/BugTracker-2017/Tests/incorrect_error.Bug-6141.stable.err
sql/test/BugTracker-2017/Tests/incorrect_error.Bug-6141.stable.out
Modified Files:
sql/server/rel_select.c
sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.stable.err
sql/test/BugTracker-2017/Tests/All
Branch: Dec2016
Log Message:
fixes for bug 6141 (ie improved error messages)
diffs (161 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
@@ -996,10 +996,15 @@ rel_column_ref(mvc *sql, sql_rel **rel,
return rel_var_ref(sql, name, 0);
}
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);
+ if (rel && *rel && (*rel)->card == CARD_AGGR && f ==
sql_sel) {
+ sql_rel *gb = *rel;
+
+ while(gb->l && !is_groupby(gb->op))
+ gb = gb->l;
+ if (gb && gb->l && rel_bind_column(sql, gb->l,
name, f))
+ return sql_error(sql, 02, "SELECT:
cannot use non GROUP BY column '%s' in query results without an aggregate
function", name);
+ }
+ return sql_error(sql, 02, "SELECT: identifier '%s'
unknown", name);
}
} else if (dlist_length(l) == 2) {
@@ -1023,10 +1028,15 @@ rel_column_ref(mvc *sql, sql_rel **rel,
}
}
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);
+ if (rel && *rel && (*rel)->card == CARD_AGGR && f ==
sql_sel) {
+ sql_rel *gb = *rel;
+
+ while(gb->l && !is_groupby(gb->op))
+ gb = gb->l;
+ if (gb && gb->l && rel_bind_column2(sql, gb->l,
tname, cname, f))
+ return sql_error(sql, 02, "SELECT:
cannot use non GROUP BY column '%s.%s' in query results without an aggregate
function", tname, cname);
+ }
+ 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-2014/Tests/too_general_errmsg.Bug-3605.stable.err
b/sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.stable.err
--- a/sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.stable.err
+++ b/sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.stable.err
@@ -32,7 +32,7 @@ stderr of test 'too_general_errmsg.Bug-3
MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
QUERY = select operatingday, coalesce(gepubliceerd, 0) as gepubliceerd,
coalesce(gereden, 0) as gereden, coalesce(geannuleerd, 0) as geannuleerd,
coalesce(onbekend, 0) as onbekend, coalesce(extra, 0) as extra,
coalesce(tochgezien, 0) as tochgezien from (select operatingday,
count(trip_hash) as gepubliceerd from tt where pointorder = 1 group by
operatingday) as a full outer join (select z.operatingday, count(*) as
geannuleerd from (select trip_hash, operatingday from kv17_canceled except
select trip_hash, operatingday from kv6 where kv6.messagetype = 'ARRIVAL') as u
group by u.operatingday) as e using (operatingday) full outer join (select
o.operatingday, count(trip_hash) as onbekend from (select distinct trip_hash,
operatingday from tt) as o join (select distinct trip_hash from tt where
(epoch(cast(tt.operatingday as timestamp with time zone)) +
cast(split_part(tt.targetarrivaltime, ':', 1) as int) * 3600 +
(cast(split_part(tt.targetarrivaltime, ':', 2) as int) + 10) * 60) < epoch(n
ow()) except (select trip_hash from kv6 where messagetype = 'ARRIVAL' union
all select trip_hash from kv17_canceled)) as p using (trip_hash) group by
operatingday) as f using (operatingday) order by operatingday;
-ERROR = !SELECT: cannot use non GROUP BY column 'z.operatingday' in query
results without an aggregate function
+ERROR = !SELECT: no such column 'z.operatingday'
diff --git a/sql/test/BugTracker-2017/Tests/All
b/sql/test/BugTracker-2017/Tests/All
--- a/sql/test/BugTracker-2017/Tests/All
+++ b/sql/test/BugTracker-2017/Tests/All
@@ -2,6 +2,7 @@ shutdown.Bug-6182
avggroupbysq.Bug-6178
semijoinunion.Bug-6150
HAVE_LIBZ?heapextend.Bug-6134
+incorrect_error.Bug-6141
empty-interval.Bug-6184
drop_not_null_on_pkey.Bug-6189
too-large-decimals.Bug-6192
diff --git a/sql/test/BugTracker-2017/Tests/incorrect_error.Bug-6141.sql
b/sql/test/BugTracker-2017/Tests/incorrect_error.Bug-6141.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/incorrect_error.Bug-6141.sql
@@ -0,0 +1,5 @@
+create table t1 ( c1 int, c2 int );
+select count(c1) as c2 from (select count(*) as c1, c2 from t1 group by c2) as
t2 group by c2;
+
+select count(c1_) as c2 from (select count(*) as c1, c2 from t1 group by c2)
as t2 group by c2;
+drop table t1;
diff --git a/sql/test/BugTracker-2017/Tests/incorrect_error.Bug-6141.stable.err
b/sql/test/BugTracker-2017/Tests/incorrect_error.Bug-6141.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/incorrect_error.Bug-6141.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'incorrect_error.Bug-6141` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 14:15:17 >
+# 14:15:17 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31566" "--set"
"mapi_usock=/var/tmp/mtest-7159/.s.monetdb.31566" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 14:15:17 >
+
+# 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 = 31566
+# cmdline opt mapi_usock = /var/tmp/mtest-7159/.s.monetdb.31566
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017
+# cmdline opt gdk_debug = 536870922
+
+# 14:15:19 >
+# 14:15:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-7159" "--port=31566"
+# 14:15:19 >
+
+MAPI = (monetdb) /var/tmp/mtest-7159/.s.monetdb.31566
+QUERY = select count(c1_) as c2 from (select count(*) as c1, c2 from t1 group
by c2) as t2 group by c2;
+ERROR = !SELECT: identifier 'c1_' unknown
+
+# 14:15:19 >
+# 14:15:19 > "Done."
+# 14:15:19 >
+
diff --git a/sql/test/BugTracker-2017/Tests/incorrect_error.Bug-6141.stable.out
b/sql/test/BugTracker-2017/Tests/incorrect_error.Bug-6141.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/incorrect_error.Bug-6141.stable.out
@@ -0,0 +1,38 @@
+stdout of test 'incorrect_error.Bug-6141` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 14:15:17 >
+# 14:15:17 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31566" "--set"
"mapi_usock=/var/tmp/mtest-7159/.s.monetdb.31566" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 14:15:17 >
+
+# MonetDB 5 server v11.25.6
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2017', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 15.615 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://mosquitto:31566/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-7159/.s.monetdb.31566
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 14:15:19 >
+# 14:15:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-7159" "--port=31566"
+# 14:15:19 >
+
+#create table t1 ( c1 int, c2 int );
+#select count(c1) as c2 from (select count(*) as c1, c2 from t1 group by c2)
as t2 group by c2;
+% sys.L7 # table_name
+% c2 # name
+% bigint # type
+% 1 # length
+#drop table t1;
+
+# 14:15:19 >
+# 14:15:19 > "Done."
+# 14:15:19 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
