Changeset: 3c962f8ccda7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3c962f8ccda7
Added Files:
sql/test/BugTracker-2014/Tests/nested_common_table_exp.Bug-3417.sql
sql/test/BugTracker-2014/Tests/nested_common_table_exp.Bug-3417.stable.err
sql/test/BugTracker-2014/Tests/nested_common_table_exp.Bug-3417.stable.out
Modified Files:
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_schema.c
Branch: Jan2014
Log Message:
Merge with Feb2013 branch.
diffs (175 lines):
diff --git a/sql/server/rel_exp.c b/sql/server/rel_exp.c
--- a/sql/server/rel_exp.c
+++ b/sql/server/rel_exp.c
@@ -1300,6 +1300,19 @@ exps_fix_card( list *exps, int card)
}
}
+void
+exps_setcard( list *exps, int card)
+{
+ node *n;
+
+ for (n = exps->h; n; n = n->next) {
+ sql_exp *e = n->data;
+
+ if (e->card != CARD_ATOM)
+ e->card = card;
+ }
+}
+
int
exps_intern(list *exps)
{
diff --git a/sql/server/rel_exp.h b/sql/server/rel_exp.h
--- a/sql/server/rel_exp.h
+++ b/sql/server/rel_exp.h
@@ -123,6 +123,7 @@ extern sql_exp *exps_bind_alias( list *e
extern int exps_card( list *l );
extern void exps_fix_card( list *exps, int card);
+extern void exps_setcard( list *exps, int card);
extern int exps_intern(list *exps);
extern char *compare_func( comp_type t );
diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -930,6 +930,10 @@ rel_create_view(mvc *sql, sql_schema *ss
t = mvc_bind_table(sql, s, name);
if (!persistent && column_spec)
sq = view_rename_columns( sql, name, sq, column_spec);
+ if (sq->op == op_project && sq->l && sq->exps && sq->card ==
CARD_AGGR) {
+ exps_setcard(sq->exps, CARD_MULTI);
+ sq->card = CARD_MULTI;
+ }
return sq;
}
return NULL;
diff --git
a/sql/test/BugTracker-2014/Tests/nested_common_table_exp.Bug-3417.sql
b/sql/test/BugTracker-2014/Tests/nested_common_table_exp.Bug-3417.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/nested_common_table_exp.Bug-3417.sql
@@ -0,0 +1,10 @@
+CREATE TABLE wtf(a int, b int, c int);
+
+INSERT INTO wtf VALUES(1, 2, 3);
+INSERT INTO wtf VALUES(4, 5, 6);
+
+ WITH a AS (SELECT a, b FROM wtf WHERE a IN (1, 4)),
+ b AS (SELECT a, b, count(*) AS d FROM a GROUP BY a, b),
+ c AS (SELECT a, count(*) AS e FROM b GROUP BY b)
+SELECT * FROM c;
+drop table wtf;
diff --git
a/sql/test/BugTracker-2014/Tests/nested_common_table_exp.Bug-3417.stable.err
b/sql/test/BugTracker-2014/Tests/nested_common_table_exp.Bug-3417.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/nested_common_table_exp.Bug-3417.stable.err
@@ -0,0 +1,41 @@
+stderr of test 'nested_common_table_exp.Bug-3417` in directory
'sql/test/BugTracker-2014` itself:
+
+
+# 16:59:35 >
+# 16:59:35 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38407" "--set"
"mapi_usock=/var/tmp/mtest-696/.s.monetdb.38407" "--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"
+# 16:59:35 >
+
+# 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 = yes
+# 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 = 38407
+# cmdline opt mapi_usock = /var/tmp/mtest-696/.s.monetdb.38407
+# 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
+
+# 16:59:35 >
+# 16:59:35 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-696" "--port=38407"
+# 16:59:35 >
+
+MAPI = (monetdb) /var/tmp/mtest-696/.s.monetdb.38407
+QUERY = WITH a AS (SELECT a, b FROM wtf WHERE a IN (1, 4)),
+ b AS (SELECT a, b, count(*) AS d FROM a GROUP BY a, b),
+ c AS (SELECT a, count(*) AS e FROM b GROUP BY b)
+ SELECT * FROM c;
+ERROR = !SELECT: cannot use non GROUP BY column 'a' in query results without
an aggregate function
+
+# 16:59:36 >
+# 16:59:36 > "Done."
+# 16:59:36 >
+
diff --git
a/sql/test/BugTracker-2014/Tests/nested_common_table_exp.Bug-3417.stable.out
b/sql/test/BugTracker-2014/Tests/nested_common_table_exp.Bug-3417.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/nested_common_table_exp.Bug-3417.stable.out
@@ -0,0 +1,61 @@
+stdout of test 'nested_common_table_exp.Bug-3417` in directory
'sql/test/BugTracker-2014` itself:
+
+
+# 16:59:35 >
+# 16:59:35 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38407" "--set"
"mapi_usock=/var/tmp/mtest-696/.s.monetdb.38407" "--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"
+# 16:59:35 >
+
+# MonetDB 5 server v11.15.20
+# 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 3.777 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.localdomain:38407/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-696/.s.monetdb.38407
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_history.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_compress.sql
+# loading sql script: 18_dictionary.sql
+# loading sql script: 19_cluster.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 99_system.sql
+
+# 16:59:35 >
+# 16:59:35 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-696" "--port=38407"
+# 16:59:35 >
+
+#CREATE TABLE wtf(a int, b int, c int);
+#INSERT INTO wtf VALUES(1, 2, 3);
+[ 1 ]
+#INSERT INTO wtf VALUES(4, 5, 6);
+[ 1 ]
+#drop table wtf;
+
+# 16:59:36 >
+# 16:59:36 > "Done."
+# 16:59:36 >
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
