Changeset: c11f53136f41 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c11f53136f41
Modified Files:
NT/mkgeomwxs.py
NT/mkodbcwxs.py
NT/mksqlwxs.py
clients/mapiclient/dump.c
sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/dump.stable.out
sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128
sql/test/testdb-upgrade/Tests/dump.stable.out
sql/test/testdb/Tests/testdb-dump.stable.out
sql/test/testdb/Tests/testdb-load.sql
Branch: default
Log Message:
Merge with Jul2017 branch.
diffs (146 lines):
diff --git a/NT/mkgeomwxs.py b/NT/mkgeomwxs.py
--- a/NT/mkgeomwxs.py
+++ b/NT/mkgeomwxs.py
@@ -32,6 +32,7 @@ def main():
else:
folder = r'ProgramFilesFolder'
arch = 'x86'
+ vs = os.getenv('vs') # inherited from TestTools\common.bat
features = []
print(r'<?xml version="1.0"?>')
print(r'<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>')
@@ -47,7 +48,7 @@ def main():
print(r' <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>')
print(r' <Media Id="1" Cabinet="monetdb.cab" EmbedCab="yes"/>')
print(r' <Directory Id="TARGETDIR" Name="SourceDir">')
- print(r' <Merge Id="VCRedist" DiskId="1" Language="0"
SourceFile="C:\Program Files (x86)\Common Files\Merge
Modules\Microsoft_VC140_CRT_%s.msm"/>' % arch)
+ print(r' <Merge Id="VCRedist" DiskId="1" Language="0"
SourceFile="C:\Program Files (x86)\Common Files\Merge
Modules\Microsoft_VC%s0_CRT_%s.msm"/>' % (vs, arch))
print(r' <Directory Id="%s">' % folder)
print(r' <Directory Id="ProgramFilesMonetDB" Name="MonetDB">')
print(r' <Directory Id="INSTALLDIR" Name="MonetDB5">')
diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -35,6 +35,7 @@ def main():
else:
folder = r'ProgramFilesFolder'
arch = 'x86'
+ vs = os.getenv('vs') # inherited from TestTools\common.bat
features = []
print(r'<?xml version="1.0"?>')
print(r'<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>')
@@ -49,7 +50,7 @@ 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">')
- print(r' <Merge Id="VCRedist" DiskId="1" Language="0"
SourceFile="C:\Program Files (x86)\Common Files\Merge
Modules\Microsoft_VC140_CRT_%s.msm"/>' % arch)
+ print(r' <Merge Id="VCRedist" DiskId="1" Language="0"
SourceFile="C:\Program Files (x86)\Common Files\Merge
Modules\Microsoft_VC%s0_CRT_%s.msm"/>' % (vs, arch))
print(r' <Directory Id="%s">' % folder)
print(r' <Directory Id="ProgramFilesMonetDB" Name="MonetDB">')
print(r' <Directory Id="INSTALLDIR" Name="MonetDB ODBC Driver">')
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -35,6 +35,7 @@ def main():
else:
folder = r'ProgramFilesFolder'
arch = 'x86'
+ vs = os.getenv('vs') # inherited from TestTools\common.bat
features = []
print(r'<?xml version="1.0"?>')
print(r'<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>')
@@ -50,7 +51,7 @@ def main():
print(r' <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>')
print(r' <Media Id="1" Cabinet="monetdb.cab" EmbedCab="yes"/>')
print(r' <Directory Id="TARGETDIR" Name="SourceDir">')
- print(r' <Merge Id="VCRedist" DiskId="1" Language="0"
SourceFile="C:\Program Files (x86)\Common Files\Merge
Modules\Microsoft_VC140_CRT_%s.msm"/>' % arch)
+ print(r' <Merge Id="VCRedist" DiskId="1" Language="0"
SourceFile="C:\Program Files (x86)\Common Files\Merge
Modules\Microsoft_VC%s0_CRT_%s.msm"/>' % (vs, arch))
print(r' <Directory Id="%s">' % folder)
print(r' <Directory Id="ProgramFilesMonetDB" Name="MonetDB">')
print(r' <Directory Id="INSTALLDIR" Name="MonetDB5">')
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -1141,7 +1141,9 @@ dump_table_data(Mapi mid, char *schema,
for (i = 0; i < cnt; i++) {
string[i] = (strcmp(mapi_get_type(hdl, i), "char") == 0 ||
strcmp(mapi_get_type(hdl, i), "varchar") == 0 ||
- strcmp(mapi_get_type(hdl, i), "clob") == 0);
+ strcmp(mapi_get_type(hdl, i), "clob") == 0 ||
+ strcmp(mapi_get_type(hdl, i), "timestamp") == 0 ||
+ strcmp(mapi_get_type(hdl, i), "timestamptz") == 0);
}
while (mapi_fetch_row(hdl)) {
char *s;
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out.int128
b/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out.int128
--- a/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out.int128
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out.int128
@@ -101215,7 +101215,7 @@ CREATE TABLE "testschema"."typestest" (
"character10" CHAR(10)
);
COPY 2 RECORDS INTO "testschema"."typestest" FROM stdin USING DELIMITERS
'\t','\n','"';
-true 10 10000 1000000 1000000 10000000000 1e+30 1e+20 1
123456789 12345.678 3.1415 3.1415 3.1415 2009-04-15 24
18 3 1728000.000 108000.000 120000.000 100000.000
36000.000 6000.000 2000.000 600.000 100.000 10.000
1995-07-15 07:30:00.000000 1995-07-15 07:30:00.00000 1995-07-15
07:30:00.000000+00:00 1995-07-15 07:30:00.00000+00:00 07:30:00
07:30:00.00000 07:30:00+00:00 07:30:00.00000+00:00 123456 123456
"123456" "123456" "x" "varchar" "0123456789"
+true 10 10000 1000000 1000000 10000000000 1e+30 1e+20 1
123456789 12345.678 3.1415 3.1415 3.1415 2009-04-15 24
18 3 1728000.000 108000.000 120000.000 100000.000
36000.000 6000.000 2000.000 600.000 100.000 10.000
"1995-07-15 07:30:00.000000" "1995-07-15 07:30:00.00000" "1995-07-15
07:30:00.000000+00:00" "1995-07-15 07:30:00.00000+00:00" 07:30:00
07:30:00.00000 07:30:00+00:00 07:30:00.00000+00:00 123456 123456
"123456" "123456" "x" "varchar" "0123456789"
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL
CREATE TABLE "testschema"."keytest1" (
"key1" INTEGER NOT NULL,
diff --git a/sql/test/testdb-upgrade-chain/Tests/dump.stable.out
b/sql/test/testdb-upgrade-chain/Tests/dump.stable.out
--- a/sql/test/testdb-upgrade-chain/Tests/dump.stable.out
+++ b/sql/test/testdb-upgrade-chain/Tests/dump.stable.out
@@ -101173,7 +101173,7 @@ CREATE TABLE "testschema"."typestest" (
"character10" CHAR(10)
);
COPY 2 RECORDS INTO "testschema"."typestest" FROM stdin USING DELIMITERS
'\t','\n','"';
-true 10 10000 1000000 1000000 10000000000 1e+30 1e+20 1
123456789 12345.678 3.1415 3.1415 3.1415 2009-04-15 24
18 3 1728000.000 108000.000 120000.000 100000.000
36000.000 6000.000 2000.000 600.000 100.000 10.000
1995-07-15 07:30:00.000000 1995-07-15 07:30:00.00000 1995-07-15
07:30:00.000000+00:00 1995-07-15 07:30:00.00000+00:00 07:30:00
07:30:00.00000 07:30:00+00:00 07:30:00.00000+00:00 123456 123456
"123456" "123456" "x" "varchar" "0123456789"
+true 10 10000 1000000 1000000 10000000000 1e+30 1e+20 1
123456789 12345.678 3.1415 3.1415 3.1415 2009-04-15 24
18 3 1728000.000 108000.000 120000.000 100000.000
36000.000 6000.000 2000.000 600.000 100.000 10.000
"1995-07-15 07:30:00.000000" "1995-07-15 07:30:00.00000" "1995-07-15
07:30:00.000000+00:00" "1995-07-15 07:30:00.00000+00:00" 07:30:00
07:30:00.00000 07:30:00+00:00 07:30:00.00000+00:00 123456 123456
"123456" "123456" "x" "varchar" "0123456789"
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL
CREATE TABLE "testschema"."keytest1" (
"key1" INTEGER NOT NULL,
diff --git a/sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128
b/sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128
--- a/sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128
+++ b/sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128
@@ -101180,7 +101180,7 @@ CREATE TABLE "testschema"."typestest" (
"json" JSON
);
COPY 2 RECORDS INTO "testschema"."typestest" FROM stdin USING DELIMITERS
'\t','\n','"';
-true 10 10000 1000000 10000000000 1e+30 1e+20 1.000
123456789 12345.678 3.1415 3.1415 3.1415 2009-04-15 24
18 3 1728000.000 108000.000 120000.000 100000.000
36000.000 6000.000 2000.000 600.000 100.000 10.000
1995-07-15 07:30:00.000000 1995-07-15 07:30:00.00000 1995-07-15
07:30:00.000000+00:00 1995-07-15 07:30:00.00000+00:00 07:30:00
07:30:00.00000 07:30:00+00:00 07:30:00.00000+00:00 123456 123456
"123456" "123456" "𐤀" "varchar" "0123456789"
7d95a9ce-aeb8-4881-9cf7-60b4d55f9e45 192.168.10.0/24
{"f1":{"f12":3},"f2":[2,3,4]}
+true 10 10000 1000000 10000000000 1e+30 1e+20 1.000
123456789 12345.678 3.1415 3.1415 3.1415 2009-04-15 24
18 3 1728000.000 108000.000 120000.000 100000.000
36000.000 6000.000 2000.000 600.000 100.000 10.000
"1995-07-15 07:30:00.000000" "1995-07-15 07:30:00.00000" "1995-07-15
07:30:00.000000+00:00" "1995-07-15 07:30:00.00000+00:00" 07:30:00
07:30:00.00000 07:30:00+00:00 07:30:00.00000+00:00 123456 123456
"123456" "123456" "𐤀" "varchar" "0123456789"
7d95a9ce-aeb8-4881-9cf7-60b4d55f9e45 192.168.10.0/24
{"f1":{"f12":3},"f2":[2,3,4]}
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL
CREATE TABLE "testschema"."keytest1" (
"key1" INTEGER NOT NULL,
diff --git a/sql/test/testdb-upgrade/Tests/dump.stable.out
b/sql/test/testdb-upgrade/Tests/dump.stable.out
--- a/sql/test/testdb-upgrade/Tests/dump.stable.out
+++ b/sql/test/testdb-upgrade/Tests/dump.stable.out
@@ -101175,7 +101175,7 @@ CREATE TABLE "testschema"."typestest" (
"json" JSON
);
COPY 2 RECORDS INTO "testschema"."typestest" FROM stdin USING DELIMITERS
'\t','\n','"';
-true 10 10000 1000000 10000000000 1e+30 1e+20 1.000
123456789 12345.678 3.1415 3.1415 3.1415 2009-04-15 24
18 3 1728000.000 108000.000 120000.000 100000.000
36000.000 6000.000 2000.000 600.000 100.000 10.000
1995-07-15 07:30:00.000000 1995-07-15 07:30:00.00000 1995-07-15
07:30:00.000000+00:00 1995-07-15 07:30:00.00000+00:00 07:30:00
07:30:00.00000 07:30:00+00:00 07:30:00.00000+00:00 123456 123456
"123456" "123456" "𐤀" "varchar" "0123456789"
7d95a9ce-aeb8-4881-9cf7-60b4d55f9e45 192.168.10.0/24
{"f1":{"f12":3},"f2":[2,3,4]}
+true 10 10000 1000000 10000000000 1e+30 1e+20 1.000
123456789 12345.678 3.1415 3.1415 3.1415 2009-04-15 24
18 3 1728000.000 108000.000 120000.000 100000.000
36000.000 6000.000 2000.000 600.000 100.000 10.000
"1995-07-15 07:30:00.000000" "1995-07-15 07:30:00.00000" "1995-07-15
07:30:00.000000+00:00" "1995-07-15 07:30:00.00000+00:00" 07:30:00
07:30:00.00000 07:30:00+00:00 07:30:00.00000+00:00 123456 123456
"123456" "123456" "𐤀" "varchar" "0123456789"
7d95a9ce-aeb8-4881-9cf7-60b4d55f9e45 192.168.10.0/24
{"f1":{"f12":3},"f2":[2,3,4]}
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL
CREATE TABLE "testschema"."keytest1" (
"key1" INTEGER NOT NULL,
diff --git a/sql/test/testdb/Tests/testdb-dump.stable.out
b/sql/test/testdb/Tests/testdb-dump.stable.out
--- a/sql/test/testdb/Tests/testdb-dump.stable.out
+++ b/sql/test/testdb/Tests/testdb-dump.stable.out
@@ -101174,7 +101174,7 @@ CREATE TABLE "testschema"."typestest" (
"json" JSON
);
COPY 2 RECORDS INTO "testschema"."typestest" FROM stdin USING DELIMITERS
'\t','\n','"';
-true 10 10000 1000000 10000000000 1e+30 1e+20 1.000
123456789 12345.678 3.1415 3.1415 3.1415 2009-04-15 24
18 3 1728000.000 108000.000 120000.000 100000.000
36000.000 6000.000 2000.000 600.000 100.000 10.000
1995-07-15 07:30:00.000000 1995-07-15 07:30:00.00000 1995-07-15
07:30:00.000000+00:00 1995-07-15 07:30:00.00000+00:00 07:30:00
07:30:00.00000 07:30:00+00:00 07:30:00.00000+00:00 123456 123456
"123456" "123456" "𐤀" "varchar" "0123456789"
7d95a9ce-aeb8-4881-9cf7-60b4d55f9e45 192.168.10.0/24
{"f1":{"f12":3},"f2":[2,3,4]}
+true 10 10000 1000000 10000000000 1e+30 1e+20 1.000
123456789 12345.678 3.1415 3.1415 3.1415 2009-04-15 24
18 3 1728000.000 108000.000 120000.000 100000.000
36000.000 6000.000 2000.000 600.000 100.000 10.000
"1995-07-15 07:30:00.000000" "1995-07-15 07:30:00.00000" "1995-07-15
07:30:00.000000+00:00" "1995-07-15 07:30:00.00000+00:00" 07:30:00
07:30:00.00000 07:30:00+00:00 07:30:00.00000+00:00 123456 123456
"123456" "123456" "𐤀" "varchar" "0123456789"
7d95a9ce-aeb8-4881-9cf7-60b4d55f9e45 192.168.10.0/24
{"f1":{"f12":3},"f2":[2,3,4]}
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL
CREATE TABLE "testschema"."keytest1" (
"key1" INTEGER NOT NULL,
diff --git a/sql/test/testdb/Tests/testdb-load.sql
b/sql/test/testdb/Tests/testdb-load.sql
--- a/sql/test/testdb/Tests/testdb-load.sql
+++ b/sql/test/testdb/Tests/testdb-load.sql
@@ -101153,7 +101153,7 @@ CREATE TABLE "testschema"."typestest" (
"json" JSON
);
COPY 2 RECORDS INTO "testschema"."typestest" FROM stdin USING DELIMITERS
'\t','\n','"';
-true 10 10000 1000000 10000000000 1e+30 1.00000002e+20 1
123456789 12345.678 3.1415000000000002 3.1415 3.1415
2009-04-15 24 18 3 1728000 108000 120000 100000 36000
6000 2000 600 100 10 1995-07-15 07:30:00.000000
1995-07-15 07:30:00.00000 1995-07-15 07:30:00.000000+00:00
1995-07-15 07:30:00.00000+00:00 07:30:00 07:30:00.00000 07:30:00+00:00
07:30:00.00000+00:00 123456 123456 "123456" "123456" "𐤀"
"varchar" "0123456789" 7d95a9ce-aeb8-4881-9cf7-60b4d55f9e45
192.168.10.0/24 {"f1":{"f12":3},"f2":[2,3,4]}
+true 10 10000 1000000 10000000000 1e+30 1.00000002e+20 1
123456789 12345.678 3.1415000000000002 3.1415 3.1415
2009-04-15 24 18 3 1728000 108000 120000 100000 36000
6000 2000 600 100 10 "1995-07-15 07:30:00.000000"
"1995-07-15 07:30:00.00000" "1995-07-15 07:30:00.000000+00:00"
"1995-07-15 07:30:00.00000+00:00" 07:30:00 07:30:00.00000
07:30:00+00:00 07:30:00.00000+00:00 123456 123456 "123456"
"123456" "𐤀" "varchar" "0123456789"
7d95a9ce-aeb8-4881-9cf7-60b4d55f9e45 192.168.10.0/24
{"f1":{"f12":3},"f2":[2,3,4]}
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL
CREATE TABLE "testschema"."keytest1" (
"key1" INTEGER NOT NULL,
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
