Changeset: 7d459ebe5c26 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7d459ebe5c26
Added Files:
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct-coalesce.Bug-6431.stable.err
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct-coalesce.Bug-6431.stable.out
Modified Files:
sql/server/rel_select.c
sql/test/BugTracker-2008/Tests/count_with_order_by_and_limit_crashes.SF-2229936.stable.err
sql/test/LSST/Tests/dbQuery036.stable.err
sql/test/Tests/marcin3.stable.err
Branch: Jul2017
Log Message:
fixed bug 6431
diffs (180 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
@@ -1025,7 +1025,7 @@ 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) {
+ if (rel && *rel && (*rel)->card <= CARD_AGGR && f ==
sql_sel) {
sql_rel *gb = *rel;
while(gb->l && !is_groupby(gb->op))
@@ -1033,6 +1033,8 @@ rel_column_ref(mvc *sql, sql_rel **rel,
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);
}
+ if (f == sql_having)
+ 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);
}
@@ -1053,11 +1055,7 @@ rel_column_ref(mvc *sql, sql_rel **rel,
*rel = rel_crossproduct(sql->sa, *rel,
v, op_join);
else
*rel = v;
- /*
- exp = rel_bind_column(sql, *rel, cname, f);
- if (!exp)
- */
- exp = rel_bind_column2(sql, *rel,
tname, cname, f);
+ exp = rel_bind_column2(sql, *rel, tname, cname,
f);
}
}
if (!exp) {
@@ -1069,6 +1067,8 @@ rel_column_ref(mvc *sql, sql_rel **rel,
if (gb && is_groupby(gb->op) && 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);
}
+ if (f == sql_having)
+ 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) {
@@ -4858,8 +4858,9 @@ rel_select_exp(mvc *sql, sql_rel *rel, S
if (sn->having) {
/* having implies group by, ie if not supplied do a group by */
if (rel->op != op_groupby)
- rel = rel_groupby(sql, rel, NULL);
+ rel = rel_groupby(sql, rel, NULL);
aggr = 1;
+ if (rel) set_processed(rel);
}
n = sn->selection->h;
diff --git
a/sql/test/BugTracker-2008/Tests/count_with_order_by_and_limit_crashes.SF-2229936.stable.err
b/sql/test/BugTracker-2008/Tests/count_with_order_by_and_limit_crashes.SF-2229936.stable.err
---
a/sql/test/BugTracker-2008/Tests/count_with_order_by_and_limit_crashes.SF-2229936.stable.err
+++
b/sql/test/BugTracker-2008/Tests/count_with_order_by_and_limit_crashes.SF-2229936.stable.err
@@ -84,7 +84,7 @@ stderr of test 'count_with_order_by_and_
MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
QUERY = select count(subtotal) from bigramlex order by subtotal;
-ERROR = !SELECT: identifier 'subtotal' unknown
+ERROR = !SELECT: cannot use non GROUP BY column 'subtotal' in query results
without an aggregate function
# 18:44:11 >
# 18:44:11 > Done.
diff --git
a/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct-coalesce.Bug-6431.stable.err
b/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct-coalesce.Bug-6431.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct-coalesce.Bug-6431.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'sqlitelogictest-aggregation-distinct-coalesce.Bug-6431` in
directory 'sql/test/BugTracker-2017` itself:
+
+
+# 12:05:34 >
+# 12:05:34 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35713" "--set"
"mapi_usock=/var/tmp/mtest-26937/.s.monetdb.35713" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 12:05:34 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/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 = 35713
+# cmdline opt mapi_usock = /var/tmp/mtest-26937/.s.monetdb.35713
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017
+# cmdline opt gdk_debug = 536870922
+
+# 12:05:34 >
+# 12:05:34 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26937" "--port=35713"
+# 12:05:34 >
+
+MAPI = (monetdb) /var/tmp/mtest-26937/.s.monetdb.35713
+QUERY = SELECT DISTINCT + ( - col2 ) AS col0 FROM tab2 AS cor0 WHERE NOT ( - 1
* col2 ) <> ( 37 ) GROUP BY col2 HAVING ( col2 ) IN ( COALESCE ( + ( + COALESCE
( - 64, COUNT ( * ) + ( col0 ) * 12 ) ), + COUNT ( * ), COUNT ( * ) / 97 ) );
+ERROR = !SELECT: no such aggregate 'sql_add'
+
+# 12:05:34 >
+# 12:05:34 > "Done."
+# 12:05:34 >
+
diff --git
a/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct-coalesce.Bug-6431.stable.out
b/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct-coalesce.Bug-6431.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct-coalesce.Bug-6431.stable.out
@@ -0,0 +1,33 @@
+stdout of test 'sqlitelogictest-aggregation-distinct-coalesce.Bug-6431` in
directory 'sql/test/BugTracker-2017` itself:
+
+
+# 12:05:34 >
+# 12:05:34 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35713" "--set"
"mapi_usock=/var/tmp/mtest-26937/.s.monetdb.35713" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 12:05:34 >
+
+# MonetDB 5 server v11.27.6
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2017', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 7.330 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:35713/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-26937/.s.monetdb.35713
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 12:05:34 >
+# 12:05:34 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26937" "--port=35713"
+# 12:05:34 >
+
+#CREATE TABLE tab2(col0 INTEGER, col1 INTEGER, col2 INTEGER);
+#DROP TABLE tab2;
+
+# 12:05:34 >
+# 12:05:34 > "Done."
+# 12:05:34 >
+
diff --git a/sql/test/LSST/Tests/dbQuery036.stable.err
b/sql/test/LSST/Tests/dbQuery036.stable.err
--- a/sql/test/LSST/Tests/dbQuery036.stable.err
+++ b/sql/test/LSST/Tests/dbQuery036.stable.err
@@ -85,7 +85,7 @@ QUERY = SELECT ROUND(uMag-gMag,0) AS UG
AND (uMag+gMag+rMag+iMag+zMag+yMag) < 150 -- exclude bogus
magnitudes (== 999)
GROUP BY UG, GR, RI, IZ, ZY
HAVING pop > 500 -- Common bucktes have 500 or more members, so
delete them
-ERROR = !SELECT: identifier 'pop' unknown
+ERROR = !SELECT: cannot use non GROUP BY column 'pop' in query results without
an aggregate function
# 05:57:35 >
# 05:57:35 > Done.
diff --git a/sql/test/Tests/marcin3.stable.err
b/sql/test/Tests/marcin3.stable.err
--- a/sql/test/Tests/marcin3.stable.err
+++ b/sql/test/Tests/marcin3.stable.err
@@ -13,13 +13,13 @@ stderr of test 'marcin3` in directory 's
MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
QUERY = select id, sum(val) AS valsum from nutki group by id having val>1;
-ERROR = !SELECT: identifier 'val' unknown
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
+ERROR = !SELECT: cannot use non GROUP BY column 'val' in query results without
an aggregate function
+MAPI = (monetdb) /var/tmp/mtest-26937/.s.monetdb.35713
QUERY = select id, sum(val) AS valsum from nutki group by id having val>2;
-ERROR = !SELECT: identifier 'val' unknown
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
+ERROR = !SELECT: cannot use non GROUP BY column 'val' in query results without
an aggregate function
+MAPI = (monetdb) /var/tmp/mtest-26937/.s.monetdb.35713
QUERY = select id, sum(val) AS valsum from nutki group by id having valsum>3;
-ERROR = !SELECT: identifier 'valsum' unknown
+ERROR = !SELECT: cannot use non GROUP BY column 'valsum' in query results
without an aggregate function
# 21:15:41 >
# 21:15:41 > Done.
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
