Changeset: fd6b673f658a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fd6b673f658a
Added Files:
sql/test/BugTracker-2015/Tests/epoch_now.Bug-3740.sql
sql/test/BugTracker-2015/Tests/epoch_now.Bug-3740.stable.err
sql/test/BugTracker-2015/Tests/epoch_now.Bug-3740.stable.out
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/scripts/17_temporal.sql
sql/test/BugTracker-2015/Tests/All
Branch: Jul2015
Log Message:
fixed bug 3740, added missing epoch function on timestamp with time zone
diffs (127 lines):
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -1280,6 +1280,10 @@ sql_update_jul2015(Client c)
"create filter function sys.\"ilike\"(val string, pat
string, esc string) external name algebra.\"ilike\";\n"
"create filter function sys.\"ilike\"(val string, pat
string) external name algebra.\"ilike\";\n");
+ /* change to 17_temporal */
+ pos += snprintf(buf + pos, bufsize - pos,
+ "create function sys.\"epoch\"(ts TIMESTAMP WITH TIME
ZONE) returns INT external name timestamp.\"epoch\";\n");
+
/* new file 51_sys_schema_extension.sql */
pos += snprintf(buf + pos, bufsize - pos,
"CREATE TABLE sys.keywords (\n"
diff --git a/sql/scripts/17_temporal.sql b/sql/scripts/17_temporal.sql
--- a/sql/scripts/17_temporal.sql
+++ b/sql/scripts/17_temporal.sql
@@ -13,3 +13,6 @@ create function "epoch"(sec INT) returns
create function "epoch"(ts TIMESTAMP) returns INT
external name timestamp."epoch";
+
+create function "epoch"(ts TIMESTAMP WITH TIME ZONE) returns INT
+ external name timestamp."epoch";
diff --git a/sql/test/BugTracker-2015/Tests/All
b/sql/test/BugTracker-2015/Tests/All
--- a/sql/test/BugTracker-2015/Tests/All
+++ b/sql/test/BugTracker-2015/Tests/All
@@ -39,3 +39,4 @@ div_zero.Bug-3742
cast_to_num.Bug-3744
null_is_null.Bug-3739
mergejoin_NULL.Bug-3747
+epoch_now.Bug-3740
diff --git a/sql/test/BugTracker-2015/Tests/epoch_now.Bug-3740.sql
b/sql/test/BugTracker-2015/Tests/epoch_now.Bug-3740.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/epoch_now.Bug-3740.sql
@@ -0,0 +1,1 @@
+select epoch(now()) - epoch(now());
diff --git a/sql/test/BugTracker-2015/Tests/epoch_now.Bug-3740.stable.err
b/sql/test/BugTracker-2015/Tests/epoch_now.Bug-3740.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/epoch_now.Bug-3740.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'epoch_now.Bug-3740` in directory 'sql/test/BugTracker-2015`
itself:
+
+
+# 13:34:16 >
+# 13:34:16 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36853" "--set"
"mapi_usock=/var/tmp/mtest-8436/.s.monetdb.36853" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 13:34:16 >
+
+# 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 = 36853
+# cmdline opt mapi_usock = /var/tmp/mtest-8436/.s.monetdb.36853
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 13:34:16 >
+# 13:34:16 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-8436" "--port=36853"
+# 13:34:16 >
+
+
+# 13:34:16 >
+# 13:34:16 > "Done."
+# 13:34:16 >
+
diff --git a/sql/test/BugTracker-2015/Tests/epoch_now.Bug-3740.stable.out
b/sql/test/BugTracker-2015/Tests/epoch_now.Bug-3740.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/epoch_now.Bug-3740.stable.out
@@ -0,0 +1,42 @@
+stdout of test 'epoch_now.Bug-3740` in directory 'sql/test/BugTracker-2015`
itself:
+
+
+# 13:34:16 >
+# 13:34:16 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36853" "--set"
"mapi_usock=/var/tmp/mtest-8436/.s.monetdb.36853" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 13:34:16 >
+
+# MonetDB 5 server v11.21.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2015', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 7.333 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:36853/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-8436/.s.monetdb.36853
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.30'
+# Finished reading the write-ahead log 'sql_logs/sql/log.30'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 13:34:16 >
+# 13:34:16 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-8436" "--port=36853"
+# 13:34:16 >
+
+#select epoch(now()) - epoch(now());
+% .L # table_name
+% current_timestamp # name
+% bigint # type
+% 1 # length
+[ 0 ]
+
+# 13:34:16 >
+# 13:34:16 > "Done."
+# 13:34:16 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
