Changeset: 9b0bb9bdd1e0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9b0bb9bdd1e0
Added Files:
sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128
Modified Files:
buildtools/doc/windowsbuild.rst
sql/jdbc/tests/Tests/BugSetQueryTimeout_Bug_3357.stable.out
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/pg_regress/Tests/update.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: default
Log Message:
Merge with Aug2018 branch.
diffs (truncated from 52036 to 300 lines):
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -813,50 +813,24 @@ parameter may contain something like::
Building Installers
~~~~~~~~~~~~~~~~~~~
-Installers can be built either using the full-blown Visual Studio user
-interface or on the command line. To use the user interface, open one
-or more of the files ``MonetDB5-SQL-Installer.sln``,
-``MonetDB-ODBC-Driver.sln``, and ``MonetDB5-Geom-Module.sln`` in the
-installation folder and select ``Build`` -> ``Build Solution``. To use
-the command line, execute one or more of the commands in the
-installation folder::
+The installers are built using the WiX Toolset. The WiX Toolset can
+be installed using Chocolatey.
- devenv MonetDB5-SQL-Installer.sln /build
- devenv MonetDB-ODBC-Driver.sln /build
- devenv MonetDB5-Geom-Module.sln /build
+The Python scripts ``mksqlwxs.py`` and ``mkodbcwxs.py`` in the ``NT``
+subdirectory are used to create the files
+``MonetDB5-SQL-Installer.wxs`` and ``MonetDB-ODBC-Installer.wxs``.
+This happens as part of the normal build process.
-In both cases, use the solutions (``.sln`` files) that are
-appropriate.
+These files then need to be processed using the ``candle`` command
+from the WiX Toolset::
-There is an annoying bug in Visual Studio on Windows64 that affects
-the MonetDB5-Geom-Module installer. The installer contains code to
-check the registry to find out where MonetDB5/SQL is installed. The
-bug is that the 64 bit installer will check the 32-bit section of the
-registry. The code can be fixed by editing the generated installer
-(``.msi`` file) using e.g. the program ``orca`` from Microsoft. Open
-the installer in ``orca`` and locate the table ``RegLocator``. In the
-Type column, change the value from ``2`` to ``18`` and save the file.
-Alternatively, use the following Python script to fix the ``.msi``
-file::
+ candle.exe -nologo -arch x64 MonetDB5-SQL-Installer.wxs
+
+Use ``-arch x86`` for 32 bit Windows.
- # Fix a .msi (Windows Installer) file for a 64-bit registry search.
- # Microsoft refuses to fix a bug in Visual Studio so that for a 64-bit
- # build, the registry search will look in the 32-bit part of the
- # registry instead of the 64-bit part of the registry. This script
- # fixes the .msi to look in the correct part.
-
- import msilib
- import sys
- import glob
+This command produces a file ``MonetDB5-SQL-Installer.wixobj`` which
+needs to be processed with the ``light`` command from the toolset::
- def fixmsi(f):
- db = msilib.OpenDatabase(f, msilib.MSIDBOPEN_DIRECT)
- v = db.OpenView('UPDATE RegLocator SET Type = 18 WHERE Type = 2')
- v.Execute(None)
- v.Close()
- db.Commit()
+ light.exe -nologo -sice:ICO03 -sice:ICE60 -sice:ICE82 -ext WixUIExtension
MonetDB5-SQL-Installer.wixobj
- if __name__ == '__main__':
- for f in sys.argv[1:]:
- for g in glob.glob(f):
- fixmsi(g)
+The same for the ODBC driver.
diff --git a/sql/jdbc/tests/Tests/BugSetQueryTimeout_Bug_3357.stable.out
b/sql/jdbc/tests/Tests/BugSetQueryTimeout_Bug_3357.stable.out
--- a/sql/jdbc/tests/Tests/BugSetQueryTimeout_Bug_3357.stable.out
+++ b/sql/jdbc/tests/Tests/BugSetQueryTimeout_Bug_3357.stable.out
@@ -73,8 +73,10 @@ Ready.
QueryTimeout = 0
QueryTimeout = 123
+QueryTimeout = 123
QueryTimeout = 2134567890
QueryTimeout = 0
+QueryTimeout = 0
setQueryTimeout(timeout_value) throws: java.sql.SQLException: Illegal timeout
value: -1
# 15:59:15 >
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -18,23 +18,6 @@ stdout of test 'upgrade` in directory 's
# MonetDB/GIS module loaded
Running database upgrade commands:
set schema sys;
-create aggregate sys.group_concat(str string) returns string external name
"aggr"."str_group_concat";
-grant execute on aggregate sys.group_concat(string) to public;
-create aggregate sys.group_concat(str string, sep string) returns string
external name "aggr"."str_group_concat";
-grant execute on aggregate sys.group_concat(string, string) to public;
-update sys.functions set system = true where name in ('group_concat') and
schema_id = (select id from sys.schemas where name = 'sys');
-set schema "sys";
-commit;
-
-Running database upgrade commands:
-set schema sys;
-create function sys.remote_table_credentials (tablename string) returns table
("uri" string, "username" string, "hash" string) external name
sql.rt_credentials;
-update sys.functions set system = true where name = 'remote_table_credentials'
and schema_id = (select id from sys.schemas where name = 'sys');
-set schema "sys";
-commit;
-
-Running database upgrade commands:
-set schema sys;
drop table sys.systemfunctions;
create view sys.systemfunctions as select id as function_id from sys.functions
where system;
grant select on sys.systemfunctions to public;
@@ -42,28 +25,6 @@ update sys._tables set system = true whe
set schema "sys";
commit;
-Running database upgrade commands:
-set schema "sys";
-DROP FUNCTION dependencies_schemas_on_users();
-DROP FUNCTION dependencies_owners_on_schemas();
-DROP FUNCTION dependencies_tables_on_views();
-DROP FUNCTION dependencies_tables_on_indexes();
-DROP FUNCTION dependencies_tables_on_triggers();
-DROP FUNCTION dependencies_tables_on_foreignKeys();
-DROP FUNCTION dependencies_tables_on_functions();
-DROP FUNCTION dependencies_columns_on_views();
-DROP FUNCTION dependencies_columns_on_keys();
-DROP FUNCTION dependencies_columns_on_indexes();
-DROP FUNCTION dependencies_columns_on_functions();
-DROP FUNCTION dependencies_columns_on_triggers();
-DROP FUNCTION dependencies_views_on_functions();
-DROP FUNCTION dependencies_views_on_triggers();
-DROP FUNCTION dependencies_functions_on_functions();
-DROP FUNCTION dependencies_functions_on_triggers();
-DROP FUNCTION dependencies_keys_on_foreignKeys();
-set schema "sys";
-commit;
-
# MonetDB/SQL module loaded
Ready.
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
@@ -18,23 +18,6 @@ stdout of test 'upgrade` in directory 's
# MonetDB/GIS module loaded
Running database upgrade commands:
set schema sys;
-create aggregate sys.group_concat(str string) returns string external name
"aggr"."str_group_concat";
-grant execute on aggregate sys.group_concat(string) to public;
-create aggregate sys.group_concat(str string, sep string) returns string
external name "aggr"."str_group_concat";
-grant execute on aggregate sys.group_concat(string, string) to public;
-update sys.functions set system = true where name in ('group_concat') and
schema_id = (select id from sys.schemas where name = 'sys');
-set schema "sys";
-commit;
-
-Running database upgrade commands:
-set schema sys;
-create function sys.remote_table_credentials (tablename string) returns table
("uri" string, "username" string, "hash" string) external name
sql.rt_credentials;
-update sys.functions set system = true where name = 'remote_table_credentials'
and schema_id = (select id from sys.schemas where name = 'sys');
-set schema "sys";
-commit;
-
-Running database upgrade commands:
-set schema sys;
drop table sys.systemfunctions;
create view sys.systemfunctions as select id as function_id from sys.functions
where system;
grant select on sys.systemfunctions to public;
@@ -42,28 +25,6 @@ update sys._tables set system = true whe
set schema "sys";
commit;
-Running database upgrade commands:
-set schema "sys";
-DROP FUNCTION dependencies_schemas_on_users();
-DROP FUNCTION dependencies_owners_on_schemas();
-DROP FUNCTION dependencies_tables_on_views();
-DROP FUNCTION dependencies_tables_on_indexes();
-DROP FUNCTION dependencies_tables_on_triggers();
-DROP FUNCTION dependencies_tables_on_foreignKeys();
-DROP FUNCTION dependencies_tables_on_functions();
-DROP FUNCTION dependencies_columns_on_views();
-DROP FUNCTION dependencies_columns_on_keys();
-DROP FUNCTION dependencies_columns_on_indexes();
-DROP FUNCTION dependencies_columns_on_functions();
-DROP FUNCTION dependencies_columns_on_triggers();
-DROP FUNCTION dependencies_views_on_functions();
-DROP FUNCTION dependencies_views_on_triggers();
-DROP FUNCTION dependencies_functions_on_functions();
-DROP FUNCTION dependencies_functions_on_triggers();
-DROP FUNCTION dependencies_keys_on_foreignKeys();
-set schema "sys";
-commit;
-
# MonetDB/SQL module loaded
Ready.
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
@@ -18,23 +18,6 @@ stdout of test 'upgrade` in directory 's
# MonetDB/GIS module loaded
Running database upgrade commands:
set schema sys;
-create aggregate sys.group_concat(str string) returns string external name
"aggr"."str_group_concat";
-grant execute on aggregate sys.group_concat(string) to public;
-create aggregate sys.group_concat(str string, sep string) returns string
external name "aggr"."str_group_concat";
-grant execute on aggregate sys.group_concat(string, string) to public;
-update sys.functions set system = true where name in ('group_concat') and
schema_id = (select id from sys.schemas where name = 'sys');
-set schema "sys";
-commit;
-
-Running database upgrade commands:
-set schema sys;
-create function sys.remote_table_credentials (tablename string) returns table
("uri" string, "username" string, "hash" string) external name
sql.rt_credentials;
-update sys.functions set system = true where name = 'remote_table_credentials'
and schema_id = (select id from sys.schemas where name = 'sys');
-set schema "sys";
-commit;
-
-Running database upgrade commands:
-set schema sys;
drop table sys.systemfunctions;
create view sys.systemfunctions as select id as function_id from sys.functions
where system;
grant select on sys.systemfunctions to public;
@@ -42,28 +25,6 @@ update sys._tables set system = true whe
set schema "sys";
commit;
-Running database upgrade commands:
-set schema "sys";
-DROP FUNCTION dependencies_schemas_on_users();
-DROP FUNCTION dependencies_owners_on_schemas();
-DROP FUNCTION dependencies_tables_on_views();
-DROP FUNCTION dependencies_tables_on_indexes();
-DROP FUNCTION dependencies_tables_on_triggers();
-DROP FUNCTION dependencies_tables_on_foreignKeys();
-DROP FUNCTION dependencies_tables_on_functions();
-DROP FUNCTION dependencies_columns_on_views();
-DROP FUNCTION dependencies_columns_on_keys();
-DROP FUNCTION dependencies_columns_on_indexes();
-DROP FUNCTION dependencies_columns_on_functions();
-DROP FUNCTION dependencies_columns_on_triggers();
-DROP FUNCTION dependencies_views_on_functions();
-DROP FUNCTION dependencies_views_on_triggers();
-DROP FUNCTION dependencies_functions_on_functions();
-DROP FUNCTION dependencies_functions_on_triggers();
-DROP FUNCTION dependencies_keys_on_foreignKeys();
-set schema "sys";
-commit;
-
# MonetDB/SQL module loaded
Ready.
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -54,5241 +54,5241 @@ insert into sys.types values (30, 'mbr',
delete from sys.functions where id < 2000;
delete from sys.args where func_id not in (select id from sys.functions);
insert into sys.functions values (31, 'mbr_overlap', 'mbrOverlaps', 'geom', 0,
1, false, false, false, 2000, true);
-insert into sys.args values (18554, 31, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18555, 31, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18556, 31, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (18590, 31, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18591, 31, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (18592, 31, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (32, 'mbr_overlap', 'mbrOverlaps', 'geom', 0,
1, false, false, false, 2000, true);
-insert into sys.args values (18557, 32, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18558, 32, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18559, 32, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (18593, 32, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18594, 32, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (18595, 32, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (33, 'mbr_above', 'mbrAbove', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (18560, 33, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18561, 33, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18562, 33, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (18596, 33, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18597, 33, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (18598, 33, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (34, 'mbr_above', 'mbrAbove', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (18563, 34, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18564, 34, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18565, 34, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (18599, 34, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18600, 34, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (18601, 34, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (35, 'mbr_below', 'mbrBelow', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (18566, 35, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18567, 35, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18568, 35, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (18602, 35, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18603, 35, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (18604, 35, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (36, 'mbr_below', 'mbrBelow', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (18569, 36, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18570, 36, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18571, 36, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (18605, 36, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18606, 36, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (18607, 36, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (37, 'mbr_right', 'mbrRight', 'geom', 0, 1,
false, false, false, 2000, true);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
