Changeset: 4bc5ca7bff25 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/4bc5ca7bff25
Modified Files:
monetdb5/mal/mal_profiler.c
sql/test/BugTracker-2016/Tests/epoch.Bug-3979.test
sql/test/pg_regress/Tests/timestamptz.test
sql/test/sql_dump/Tests/dump.test
Branch: default
Log Message:
Merge with Jul2021 branch.
diffs (truncated from 5804 to 300 lines):
diff --git a/sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.SQL.py
b/sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.SQL.py
--- a/sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.SQL.py
+++ b/sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.SQL.py
@@ -3,6 +3,8 @@ import datetime, sys, pymonetdb, os
dbh =
pymonetdb.connect(port=int(os.getenv('MAPIPORT')),hostname=os.getenv('MAPIHOST'),database=os.getenv('TSTDB'))
cursor = dbh.cursor()
+cursor.execute("set time zone interval '02:00' hour to minute")
+
cursor.execute('create table bug3439 (ts timestamp)')
if cursor.execute("insert into bug3439 values ('2014-04-24 17:12:12.415')") !=
1:
sys.stderr.write("Expected 1 row inserted")
@@ -15,7 +17,7 @@ cursor.execute('create table bug3439 (ts
if cursor.execute("insert into bug3439 values ('2014-04-24 17:12:12.415
-02:00')") != 1:
sys.stderr.write("Expected 1 row inserted")
cursor.execute('select * from bug3439')
-if cursor.fetchall() != [(datetime.datetime(2014, 4, 24, 19, 12, 12,
415000),)]:
+if cursor.fetchall() != [(datetime.datetime(2014, 4, 24, 21, 12, 12, 415000,
tzinfo=datetime.timezone(datetime.timedelta(seconds=7200))),)]:
sys.stderr.write("Expected [(datetime.datetime(2014, 4, 24, 19, 12, 12,
415000),)]")
cursor.execute('drop table bug3439')
@@ -39,7 +41,7 @@ cursor.execute('create table bug3439 (ts
if cursor.execute("insert into bug3439 values ('17:12:12.415 -02:00')") != 1:
sys.stderr.write("Expected 1 row inserted")
cursor.execute('select * from bug3439')
-if cursor.fetchall() != [(datetime.time(19, 12, 12),)]:
+if cursor.fetchall() != [(datetime.time(21, 12, 12,
tzinfo=datetime.timezone(datetime.timedelta(seconds=7200))),)]:
sys.stderr.write("Expected [(datetime.time(19, 12, 12),)]")
cursor.execute('drop table bug3439')
diff --git a/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.test
b/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.test
--- a/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.test
+++ b/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.test
@@ -940,35 +940,35 @@ 127.000
NULL
NULL
-query IT rowsort
+query IR rowsort
SELECT v, convert(v, float(24)) from T_tinyint
----
-1
--1.0
--127
--127.0
-0
-0.0
-1
-1.0
-127
-127.0
-NULL
-NULL
-
-query IT rowsort
+-1.000
+-127
+-127.000
+0
+0.000
+1
+1.000
+127
+127.000
+NULL
+NULL
+
+query IR rowsort
SELECT v, convert(v, real) from T_tinyint
----
-1
--1.0
--127
--127.0
-0
-0.0
-1
-1.0
-127
-127.0
+-1.000
+-127
+-127.000
+0
+0.000
+1
+1.000
+127
+127.000
NULL
NULL
@@ -1307,35 +1307,35 @@ 127.000
NULL
NULL
-query IT rowsort
+query IR rowsort
SELECT v, cast(v as float(24)) from T_tinyint
----
-1
--1.0
--127
--127.0
-0
-0.0
-1
-1.0
-127
-127.0
-NULL
-NULL
-
-query IT rowsort
+-1.000
+-127
+-127.000
+0
+0.000
+1
+1.000
+127
+127.000
+NULL
+NULL
+
+query IR rowsort
SELECT v, cast(v as real) from T_tinyint
----
-1
--1.0
--127
--127.0
-0
-0.0
-1
-1.0
-127
-127.0
+-1.000
+-127
+-127.000
+0
+0.000
+1
+1.000
+127
+127.000
NULL
NULL
@@ -1720,43 +1720,43 @@ 32767.000
NULL
NULL
-query IT rowsort
+query IR rowsort
SELECT v, convert(v, float(24)) from T_smallint
----
-1
--1.0
--127
--127.0
--32767
--32767.0
-0
-0.0
-1
-1.0
-127
-127.0
-32767
-32767.0
-NULL
-NULL
-
-query IT rowsort
+-1.000
+-127
+-127.000
+-32767
+-32767.000
+0
+0.000
+1
+1.000
+127
+127.000
+32767
+32767.000
+NULL
+NULL
+
+query IR rowsort
SELECT v, convert(v, real) from T_smallint
----
-1
--1.0
--127
--127.0
--32767
--32767.0
-0
-0.0
-1
-1.0
-127
-127.0
-32767
-32767.0
+-1.000
+-127
+-127.000
+-32767
+-32767.000
+0
+0.000
+1
+1.000
+127
+127.000
+32767
+32767.000
NULL
NULL
@@ -2161,43 +2161,43 @@ 32767.000
NULL
NULL
-query IT rowsort
+query IR rowsort
SELECT v, cast(v as float(24)) from T_smallint
----
-1
--1.0
--127
--127.0
--32767
--32767.0
-0
-0.0
-1
-1.0
-127
-127.0
-32767
-32767.0
-NULL
-NULL
-
-query IT rowsort
+-1.000
+-127
+-127.000
+-32767
+-32767.000
+0
+0.000
+1
+1.000
+127
+127.000
+32767
+32767.000
+NULL
+NULL
+
+query IR rowsort
SELECT v, cast(v as real) from T_smallint
----
-1
--1.0
--127
--127.0
--32767
--32767.0
-0
-0.0
-1
-1.0
-127
-127.0
-32767
-32767.0
+-1.000
+-127
+-127.000
+-32767
+-32767.000
+0
+0.000
+1
+1.000
+127
+127.000
+32767
+32767.000
NULL
NULL
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
