Changeset: a34463b67c84 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a34463b67c84
Modified Files:
NT/mkodbcwxs.py
NT/mksqlwxs.py
sql/test/pg_regress/Tests/interval.stable.err
sql/test/pg_regress/Tests/interval.stable.err.int128
sql/test/pg_regress/Tests/interval.stable.out
sql/test/pg_regress/Tests/interval.stable.out.int128
sql/test/pg_regress/Tests/timestamp.sql
sql/test/pg_regress/Tests/timestamptz.sql
sql/test/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
Branch: Nov2019
Log Message:
Merge with Apr2019 branch.
diffs (184 lines):
diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -55,8 +55,8 @@ def main():
print(r' <CustomAction Id="driverinstall" FileKey="odbcinstall"
ExeCommand="/Install" Execute="deferred" Impersonate="no"/>')
print(r' <CustomAction Id="driveruninstall" FileKey="odbcinstall"
ExeCommand="/Uninstall" Execute="deferred" Impersonate="no"/>')
print(r' <Directory Id="TARGETDIR" Name="SourceDir">')
- if vs == '17':
- msvc = r'C:\Program Files (x86)\Microsoft Visual
Studio\2017\Community\VC\Redist\MSVC'
+ if vs in ('17', '19'):
+ msvc = r'C:\Program Files (x86)\Microsoft Visual
Studio\20%s\Community\VC\Redist\MSVC' % vs
d = sorted(os.listdir(msvc))[-1]
msm = '_CRT_%s.msm' % arch
for f in sorted(os.listdir(os.path.join(msvc, d, 'MergeModules'))):
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -114,8 +114,8 @@ def main():
print(r' <Property Id="ARPPRODUCTICON" Value="monetdb.ico"/>')
print(r' <Media Id="1" Cabinet="monetdb.cab" EmbedCab="yes"/>')
print(r' <Directory Id="TARGETDIR" Name="SourceDir">')
- if vs == '17':
- msvc = r'C:\Program Files (x86)\Microsoft Visual
Studio\2017\Community\VC\Redist\MSVC'
+ if vs in ('17', '19'):
+ msvc = r'C:\Program Files (x86)\Microsoft Visual
Studio\20%s\Community\VC\Redist\MSVC' % vs
d = sorted(os.listdir(msvc))[-1]
msm = '_CRT_%s.msm' % arch
for f in sorted(os.listdir(os.path.join(msvc, d, 'MergeModules'))):
diff --git a/sql/test/pg_regress/Tests/interval.stable.err
b/sql/test/pg_regress/Tests/interval.stable.err
--- a/sql/test/pg_regress/Tests/interval.stable.err
+++ b/sql/test/pg_regress/Tests/interval.stable.err
@@ -145,10 +145,6 @@ QUERY = SELECT '' AS nine, INTERVAL_TBL.
ERROR = !Wrong format (@ 3 seconds ago)
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
-QUERY = select avg(f1) from interval_tbl;
-ERROR = !types sec_interval(13,0) and double(53,0) are not equal for column
'f1'
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = select avg(cast(f1 as double)) from interval_tbl;
ERROR = !types sec_interval(13,0) and double(53,0) are not equal for column
'f1'
CODE = 42000
diff --git a/sql/test/pg_regress/Tests/interval.stable.err.int128
b/sql/test/pg_regress/Tests/interval.stable.err.int128
--- a/sql/test/pg_regress/Tests/interval.stable.err.int128
+++ b/sql/test/pg_regress/Tests/interval.stable.err.int128
@@ -145,10 +145,6 @@ QUERY = SELECT '' AS nine, INTERVAL_TBL.
ERROR = !Wrong format (@ 3 seconds ago)
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
-QUERY = select avg(f1) from interval_tbl;
-ERROR = !types sec_interval(13,0) and double(53,0) are not equal for column
'f1'
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
QUERY = select avg(cast(f1 as double)) from interval_tbl;
ERROR = !types sec_interval(13,0) and double(53,0) are not equal for column
'f1'
CODE = 42000
diff --git a/sql/test/pg_regress/Tests/interval.stable.out
b/sql/test/pg_regress/Tests/interval.stable.out
--- a/sql/test/pg_regress/Tests/interval.stable.out
+++ b/sql/test/pg_regress/Tests/interval.stable.out
@@ -58,6 +58,12 @@ stdout of test 'interval` in directory '
% 0, 15 # length
[ "", 63513504000.000 ]
[ "", 1.234 ]
+#select avg(f1) from interval_tbl;
+% sys.L3 # table_name
+% L3 # name
+% double # type
+% 24 # length
+[ 3.1756752e+13 ]
#select avg(cast(f1 as decimal)) from interval_tbl;
% sys.L5 # table_name
% L4 # name
diff --git a/sql/test/pg_regress/Tests/interval.stable.out.int128
b/sql/test/pg_regress/Tests/interval.stable.out.int128
--- a/sql/test/pg_regress/Tests/interval.stable.out.int128
+++ b/sql/test/pg_regress/Tests/interval.stable.out.int128
@@ -58,6 +58,12 @@ stdout of test 'interval` in directory '
% 0, 15 # length
[ "", 63513504000.000 ]
[ "", 1.234 ]
+#select avg(f1) from interval_tbl;
+% sys.L3 # table_name
+% L3 # name
+% double # type
+% 24 # length
+[ 3.1756752e+13 ]
#select avg(cast(f1 as decimal)) from interval_tbl;
% sys.L4 # table_name
% L4 # name
diff --git a/sql/test/pg_regress/Tests/timestamp.sql
b/sql/test/pg_regress/Tests/timestamp.sql
--- a/sql/test/pg_regress/Tests/timestamp.sql
+++ b/sql/test/pg_regress/Tests/timestamp.sql
@@ -6,11 +6,9 @@
CREATE TABLE TIMESTAMP_TBL ( d1 timestamp(2) );
DECLARE test_now timestamp(2);
-DECLARE test_current_timestamp timestamp(2);
DECLARE test_current_date date;
SET test_now = now;
-SET test_current_timestamp = current_timestamp;
SET test_current_date = current_date;
-- Shorthand values
@@ -22,7 +20,7 @@ SET test_current_date = current_date;
--INSERT INTO TIMESTAMP_TBL VALUES ('now');
INSERT INTO TIMESTAMP_TBL VALUES (test_now);
--INSERT INTO TIMESTAMP_TBL VALUES ('current');
-INSERT INTO TIMESTAMP_TBL VALUES (cast(test_current_timestamp as timestamp));
+INSERT INTO TIMESTAMP_TBL VALUES (cast(test_now as timestamp));
--INSERT INTO TIMESTAMP_TBL VALUES ('today');
INSERT INTO TIMESTAMP_TBL VALUES (cast(test_current_date as timestamp));
--INSERT INTO TIMESTAMP_TBL VALUES ('yesterday');
diff --git a/sql/test/pg_regress/Tests/timestamptz.sql
b/sql/test/pg_regress/Tests/timestamptz.sql
--- a/sql/test/pg_regress/Tests/timestamptz.sql
+++ b/sql/test/pg_regress/Tests/timestamptz.sql
@@ -6,17 +6,15 @@
CREATE TABLE TIMESTAMPTZ_TBL ( d1 timestamp(2) with time zone);
DECLARE test_now timestamp(2) with time zone;
-DECLARE test_current_timestamp timestamp(2) with time zone;
DECLARE test_current_date date;
SET test_now = now;
-SET test_current_timestamp = current_timestamp;
SET test_current_date = current_date;
--INSERT INTO TIMESTAMPTZ_TBL VALUES ('now');
INSERT INTO TIMESTAMPTZ_TBL VALUES (test_now);
--INSERT INTO TIMESTAMPTZ_TBL VALUES ('current');
-INSERT INTO TIMESTAMPTZ_TBL VALUES (test_current_timestamp);
+INSERT INTO TIMESTAMPTZ_TBL VALUES (test_now);
--INSERT INTO TIMESTAMPTZ_TBL VALUES ('today');
INSERT INTO TIMESTAMPTZ_TBL VALUES (cast(test_current_date as timestamptz));
--INSERT INTO TIMESTAMPTZ_TBL VALUES ('yesterday');
diff --git a/sql/test/sys-schema/Tests/systemfunctions.stable.out
b/sql/test/sys-schema/Tests/systemfunctions.stable.out
--- a/sql/test/sys-schema/Tests/systemfunctions.stable.out
+++ b/sql/test/sys-schema/Tests/systemfunctions.stable.out
@@ -222,6 +222,10 @@ stdout of test 'systemfunctions` in dire
[ "sys", "avg", 0, "double", "avg" ]
[ "sys", "avg", 1, "real", "" ]
[ "sys", "avg", 0, "double", "avg" ]
+[ "sys", "avg", 1, "month_interval", "" ]
+[ "sys", "avg", 0, "double", "avg" ]
+[ "sys", "avg", 1, "sec_interval", "" ]
+[ "sys", "avg", 0, "double", "avg" ]
[ "sys", "avg", 1, "double", "" ]
[ "sys", "avg", 0, "double", "avg" ]
[ "sys", "avg", 1, "tinyint", "" ]
@@ -232,6 +236,10 @@ stdout of test 'systemfunctions` in dire
[ "sys", "avg", 0, "double", "avg" ]
[ "sys", "avg", 1, "bigint", "" ]
[ "sys", "avg", 0, "double", "avg" ]
+[ "sys", "avg", 1, "month_interval", "" ]
+[ "sys", "avg", 0, "double", "avg" ]
+[ "sys", "avg", 1, "sec_interval", "" ]
+[ "sys", "avg", 0, "double", "avg" ]
[ "sys", "avg", 1, "real", "" ]
[ "sys", "bbp", 0, "int", "create function sys.bbp ()\n returns
table (id int, name string,\n ttype string, count bigint, refcnt int, lrefcnt
int,\n location string, heat int, dirty string,\n status string, kind string)\n
external name bbp.get;" ]
[ "sys", "bbp", 1, "clob", "" ]
diff --git a/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
b/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
--- a/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
+++ b/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
@@ -231,6 +231,10 @@ stdout of test 'systemfunctions` in dire
[ "sys", "avg", 0, "double", "avg" ]
[ "sys", "avg", 1, "real", "" ]
[ "sys", "avg", 0, "double", "avg" ]
+[ "sys", "avg", 1, "month_interval", "" ]
+[ "sys", "avg", 0, "double", "avg" ]
+[ "sys", "avg", 1, "sec_interval", "" ]
+[ "sys", "avg", 0, "double", "avg" ]
[ "sys", "avg", 1, "double", "" ]
[ "sys", "avg", 0, "double", "avg" ]
[ "sys", "avg", 1, "tinyint", "" ]
@@ -243,6 +247,10 @@ stdout of test 'systemfunctions` in dire
[ "sys", "avg", 0, "double", "avg" ]
[ "sys", "avg", 1, "hugeint", "" ]
[ "sys", "avg", 0, "double", "avg" ]
+[ "sys", "avg", 1, "month_interval", "" ]
+[ "sys", "avg", 0, "double", "avg" ]
+[ "sys", "avg", 1, "sec_interval", "" ]
+[ "sys", "avg", 0, "double", "avg" ]
[ "sys", "avg", 1, "real", "" ]
[ "sys", "bbp", 0, "int", "create function sys.bbp ()\n returns
table (id int, name string,\n ttype string, count bigint, refcnt int, lrefcnt
int,\n location string, heat int, dirty string,\n status string, kind string)\n
external name bbp.get;" ]
[ "sys", "bbp", 1, "clob", "" ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
