Changeset: a8c94cfb4faa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a8c94cfb4faa
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.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.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.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.int128
Branch: default
Log Message:
Approve upgrade.
diffs (truncated from 516 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
@@ -5374,27 +5374,20 @@ set schema "sys";
Running database upgrade commands:
set schema "sys";
-drop view sys.geometry_columns;
-create view geometry_columns as
- select e.value as f_table_catalog,
+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,
- y.f_table_name, y.f_geometry_column, y.coord_dimension, y.srid,
y.type
- from schemas s, environment e, (
- select t.schema_id,
t.name as f_table_name,
- x.name as f_geometry_column,
- cast(has_z(info)+has_m(info)+2 as integer) as
coord_dimension,
- srid, get_type(info, 0) as type
- from tables t, (
- select name, table_id, type_digits AS info, type_scale
AS srid
- from columns
- where type in ( select distinct sqlname from types
where systemname='wkb')
- ) as x
- where t.id=x.table_id
- ) y
- where y.schema_id=s.id and e.name='gdk_dbname';
-GRANT SELECT ON geometry_columns TO PUBLIC;
-update sys._tables set system = true where name in ('geometry_columns') and
schema_id = (select id from schemas where name = 'sys');
+ 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,
+ get_type(c.type_digits, 0) as type
+ from sys.columns c, sys.tables t, sys.schemas s
+ where c.table_id = t.id and t.schema_id = s.id
+ and c.type in (select sqlname from sys.types where systemname in
('wkb', 'wkba'));
+GRANT SELECT ON sys.geometry_columns TO PUBLIC;
+update sys._tables set system = true where name = 'geometry_columns' 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);
set schema "sys";
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
@@ -4661,27 +4661,20 @@ set schema "sys";
Running database upgrade commands:
set schema "sys";
-drop view sys.geometry_columns;
-create view geometry_columns as
- select e.value as f_table_catalog,
+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,
- y.f_table_name, y.f_geometry_column, y.coord_dimension, y.srid,
y.type
- from schemas s, environment e, (
- select t.schema_id,
t.name as f_table_name,
- x.name as f_geometry_column,
- cast(has_z(info)+has_m(info)+2 as integer) as
coord_dimension,
- srid, get_type(info, 0) as type
- from tables t, (
- select name, table_id, type_digits AS info, type_scale
AS srid
- from columns
- where type in ( select distinct sqlname from types
where systemname='wkb')
- ) as x
- where t.id=x.table_id
- ) y
- where y.schema_id=s.id and e.name='gdk_dbname';
-GRANT SELECT ON geometry_columns TO PUBLIC;
-update sys._tables set system = true where name in ('geometry_columns') and
schema_id = (select id from schemas where name = 'sys');
+ 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,
+ get_type(c.type_digits, 0) as type
+ from sys.columns c, sys.tables t, sys.schemas s
+ where c.table_id = t.id and t.schema_id = s.id
+ and c.type in (select sqlname from sys.types where systemname in
('wkb', 'wkba'));
+GRANT SELECT ON sys.geometry_columns TO PUBLIC;
+update sys._tables set system = true where name = 'geometry_columns' 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);
set schema "sys";
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
@@ -5424,27 +5424,20 @@ set schema "sys";
Running database upgrade commands:
set schema "sys";
-drop view sys.geometry_columns;
-create view geometry_columns as
- select e.value as f_table_catalog,
+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,
- y.f_table_name, y.f_geometry_column, y.coord_dimension, y.srid,
y.type
- from schemas s, environment e, (
- select t.schema_id,
t.name as f_table_name,
- x.name as f_geometry_column,
- cast(has_z(info)+has_m(info)+2 as integer) as
coord_dimension,
- srid, get_type(info, 0) as type
- from tables t, (
- select name, table_id, type_digits AS info, type_scale
AS srid
- from columns
- where type in ( select distinct sqlname from types
where systemname='wkb')
- ) as x
- where t.id=x.table_id
- ) y
- where y.schema_id=s.id and e.name='gdk_dbname';
-GRANT SELECT ON geometry_columns TO PUBLIC;
-update sys._tables set system = true where name in ('geometry_columns') and
schema_id = (select id from schemas where name = 'sys');
+ 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,
+ get_type(c.type_digits, 0) as type
+ from sys.columns c, sys.tables t, sys.schemas s
+ where c.table_id = t.id and t.schema_id = s.id
+ and c.type in (select sqlname from sys.types where systemname in
('wkb', 'wkba'));
+GRANT SELECT ON sys.geometry_columns TO PUBLIC;
+update sys._tables set system = true where name = 'geometry_columns' 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);
set schema "sys";
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
@@ -5374,27 +5374,20 @@ set schema "sys";
Running database upgrade commands:
set schema "sys";
-drop view sys.geometry_columns;
-create view geometry_columns as
- select e.value as f_table_catalog,
+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,
- y.f_table_name, y.f_geometry_column, y.coord_dimension, y.srid,
y.type
- from schemas s, environment e, (
- select t.schema_id,
t.name as f_table_name,
- x.name as f_geometry_column,
- cast(has_z(info)+has_m(info)+2 as integer) as
coord_dimension,
- srid, get_type(info, 0) as type
- from tables t, (
- select name, table_id, type_digits AS info, type_scale
AS srid
- from columns
- where type in ( select distinct sqlname from types
where systemname='wkb')
- ) as x
- where t.id=x.table_id
- ) y
- where y.schema_id=s.id and e.name='gdk_dbname';
-GRANT SELECT ON geometry_columns TO PUBLIC;
-update sys._tables set system = true where name in ('geometry_columns') and
schema_id = (select id from schemas where name = 'sys');
+ 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,
+ get_type(c.type_digits, 0) as type
+ from sys.columns c, sys.tables t, sys.schemas s
+ where c.table_id = t.id and t.schema_id = s.id
+ and c.type in (select sqlname from sys.types where systemname in
('wkb', 'wkba'));
+GRANT SELECT ON sys.geometry_columns TO PUBLIC;
+update sys._tables set system = true where name = 'geometry_columns' 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);
set schema "sys";
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
@@ -4661,27 +4661,20 @@ set schema "sys";
Running database upgrade commands:
set schema "sys";
-drop view sys.geometry_columns;
-create view geometry_columns as
- select e.value as f_table_catalog,
+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,
- y.f_table_name, y.f_geometry_column, y.coord_dimension, y.srid,
y.type
- from schemas s, environment e, (
- select t.schema_id,
t.name as f_table_name,
- x.name as f_geometry_column,
- cast(has_z(info)+has_m(info)+2 as integer) as
coord_dimension,
- srid, get_type(info, 0) as type
- from tables t, (
- select name, table_id, type_digits AS info, type_scale
AS srid
- from columns
- where type in ( select distinct sqlname from types
where systemname='wkb')
- ) as x
- where t.id=x.table_id
- ) y
- where y.schema_id=s.id and e.name='gdk_dbname';
-GRANT SELECT ON geometry_columns TO PUBLIC;
-update sys._tables set system = true where name in ('geometry_columns') and
schema_id = (select id from schemas where name = 'sys');
+ 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,
+ get_type(c.type_digits, 0) as type
+ from sys.columns c, sys.tables t, sys.schemas s
+ where c.table_id = t.id and t.schema_id = s.id
+ and c.type in (select sqlname from sys.types where systemname in
('wkb', 'wkba'));
+GRANT SELECT ON sys.geometry_columns TO PUBLIC;
+update sys._tables set system = true where name = 'geometry_columns' 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);
set schema "sys";
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
@@ -5424,27 +5424,20 @@ set schema "sys";
Running database upgrade commands:
set schema "sys";
-drop view sys.geometry_columns;
-create view geometry_columns as
- select e.value as f_table_catalog,
+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,
- y.f_table_name, y.f_geometry_column, y.coord_dimension, y.srid,
y.type
- from schemas s, environment e, (
- select t.schema_id,
t.name as f_table_name,
- x.name as f_geometry_column,
- cast(has_z(info)+has_m(info)+2 as integer) as
coord_dimension,
- srid, get_type(info, 0) as type
- from tables t, (
- select name, table_id, type_digits AS info, type_scale
AS srid
- from columns
- where type in ( select distinct sqlname from types
where systemname='wkb')
- ) as x
- where t.id=x.table_id
- ) y
- where y.schema_id=s.id and e.name='gdk_dbname';
-GRANT SELECT ON geometry_columns TO PUBLIC;
-update sys._tables set system = true where name in ('geometry_columns') and
schema_id = (select id from schemas where name = 'sys');
+ 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,
+ get_type(c.type_digits, 0) as type
+ from sys.columns c, sys.tables t, sys.schemas s
+ where c.table_id = t.id and t.schema_id = s.id
+ and c.type in (select sqlname from sys.types where systemname in
('wkb', 'wkba'));
+GRANT SELECT ON sys.geometry_columns TO PUBLIC;
+update sys._tables set system = true where name = 'geometry_columns' 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);
set schema "sys";
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
@@ -5372,27 +5372,20 @@ set schema "testschema";
Running database upgrade commands:
set schema "sys";
-drop view sys.geometry_columns;
-create view geometry_columns as
- select e.value as f_table_catalog,
+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,
- y.f_table_name, y.f_geometry_column, y.coord_dimension, y.srid,
y.type
- from schemas s, environment e, (
- select t.schema_id,
t.name as f_table_name,
- x.name as f_geometry_column,
- cast(has_z(info)+has_m(info)+2 as integer) as
coord_dimension,
- srid, get_type(info, 0) as type
- from tables t, (
- select name, table_id, type_digits AS info, type_scale
AS srid
- from columns
- where type in ( select distinct sqlname from types
where systemname='wkb')
- ) as x
- where t.id=x.table_id
- ) y
- where y.schema_id=s.id and e.name='gdk_dbname';
-GRANT SELECT ON geometry_columns TO PUBLIC;
-update sys._tables set system = true where name in ('geometry_columns') and
schema_id = (select id from schemas where name = 'sys');
+ 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,
+ get_type(c.type_digits, 0) as type
+ from sys.columns c, sys.tables t, sys.schemas s
+ where c.table_id = t.id and t.schema_id = s.id
+ and c.type in (select sqlname from sys.types where systemname in
('wkb', 'wkba'));
+GRANT SELECT ON sys.geometry_columns TO PUBLIC;
+update sys._tables set system = true where name = 'geometry_columns' 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);
set schema "testschema";
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
