Changeset: b527ef2f3bf7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b527ef2f3bf7
Added Files:
sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.py
Removed Files:
sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.sql
sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.err.Windows
sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.out.Darwin
sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.out.Windows
sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.test
Modified Files:
sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.err
sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.out
sql/test/BugTracker-2015/Tests/mserver-creates-but-not-accept-column-types-decimal19-decimal39.Bug-3863.sql
sql/test/BugTracker-2015/Tests/mserver-creates-but-not-accept-column-types-decimal19-decimal39.Bug-3863.test
Branch: mtest
Log Message:
Merged more outputs
diffs (260 lines):
diff --git
a/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.sql
b/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.py
rename from sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.sql
rename to sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.py
--- a/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.sql
+++ b/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.py
@@ -1,1 +1,28 @@
-SELECT timestamp_to_str(current_timestamp, '%Q');
+import sys, os, platform, pymonetdb
+
+db = os.getenv("TSTDB")
+port = int(os.getenv("MAPIPORT"))
+
+conn1 = pymonetdb.connect(database=db, port=port, autocommit=True,
username='monetdb', password='monetdb')
+cur1 = conn1.cursor()
+running_OS = platform.system()
+
+try:
+ cur1.execute("SELECT timestamp_to_str(current_timestamp, '%Q');")
+ if running_OS == 'Windows':
+ sys.stderr.write("Exception expected")
+ elif running_OS == 'Darwin':
+ if cur1.fetchall() != [('Q',)]:
+ sys.stderr.write("Expected [('Q',)]")
+ else:
+ if cur1.fetchall() != [('%Q',)]:
+ sys.stderr.write("Expected [('%Q',)]")
+except pymonetdb.DatabaseError as e:
+ if running_OS == 'Windows':
+ if "cannot convert timestamp" not in str(e):
+ sys.stderr.write('Wrong error %s, expected cannot convert
timestamp' % (str(e)))
+ else:
+ raise e
+
+cur1.close()
+conn1.close()
diff --git
a/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.err
b/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.err
--- a/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.err
+++ b/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.err
@@ -5,30 +5,6 @@ stderr of test 'crash_timestamp_convert.
# 19:04:38 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33045" "--set"
"mapi_usock=/var/tmp/mtest-17747/.s.monetdb.33045" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/scratch/niels/build/rc/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
# 19:04:38 >
-# builtin opt gdk_dbpath =
/scratch/niels/build/rc/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 = 33045
-# cmdline opt mapi_usock = /var/tmp/mtest-17747/.s.monetdb.33045
-# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbpath =
/scratch/niels/build/rc/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
-
-# 19:04:38 >
-# 19:04:38 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17747" "--port=33045"
-# 19:04:38 >
# 19:04:38 >
diff --git
a/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.err.Windows
b/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.err.Windows
deleted file mode 100644
---
a/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.err.Windows
+++ /dev/null
@@ -1,20 +0,0 @@
-stderr of test 'crash_timestamp_convert.Bug-3816` in directory
'sql/test/BugTracker-2015` itself:
-
-
-# 19:04:38 >
-# 19:04:38 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39900" "--set" "monet_prompt="
"--forcemito"
"--dbpath=C:\monettesting\Mic-Windows7-x86_64-installer-b4f5f29a002f-Dec2016\tests\sql\dbfarm\mTests_sql_test_BugTracker-2015"
"--dbextra=C:\monettesting\Mic-Windows7-x86_64-installer-b4f5f29a002f-Dec2016\tests\sql\dbfarm\mTests_sql_test_BugTracker-2015_transient"
-# 19:04:38 >
-
-
-# 19:04:38 >
-# 19:04:38 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=LAB03"
"--port=39900"
-# 19:04:38 >
-
-#~ MAPI = monetdb@LAB03:39900
-QUERY = SELECT timestamp_to_str(current_timestamp, '%Q');
-ERROR = !cannot convert timestamp
-
-# 19:04:38 >
-# 19:04:38 > "Done."
-# 19:04:38 >
-
diff --git
a/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.out
b/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.out
--- a/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.out
+++ b/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.out
@@ -5,37 +5,9 @@ stdout of test 'crash_timestamp_convert.
# 19:04:38 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33045" "--set"
"mapi_usock=/var/tmp/mtest-17747/.s.monetdb.33045" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/scratch/niels/build/rc/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
# 19:04:38 >
-# MonetDB 5 server v11.21.6
-# This is an unreleased version
-# Serving database 'mTests_sql_test_BugTracker-2015', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
-# Found 15.586 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://rocks101.scilens.private:33045/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-17747/.s.monetdb.33045
-# MonetDB/GIS module loaded
-# Start processing logs sql/sql_logs version 52200
-# Start reading the write-ahead log 'sql_logs/sql/log.46'
-# Finished reading the write-ahead log 'sql_logs/sql/log.46'
-# Finished processing logs sql/sql_logs
-# MonetDB/SQL module loaded
-# MonetDB/R module loaded
# 19:04:38 >
-# 19:04:38 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17747" "--port=33045"
-# 19:04:38 >
-
-#SELECT timestamp_to_str(current_timestamp, '%Q');
-% .%2 # table_name
-% %2 # name
-% clob # type
-% 2 # length
-[ "%Q" ]
-
-# 19:04:38 >
# 19:04:38 > "Done."
# 19:04:38 >
diff --git
a/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.out.Darwin
b/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.out.Darwin
deleted file mode 100644
---
a/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.out.Darwin
+++ /dev/null
@@ -1,41 +0,0 @@
-stdout of test 'crash_timestamp_convert.Bug-3816` in directory
'sql/test/BugTracker-2015` itself:
-
-
-# 19:04:38 >
-# 19:04:38 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33045" "--set"
"mapi_usock=/var/tmp/mtest-17747/.s.monetdb.33045" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/scratch/niels/build/rc/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
-# 19:04:38 >
-
-# MonetDB 5 server v11.21.6
-# This is an unreleased version
-# Serving database 'mTests_sql_test_BugTracker-2015', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
-# Found 15.586 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://rocks101.scilens.private:33045/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-17747/.s.monetdb.33045
-# MonetDB/GIS module loaded
-# Start processing logs sql/sql_logs version 52200
-# Start reading the write-ahead log 'sql_logs/sql/log.46'
-# Finished reading the write-ahead log 'sql_logs/sql/log.46'
-# Finished processing logs sql/sql_logs
-# MonetDB/SQL module loaded
-# MonetDB/R module loaded
-
-
-# 19:04:38 >
-# 19:04:38 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17747" "--port=33045"
-# 19:04:38 >
-
-#SELECT timestamp_to_str(current_timestamp, '%Q');
-% .%2 # table_name
-% %2 # name
-% clob # type
-% 1 # length
-[ "Q" ]
-
-# 19:04:38 >
-# 19:04:38 > "Done."
-# 19:04:38 >
-
diff --git
a/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.out.Windows
b/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.out.Windows
deleted file mode 100644
---
a/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.out.Windows
+++ /dev/null
@@ -1,28 +0,0 @@
-stdout of test 'crash_timestamp_convert.Bug-3816` in directory
'sql/test/BugTracker-2015` itself:
-
-
-# 19:04:38 >
-# 19:04:38 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39900" "--set" "monet_prompt="
"--forcemito"
"--dbpath=C:\monettesting\Mic-Windows7-x86_64-installer-b4f5f29a002f-Dec2016\tests\sql\dbfarm\mTests_sql_test_BugTracker-2015"
"--dbextra=C:\monettesting\Mic-Windows7-x86_64-installer-b4f5f29a002f-Dec2016\tests\sql\dbfarm\mTests_sql_test_BugTracker-2015_transient"
-# 19:04:38 >
-
-# MonetDB 5 server v11.25.24 "Dec2016-b4f5f29a002f"
-# Serving database 'mTests_sql_test_BugTracker-2015', using 4 threads
-# Compiled for x86_64-pc-winnt/64bit
-# Found 11.991 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://lab03:39900/
-# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-
-
-# 19:04:38 >
-# 19:04:38 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=LAB03"
"--port=39900"
-# 19:04:38 >
-
-
-# 19:04:38 >
-# 19:04:38 > "Done."
-# 19:04:38 >
-
diff --git
a/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.test
b/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.test
deleted file mode 100644
--- a/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.test
+++ /dev/null
@@ -1,6 +0,0 @@
-query T rowsort
-SELECT timestamp_to_str(current_timestamp, '%Q')
-----
-%Q
-
-
diff --git
a/sql/test/BugTracker-2015/Tests/mserver-creates-but-not-accept-column-types-decimal19-decimal39.Bug-3863.sql
b/sql/test/BugTracker-2015/Tests/mserver-creates-but-not-accept-column-types-decimal19-decimal39.Bug-3863.sql
---
a/sql/test/BugTracker-2015/Tests/mserver-creates-but-not-accept-column-types-decimal19-decimal39.Bug-3863.sql
+++
b/sql/test/BugTracker-2015/Tests/mserver-creates-but-not-accept-column-types-decimal19-decimal39.Bug-3863.sql
@@ -3,7 +3,7 @@ INSERT INTO bar VALUES ('A', 123, 456);
CREATE TABLE foo AS SELECT cast(SUM(ct + ct2) as bigint) / 100.0 AS eur FROM
bar GROUP BY name WITH DATA;
select "name", "query", "type", "remark" from describe_table('sys', 'foo');
-select * from describe_columns('sys', 'foo');
+select "name", "nulls", "cdefault", "number", "remark" from
describe_columns('sys', 'foo');
DROP TABLE foo;
DROP TABLE bar;
diff --git
a/sql/test/BugTracker-2015/Tests/mserver-creates-but-not-accept-column-types-decimal19-decimal39.Bug-3863.test
b/sql/test/BugTracker-2015/Tests/mserver-creates-but-not-accept-column-types-decimal19-decimal39.Bug-3863.test
---
a/sql/test/BugTracker-2015/Tests/mserver-creates-but-not-accept-column-types-decimal19-decimal39.Bug-3863.test
+++
b/sql/test/BugTracker-2015/Tests/mserver-creates-but-not-accept-column-types-decimal19-decimal39.Bug-3863.test
@@ -15,17 +15,13 @@ NULL
TABLE
NULL
-query TTIITTITT rowsort
-select * from describe_columns('sys', 'foo')
+query TTTIT rowsort
+select "name", "nulls", "cdefault", "number", "remark" from
describe_columns('sys', 'foo')
----
eur
-decimal
-23
-3
True
NULL
0
-DECIMAL(23,3)
NULL
statement ok
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
