Changeset: aa499fb7c91a for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aa499fb7c91a Modified Files: 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-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/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:
Approve stable output of upgrade diffs (truncated from 396 to 300 lines): 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 @@ -95,7 +95,7 @@ drop view sys.geometry_columns cascade; create view sys.geometry_columns as select cast(null as varchar(1)) as f_table_catalog, s.name as f_table_schema, - t.name as f_table_name, + t.name as f_table_name, c.name as f_geometry_column, cast(has_z(c.type_digits) + has_m(c.type_digits) +2 as integer) as coord_dimension, c.type_scale as srid, @@ -108,6 +108,14 @@ update sys._tables set system = true whe delete from sys.systemfunctions where function_id not in (select id from sys.functions); set schema "sys"; +Running database upgrade commands: +drop view sys.environment cascade; +drop function sys.environment() cascade; +create view sys.environment as select * from sys.env(); +GRANT SELECT ON sys.environment TO PUBLIC; +update sys._tables set system = true where system = false and name = 'environment' and schema_id in (select id from schemas where name = 'sys'); +delete from sys.systemfunctions where function_id not in (select id from sys.functions); + # 13:50:24 > # 13:50:24 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-7858" "--port=33066" 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 @@ -91,7 +91,7 @@ drop view sys.geometry_columns cascade; create view sys.geometry_columns as select cast(null as varchar(1)) as f_table_catalog, s.name as f_table_schema, - t.name as f_table_name, + t.name as f_table_name, c.name as f_geometry_column, cast(has_z(c.type_digits) + has_m(c.type_digits) +2 as integer) as coord_dimension, c.type_scale as srid, @@ -104,6 +104,14 @@ update sys._tables set system = true whe delete from sys.systemfunctions where function_id not in (select id from sys.functions); set schema "sys"; +Running database upgrade commands: +drop view sys.environment cascade; +drop function sys.environment() cascade; +create view sys.environment as select * from sys.env(); +GRANT SELECT ON sys.environment TO PUBLIC; +update sys._tables set system = true where system = false and name = 'environment' and schema_id in (select id from schemas where name = 'sys'); +delete from sys.systemfunctions where function_id not in (select id from sys.functions); + # 14:06:25 > # 14:06:25 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-32766" "--port=33975" 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 @@ -104,6 +104,14 @@ update sys._tables set system = true whe delete from sys.systemfunctions where function_id not in (select id from sys.functions); set schema "sys"; +Running database upgrade commands: +drop view sys.environment cascade; +drop function sys.environment() cascade; +create view sys.environment as select * from sys.env(); +GRANT SELECT ON sys.environment TO PUBLIC; +update sys._tables set system = true where system = false and name = 'environment' and schema_id in (select id from schemas where name = 'sys'); +delete from sys.systemfunctions where function_id not in (select id from sys.functions); + # 15:42:23 > # 15:42:23 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-10708" "--port=34422" 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 @@ -5422,7 +5422,7 @@ drop view sys.geometry_columns cascade; create view sys.geometry_columns as select cast(null as varchar(1)) as f_table_catalog, s.name as f_table_schema, - t.name as f_table_name, + t.name as f_table_name, c.name as f_geometry_column, cast(has_z(c.type_digits) + has_m(c.type_digits) +2 as integer) as coord_dimension, c.type_scale as srid, @@ -5435,6 +5435,14 @@ update sys._tables set system = true whe delete from sys.systemfunctions where function_id not in (select id from sys.functions); set schema "sys"; +Running database upgrade commands: +drop view sys.environment cascade; +drop function sys.environment() cascade; +create view sys.environment as select * from sys.env(); +GRANT SELECT ON sys.environment TO PUBLIC; +update sys._tables set system = true where system = false and name = 'environment' and schema_id in (select id from schemas where name = 'sys'); +delete from sys.systemfunctions where function_id not in (select id from sys.functions); + # 16:53:35 > # 16:53:35 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-30908" "--port=39660" diff --git a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 @@ -95,7 +95,7 @@ drop view sys.geometry_columns cascade; create view sys.geometry_columns as select cast(null as varchar(1)) as f_table_catalog, s.name as f_table_schema, - t.name as f_table_name, + t.name as f_table_name, c.name as f_geometry_column, cast(has_z(c.type_digits) + has_m(c.type_digits) +2 as integer) as coord_dimension, c.type_scale as srid, @@ -108,6 +108,14 @@ update sys._tables set system = true whe delete from sys.systemfunctions where function_id not in (select id from sys.functions); set schema "sys"; +Running database upgrade commands: +drop view sys.environment cascade; +drop function sys.environment() cascade; +create view sys.environment as select * from sys.env(); +GRANT SELECT ON sys.environment TO PUBLIC; +update sys._tables set system = true where system = false and name = 'environment' and schema_id in (select id from schemas where name = 'sys'); +delete from sys.systemfunctions where function_id not in (select id from sys.functions); + # 13:50:25 > # 13:50:25 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-7858" "--port=33066" diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out --- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out +++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out @@ -91,7 +91,7 @@ drop view sys.geometry_columns cascade; create view sys.geometry_columns as select cast(null as varchar(1)) as f_table_catalog, s.name as f_table_schema, - t.name as f_table_name, + t.name as f_table_name, c.name as f_geometry_column, cast(has_z(c.type_digits) + has_m(c.type_digits) +2 as integer) as coord_dimension, c.type_scale as srid, @@ -104,6 +104,14 @@ update sys._tables set system = true whe delete from sys.systemfunctions where function_id not in (select id from sys.functions); set schema "sys"; +Running database upgrade commands: +drop view sys.environment cascade; +drop function sys.environment() cascade; +create view sys.environment as select * from sys.env(); +GRANT SELECT ON sys.environment TO PUBLIC; +update sys._tables set system = true where system = false and name = 'environment' and schema_id in (select id from schemas where name = 'sys'); +delete from sys.systemfunctions where function_id not in (select id from sys.functions); + # 14:06:25 > # 14:06:25 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-32766" "--port=33975" diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit --- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit +++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit @@ -104,6 +104,14 @@ update sys._tables set system = true whe delete from sys.systemfunctions where function_id not in (select id from sys.functions); set schema "sys"; +Running database upgrade commands: +drop view sys.environment cascade; +drop function sys.environment() cascade; +create view sys.environment as select * from sys.env(); +GRANT SELECT ON sys.environment TO PUBLIC; +update sys._tables set system = true where system = false and name = 'environment' and schema_id in (select id from schemas where name = 'sys'); +delete from sys.systemfunctions where function_id not in (select id from sys.functions); + # 15:42:23 > # 15:42:23 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-10708" "--port=34422" diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 @@ -5422,7 +5422,7 @@ drop view sys.geometry_columns cascade; create view sys.geometry_columns as select cast(null as varchar(1)) as f_table_catalog, s.name as f_table_schema, - t.name as f_table_name, + t.name as f_table_name, c.name as f_geometry_column, cast(has_z(c.type_digits) + has_m(c.type_digits) +2 as integer) as coord_dimension, c.type_scale as srid, @@ -5435,6 +5435,14 @@ update sys._tables set system = true whe delete from sys.systemfunctions where function_id not in (select id from sys.functions); set schema "sys"; +Running database upgrade commands: +drop view sys.environment cascade; +drop function sys.environment() cascade; +create view sys.environment as select * from sys.env(); +GRANT SELECT ON sys.environment TO PUBLIC; +update sys._tables set system = true where system = false and name = 'environment' and schema_id in (select id from schemas where name = 'sys'); +delete from sys.systemfunctions where function_id not in (select id from sys.functions); + # 18:26:24 > # 18:26:24 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-20759" "--port=37815" diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 @@ -93,7 +93,7 @@ drop view sys.geometry_columns cascade; create view sys.geometry_columns as select cast(null as varchar(1)) as f_table_catalog, s.name as f_table_schema, - t.name as f_table_name, + t.name as f_table_name, c.name as f_geometry_column, cast(has_z(c.type_digits) + has_m(c.type_digits) +2 as integer) as coord_dimension, c.type_scale as srid, @@ -106,6 +106,14 @@ update sys._tables set system = true whe delete from sys.systemfunctions where function_id not in (select id from sys.functions); set schema "testschema"; +Running database upgrade commands: +drop view sys.environment cascade; +drop function sys.environment() cascade; +create view sys.environment as select * from sys.env(); +GRANT SELECT ON sys.environment TO PUBLIC; +update sys._tables set system = true where system = false and name = 'environment' and schema_id in (select id from schemas where name = 'sys'); +delete from sys.systemfunctions where function_id not in (select id from sys.functions); + # 13:50:54 > # 13:50:54 > "/usr/bin/python2" "upgrade.SQL.py" "upgrade" diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out --- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out +++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out @@ -86,7 +86,7 @@ drop view sys.geometry_columns cascade; create view sys.geometry_columns as select cast(null as varchar(1)) as f_table_catalog, s.name as f_table_schema, - t.name as f_table_name, + t.name as f_table_name, c.name as f_geometry_column, cast(has_z(c.type_digits) + has_m(c.type_digits) +2 as integer) as coord_dimension, c.type_scale as srid, @@ -99,6 +99,14 @@ update sys._tables set system = true whe delete from sys.systemfunctions where function_id not in (select id from sys.functions); set schema "testschema"; +Running database upgrade commands: +drop view sys.environment cascade; +drop function sys.environment() cascade; +create view sys.environment as select * from sys.env(); +GRANT SELECT ON sys.environment TO PUBLIC; +update sys._tables set system = true where system = false and name = 'environment' and schema_id in (select id from schemas where name = 'sys'); +delete from sys.systemfunctions where function_id not in (select id from sys.functions); + # 14:06:27 > # 14:06:27 > "/usr/bin/python2" "upgrade.SQL.py" "upgrade" diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit --- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit +++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit @@ -99,6 +99,14 @@ update sys._tables set system = true whe delete from sys.systemfunctions where function_id not in (select id from sys.functions); set schema "testschema"; +Running database upgrade commands: +drop view sys.environment cascade; +drop function sys.environment() cascade; +create view sys.environment as select * from sys.env(); +GRANT SELECT ON sys.environment TO PUBLIC; +update sys._tables set system = true where system = false and name = 'environment' and schema_id in (select id from schemas where name = 'sys'); +delete from sys.systemfunctions where function_id not in (select id from sys.functions); + # 15:42:25 > # 15:42:25 > "/usr/bin/python2" "upgrade.SQL.py" "upgrade" diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 --- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 +++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 @@ -5417,7 +5417,7 @@ drop view sys.geometry_columns cascade; create view sys.geometry_columns as select cast(null as varchar(1)) as f_table_catalog, s.name as f_table_schema, - t.name as f_table_name, + t.name as f_table_name, c.name as f_geometry_column, cast(has_z(c.type_digits) + has_m(c.type_digits) +2 as integer) as coord_dimension, c.type_scale as srid, @@ -5430,6 +5430,14 @@ update sys._tables set system = true whe delete from sys.systemfunctions where function_id not in (select id from sys.functions); set schema "testschema"; +Running database upgrade commands: +drop view sys.environment cascade; +drop function sys.environment() cascade; +create view sys.environment as select * from sys.env(); +GRANT SELECT ON sys.environment TO PUBLIC; +update sys._tables set system = true where system = false and name = 'environment' and schema_id in (select id from schemas where name = 'sys'); +delete from sys.systemfunctions where function_id not in (select id from sys.functions); + # 12:48:11 > # 12:48:11 > "/usr/bin/python2" "upgrade.SQL.py" "upgrade" diff --git a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list