Changeset: 7149fa7ef222 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7149fa7ef222
Modified Files:
sql/test/BugTracker/Tests/groupby_orderby_nonselected.SF-1723863.stable.err
sql/test/BugTracker/Tests/subquery_orderby.SF-1688915.stable.err
sql/test/BugTracker/Tests/subquery_orderby.SF-1688915.stable.out
Branch: default
Log Message:
Approve testcases now that ORDER BY/LIMIT in subqueries no longer results in an
error.
diffs (187 lines):
diff --git
a/sql/test/BugTracker/Tests/groupby_orderby_nonselected.SF-1723863.stable.err
b/sql/test/BugTracker/Tests/groupby_orderby_nonselected.SF-1723863.stable.err
---
a/sql/test/BugTracker/Tests/groupby_orderby_nonselected.SF-1723863.stable.err
+++
b/sql/test/BugTracker/Tests/groupby_orderby_nonselected.SF-1723863.stable.err
@@ -18,11 +18,8 @@ QUERY = select count(*)
group by col2
order by row_count desc, col1
) sq;
-ERROR = !syntax error, unexpected ORDER, expecting UNION or EXCEPT or
INTERSECT or ')' in: "select count(*)
- !from (
- !select col2, count(*) as row_count
- !from data_1to10
- !group "
+
+
# 23:24:26 >
# 23:24:26 > Done.
diff --git a/sql/test/BugTracker/Tests/subquery_orderby.SF-1688915.stable.err
b/sql/test/BugTracker/Tests/subquery_orderby.SF-1688915.stable.err
--- a/sql/test/BugTracker/Tests/subquery_orderby.SF-1688915.stable.err
+++ b/sql/test/BugTracker/Tests/subquery_orderby.SF-1688915.stable.err
@@ -1,23 +1,35 @@
stderr of test 'subquery_orderby.SF-1688915` in directory
'sql/test/BugTracker` itself:
-# 10:11:41 >
-# 10:11:41 > Mtimeout -timeout 180 Mserver
"--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/MonetDB.conf" --debug=10 --set
"monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB4:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB4/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB4/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB4/dbfarm"
--set "sql_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB4/sql_logs"
--set
"xquery_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB4/xquery_logs"
--set mapi_port=35778 --set xrpc_port=45704 --set monet_prompt= --trace
"--dbname=mTests_src_test_BugTracker" --dbinit=" module(sql_server);" ; echo ;
echo Over..
-# 10:11:41 >
+# 14:49:16 >
+# 14:49:16 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32077" "--set"
"mapi_usock=/var/tmp/mtest-71873/.s.monetdb.32077" "--set" "monet_prompt="
"--forcemito" "--dbpath=/Users/myth/opt/var/MonetDB/mTests_sql_test_BugTracker"
"--set" "embedded_py=true"
+# 14:49:16 >
+# builtin opt gdk_dbpath = /Users/myth/opt/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 = 32077
+# cmdline opt mapi_usock = /var/tmp/mtest-71873/.s.monetdb.32077
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/Users/myth/opt/var/MonetDB/mTests_sql_test_BugTracker
+# cmdline opt embedded_py = true
+# cmdline opt gdk_debug = 536870922
-# 10:11:41 >
-# 10:11:41 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=localhost --port=35778
-# 10:11:41 >
+# 14:49:17 >
+# 14:49:17 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-71873" "--port=32077"
+# 14:49:17 >
-MAPI = (monetdb) /var/tmp/mtest-9513/.s.monetdb.37125
-QUERY = select name from (select name, id from tables order by id) as x;
-ERROR = !syntax error, unexpected ORDER, expecting UNION or EXCEPT or
INTERSECT or ')' in: "select name from (select name, id from tables order"
+# 14:49:17 >
+# 14:49:17 > "Done."
+# 14:49:17 >
-
-
-# 10:11:41 >
-# 10:11:41 > Done.
-# 10:11:41 >
-
diff --git a/sql/test/BugTracker/Tests/subquery_orderby.SF-1688915.stable.out
b/sql/test/BugTracker/Tests/subquery_orderby.SF-1688915.stable.out
--- a/sql/test/BugTracker/Tests/subquery_orderby.SF-1688915.stable.out
+++ b/sql/test/BugTracker/Tests/subquery_orderby.SF-1688915.stable.out
@@ -14,17 +14,102 @@ stdout of test 'subquery_orderby.SF-1688
# MonetDB/SQL module v2.21.0 loaded
Ready.
-#function user.main():void;
-# clients.quit();
-#end main;
+# 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_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_temporal.sql
+# loading sql script: 18_index.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: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 27_rejects.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 39_analytics_hge.sql
+# loading sql script: 40_json.sql
+# loading sql script: 40_json_hge.sql
+# loading sql script: 41_md5sum.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_profiler.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 72_fits.sql
+# loading sql script: 74_netcdf.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 80_udf_hge.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 90_generator_hge.sql
+# loading sql script: 99_system.sql
+# 14:49:17 >
+# 14:49:17 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-71873" "--port=32077"
+# 14:49:17 >
-# 12:35:21 >
-# 12:35:21 > mclient -lsql -umonetdb -Pmonetdb --host=koala --port=31630
-# 12:35:21 >
+#select name from (select name, id from tables order by id) as x;
+% .x # table_name
+% name # name
+% varchar # type
+% 17 # length
+[ "schemas" ]
+[ "types" ]
+[ "functions" ]
+[ "args" ]
+[ "sequences" ]
+[ "dependencies" ]
+[ "connections" ]
+[ "_tables" ]
+[ "_columns" ]
+[ "keys" ]
+[ "idxs" ]
+[ "triggers" ]
+[ "objects" ]
+[ "_tables" ]
+[ "_columns" ]
+[ "keys" ]
+[ "idxs" ]
+[ "triggers" ]
+[ "objects" ]
+[ "tables" ]
+[ "columns" ]
+[ "db_user_info" ]
+[ "users" ]
+[ "user_role" ]
+[ "auths" ]
+[ "privileges" ]
+[ "querylog_catalog" ]
+[ "querylog_calls" ]
+[ "querylog_history" ]
+[ "tracelog" ]
+[ "sessions" ]
+[ "optimizers" ]
+[ "environment" ]
+[ "queue" ]
+[ "rejects" ]
+[ "keywords" ]
+[ "table_types" ]
+[ "dependency_types" ]
+[ "netcdf_files" ]
+[ "netcdf_dims" ]
+[ "netcdf_vars" ]
+[ "netcdf_vardim" ]
+[ "netcdf_attrs" ]
+[ "storage" ]
+[ "storagemodelinput" ]
+[ "storagemodel" ]
+[ "tablestoragemodel" ]
+[ "statistics" ]
+[ "systemfunctions" ]
+# 14:49:17 >
+# 14:49:17 > "Done."
+# 14:49:17 >
-# 12:35:21 >
-# 12:35:21 > Done.
-# 12:35:21 >
-
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
