Changeset: c160205d68b9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c160205d68b9
Added Files:
sql/test/mergetables/Tests/emptymergequery.stable.err
sql/test/mergetables/Tests/emptymergequery.stable.out
Modified Files:
sql/server/rel_select.c
Branch: default
Log Message:
add stable output
diffs (96 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
@@ -1756,7 +1756,7 @@ table_ref(mvc *sql, sql_rel *rel, symbol
return rel;
}
if ((isMergeTable(t) || isReplicaTable(t)) &&
list_empty(t->tables.set))
- return sql_error(sql, 02, "Unable to query empty Merge
or Replica tables");
+ return sql_error(sql, 02, "MERGE or REPLICA TABLE
should have at least one table associated");
return rel_basetable(sql, t, tname);
} else if (tableref->token == SQL_VALUES) {
diff --git a/sql/test/mergetables/Tests/emptymergequery.stable.err
b/sql/test/mergetables/Tests/emptymergequery.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/emptymergequery.stable.err
@@ -0,0 +1,40 @@
+stderr of test 'emptymergequery` in directory 'sql/test/mergetables` itself:
+
+
+# 18:40:24 >
+# 18:40:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39369" "--set"
"mapi_usock=/var/tmp/mtest-11671/.s.monetdb.39369" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_mergetables"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 18:40:24 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/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 = 39369
+# cmdline opt mapi_usock = /var/tmp/mtest-11671/.s.monetdb.39369
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_mergetables
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 18:40:24 >
+# 18:40:24 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-11671" "--port=39369"
+# 18:40:24 >
+
+MAPI = (monetdb) /var/tmp/mtest-11671/.s.monetdb.39369
+QUERY = select * from emptym;
+ERROR = !MERGE or REPLICA TABLE should have at least one table associated
+
+# 18:40:24 >
+# 18:40:24 > "Done."
+# 18:40:24 >
+
diff --git a/sql/test/mergetables/Tests/emptymergequery.stable.out
b/sql/test/mergetables/Tests/emptymergequery.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/emptymergequery.stable.out
@@ -0,0 +1,34 @@
+stdout of test 'emptymergequery` in directory 'sql/test/mergetables` itself:
+
+
+# 18:40:24 >
+# 18:40:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39369" "--set"
"mapi_usock=/var/tmp/mtest-11671/.s.monetdb.39369" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_mergetables"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 18:40:24 >
+
+# MonetDB 5 server v11.20.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_mergetables', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers 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:39369/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-11671/.s.monetdb.39369
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 18:40:24 >
+# 18:40:24 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-11671" "--port=39369"
+# 18:40:24 >
+
+#create merge table emptym(i integer, j integer);
+#drop table emptym;
+
+# 18:40:24 >
+# 18:40:24 > "Done."
+# 18:40:24 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
