Changeset: deb7f9d5a267 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=deb7f9d5a267
Modified Files:
sql/common/sql_types.c
sql/test/BugTracker-2012/Tests/All
sql/test/BugTracker-2012/Tests/interval_timestamp.Bug-3002.sql
sql/test/BugTracker-2012/Tests/interval_timestamp.Bug-3002.stable.err
sql/test/BugTracker-2012/Tests/interval_timestamp.Bug-3002.stable.out
Branch: Dec2011
Log Message:
disallow convertions from interval(s) to timestamp
diffs (110 lines):
diff --git a/sql/common/sql_types.c b/sql/common/sql_types.c
--- a/sql/common/sql_types.c
+++ b/sql/common/sql_types.c
@@ -98,7 +98,7 @@ static int convert_matrix[EC_MAX][EC_MAX
/* EC_STRING */ { 2, 2, 2, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2 },
/* EC_BLOB */ { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
/* EC_NUM */ { 0, 0, 2, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0 },
-/* EC_INTERVAL*/{ 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0 },
+/* EC_INTERVAL*/{ 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0 },
/* EC_DEC */ { 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0 },
/* EC_FLT */ { 0, 0, 0, 1, 1, 0, 1, 3, 1, 1, 0, 0, 0, 0 },
/* EC_TIME */ { 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0 },
diff --git a/sql/test/BugTracker-2012/Tests/All
b/sql/test/BugTracker-2012/Tests/All
--- a/sql/test/BugTracker-2012/Tests/All
+++ b/sql/test/BugTracker-2012/Tests/All
@@ -17,3 +17,4 @@ boolean_coersion.Bug-3012
correlated_groupby_in_selection.Bug-3011
multicolumn_join.Bug-2998
simple_select.Bug-2988
+interval_timestamp.Bug-3002
diff --git a/sql/test/BugTracker-2012/Tests/interval_timestamp.Bug-3002.sql
b/sql/test/BugTracker-2012/Tests/interval_timestamp.Bug-3002.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/interval_timestamp.Bug-3002.sql
@@ -0,0 +1,2 @@
+select '1970-01-01 11:00' - interval '600' second;
+select cast('1970-01-01 11:00' as timestamp) = '1970-01-01 11:00' - interval
'600' second;
diff --git
a/sql/test/BugTracker-2012/Tests/interval_timestamp.Bug-3002.stable.err
b/sql/test/BugTracker-2012/Tests/interval_timestamp.Bug-3002.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/interval_timestamp.Bug-3002.stable.err
@@ -0,0 +1,43 @@
+stderr of test 'interval_timestamp.Bug-3002` in directory
'test/BugTracker-2012` itself:
+
+
+# 15:55:40 >
+# 15:55:40 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=36462" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 15:55:40 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm =
/home/niels/scratch/rc-clean/Linux-x86_64/var/monetdb5/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# 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 gdk_dbfarm =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 36462
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2012
+# cmdline opt mal_listing = 0
+
+# 15:55:40 >
+# 15:55:40 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=36462"
+# 15:55:40 >
+
+MAPI = monetdb@niels:36462
+QUERY = select '1970-01-01 11:00' - interval '600' second;
+ERROR = !wrong format (1970-01-01 11:00)
+MAPI = monetdb@niels:36462
+QUERY = select cast('1970-01-01 11:00' as timestamp) = '1970-01-01 11:00' -
interval '600' second;
+ERROR = !types sec_interval(19,0) and timestamp(7,0) are not equal
+
+# 15:55:41 >
+# 15:55:41 > "Done."
+# 15:55:41 >
+
diff --git
a/sql/test/BugTracker-2012/Tests/interval_timestamp.Bug-3002.stable.out
b/sql/test/BugTracker-2012/Tests/interval_timestamp.Bug-3002.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/interval_timestamp.Bug-3002.stable.out
@@ -0,0 +1,30 @@
+stdout of test 'interval_timestamp.Bug-3002` in directory
'test/BugTracker-2012` itself:
+
+
+# 15:55:40 >
+# 15:55:40 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=36462" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 15:55:40 >
+
+# MonetDB 5 server v11.7.8
+# This is an unreleased version
+# Serving database 'mTests_test_BugTracker-2012', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 3.779 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2012 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://niels.nesco.mine.nu:36462/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 15:55:40 >
+# 15:55:40 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=36462"
+# 15:55:40 >
+
+
+# 15:55:41 >
+# 15:55:41 > "Done."
+# 15:55:41 >
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
