Changeset: bad7f2f9d4be for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/bad7f2f9d4be
Modified Files:
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
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-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
sql/test/testdb-previous-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 code.
diffs (truncated from 384 to 300 lines):
diff --git
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
---
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -779,6 +779,12 @@ grant execute on function monthname(date
update sys.functions set system = true where system <> true and name in
('dayname', 'monthname') and schema_id = 2000 and type = (select
function_type_id from sys.function_types where function_type_name = 'Scalar
function');
Running database upgrade commands:
+create function sys.normalize_monetdb_url(u string)
+returns string external name sql.normalize_monetdb_url;
+grant execute on function sys.normalize_monetdb_url(string) to public;
+update sys.functions set system = true where system <> true and name =
'normalize_monetdb_url' and schema_id = 2000;
+update sys._tables set query = sys.normalize_monetdb_url(query) where type in
(5,6);
+Running database upgrade commands:
drop view sys.geometry_columns;
create view sys.geometry_columns as
select cast(null as varchar(1)) as f_table_catalog,
diff --git a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
@@ -762,6 +762,12 @@ grant execute on function monthname(date
update sys.functions set system = true where system <> true and name in
('dayname', 'monthname') and schema_id = 2000 and type = (select
function_type_id from sys.function_types where function_type_name = 'Scalar
function');
Running database upgrade commands:
+create function sys.normalize_monetdb_url(u string)
+returns string external name sql.normalize_monetdb_url;
+grant execute on function sys.normalize_monetdb_url(string) to public;
+update sys.functions set system = true where system <> true and name =
'normalize_monetdb_url' and schema_id = 2000;
+update sys._tables set query = sys.normalize_monetdb_url(query) where type in
(5,6);
+Running database upgrade commands:
drop view sys.geometry_columns;
create view sys.geometry_columns as
select cast(null as varchar(1)) as f_table_catalog,
diff --git
a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -845,6 +845,12 @@ grant execute on function monthname(date
update sys.functions set system = true where system <> true and name in
('dayname', 'monthname') and schema_id = 2000 and type = (select
function_type_id from sys.function_types where function_type_name = 'Scalar
function');
Running database upgrade commands:
+create function sys.normalize_monetdb_url(u string)
+returns string external name sql.normalize_monetdb_url;
+grant execute on function sys.normalize_monetdb_url(string) to public;
+update sys.functions set system = true where system <> true and name =
'normalize_monetdb_url' and schema_id = 2000;
+update sys._tables set query = sys.normalize_monetdb_url(query) where type in
(5,6);
+Running database upgrade commands:
drop view sys.geometry_columns;
create view sys.geometry_columns as
select cast(null as varchar(1)) as f_table_catalog,
diff --git
a/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -779,6 +779,12 @@ grant execute on function monthname(date
update sys.functions set system = true where system <> true and name in
('dayname', 'monthname') and schema_id = 2000 and type = (select
function_type_id from sys.function_types where function_type_name = 'Scalar
function');
Running database upgrade commands:
+create function sys.normalize_monetdb_url(u string)
+returns string external name sql.normalize_monetdb_url;
+grant execute on function sys.normalize_monetdb_url(string) to public;
+update sys.functions set system = true where system <> true and name =
'normalize_monetdb_url' and schema_id = 2000;
+update sys._tables set query = sys.normalize_monetdb_url(query) where type in
(5,6);
+Running database upgrade commands:
drop view sys.geometry_columns;
create view sys.geometry_columns as
select cast(null as varchar(1)) as f_table_catalog,
diff --git a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
@@ -762,6 +762,12 @@ grant execute on function monthname(date
update sys.functions set system = true where system <> true and name in
('dayname', 'monthname') and schema_id = 2000 and type = (select
function_type_id from sys.function_types where function_type_name = 'Scalar
function');
Running database upgrade commands:
+create function sys.normalize_monetdb_url(u string)
+returns string external name sql.normalize_monetdb_url;
+grant execute on function sys.normalize_monetdb_url(string) to public;
+update sys.functions set system = true where system <> true and name =
'normalize_monetdb_url' and schema_id = 2000;
+update sys._tables set query = sys.normalize_monetdb_url(query) where type in
(5,6);
+Running database upgrade commands:
drop view sys.geometry_columns;
create view sys.geometry_columns as
select cast(null as varchar(1)) as f_table_catalog,
diff --git a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
@@ -845,6 +845,12 @@ grant execute on function monthname(date
update sys.functions set system = true where system <> true and name in
('dayname', 'monthname') and schema_id = 2000 and type = (select
function_type_id from sys.function_types where function_type_name = 'Scalar
function');
Running database upgrade commands:
+create function sys.normalize_monetdb_url(u string)
+returns string external name sql.normalize_monetdb_url;
+grant execute on function sys.normalize_monetdb_url(string) to public;
+update sys.functions set system = true where system <> true and name =
'normalize_monetdb_url' and schema_id = 2000;
+update sys._tables set query = sys.normalize_monetdb_url(query) where type in
(5,6);
+Running database upgrade commands:
drop view sys.geometry_columns;
create view sys.geometry_columns as
select cast(null as varchar(1)) as f_table_catalog,
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
@@ -273,6 +273,12 @@ grant execute on function monthname(date
update sys.functions set system = true where system <> true and name in
('dayname', 'monthname') and schema_id = 2000 and type = (select
function_type_id from sys.function_types where function_type_name = 'Scalar
function');
Running database upgrade commands:
+create function sys.normalize_monetdb_url(u string)
+returns string external name sql.normalize_monetdb_url;
+grant execute on function sys.normalize_monetdb_url(string) to public;
+update sys.functions set system = true where system <> true and name =
'normalize_monetdb_url' and schema_id = 2000;
+update sys._tables set query = sys.normalize_monetdb_url(query) where type in
(5,6);
+Running database upgrade commands:
drop view sys.geometry_columns;
create view sys.geometry_columns as
select cast(null as varchar(1)) as f_table_catalog,
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
@@ -273,6 +273,12 @@ grant execute on function monthname(date
update sys.functions set system = true where system <> true and name in
('dayname', 'monthname') and schema_id = 2000 and type = (select
function_type_id from sys.function_types where function_type_name = 'Scalar
function');
Running database upgrade commands:
+create function sys.normalize_monetdb_url(u string)
+returns string external name sql.normalize_monetdb_url;
+grant execute on function sys.normalize_monetdb_url(string) to public;
+update sys.functions set system = true where system <> true and name =
'normalize_monetdb_url' and schema_id = 2000;
+update sys._tables set query = sys.normalize_monetdb_url(query) where type in
(5,6);
+Running database upgrade commands:
drop view sys.geometry_columns;
create view sys.geometry_columns as
select cast(null as varchar(1)) as f_table_catalog,
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
@@ -356,6 +356,12 @@ grant execute on function monthname(date
update sys.functions set system = true where system <> true and name in
('dayname', 'monthname') and schema_id = 2000 and type = (select
function_type_id from sys.function_types where function_type_name = 'Scalar
function');
Running database upgrade commands:
+create function sys.normalize_monetdb_url(u string)
+returns string external name sql.normalize_monetdb_url;
+grant execute on function sys.normalize_monetdb_url(string) to public;
+update sys.functions set system = true where system <> true and name =
'normalize_monetdb_url' and schema_id = 2000;
+update sys._tables set query = sys.normalize_monetdb_url(query) where type in
(5,6);
+Running database upgrade commands:
drop view sys.geometry_columns;
create view sys.geometry_columns as
select cast(null as varchar(1)) as f_table_catalog,
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
@@ -273,6 +273,12 @@ grant execute on function monthname(date
update sys.functions set system = true where system <> true and name in
('dayname', 'monthname') and schema_id = 2000 and type = (select
function_type_id from sys.function_types where function_type_name = 'Scalar
function');
Running database upgrade commands:
+create function sys.normalize_monetdb_url(u string)
+returns string external name sql.normalize_monetdb_url;
+grant execute on function sys.normalize_monetdb_url(string) to public;
+update sys.functions set system = true where system <> true and name =
'normalize_monetdb_url' and schema_id = 2000;
+update sys._tables set query = sys.normalize_monetdb_url(query) where type in
(5,6);
+Running database upgrade commands:
drop view sys.geometry_columns;
create view sys.geometry_columns as
select cast(null as varchar(1)) as f_table_catalog,
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
@@ -273,6 +273,12 @@ grant execute on function monthname(date
update sys.functions set system = true where system <> true and name in
('dayname', 'monthname') and schema_id = 2000 and type = (select
function_type_id from sys.function_types where function_type_name = 'Scalar
function');
Running database upgrade commands:
+create function sys.normalize_monetdb_url(u string)
+returns string external name sql.normalize_monetdb_url;
+grant execute on function sys.normalize_monetdb_url(string) to public;
+update sys.functions set system = true where system <> true and name =
'normalize_monetdb_url' and schema_id = 2000;
+update sys._tables set query = sys.normalize_monetdb_url(query) where type in
(5,6);
+Running database upgrade commands:
drop view sys.geometry_columns;
create view sys.geometry_columns as
select cast(null as varchar(1)) as f_table_catalog,
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
@@ -356,6 +356,12 @@ grant execute on function monthname(date
update sys.functions set system = true where system <> true and name in
('dayname', 'monthname') and schema_id = 2000 and type = (select
function_type_id from sys.function_types where function_type_name = 'Scalar
function');
Running database upgrade commands:
+create function sys.normalize_monetdb_url(u string)
+returns string external name sql.normalize_monetdb_url;
+grant execute on function sys.normalize_monetdb_url(string) to public;
+update sys.functions set system = true where system <> true and name =
'normalize_monetdb_url' and schema_id = 2000;
+update sys._tables set query = sys.normalize_monetdb_url(query) where type in
(5,6);
+Running database upgrade commands:
drop view sys.geometry_columns;
create view sys.geometry_columns as
select cast(null as varchar(1)) as f_table_catalog,
diff --git
a/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -799,6 +799,12 @@ grant execute on function monthname(date
update sys.functions set system = true where system <> true and name in
('dayname', 'monthname') and schema_id = 2000 and type = (select
function_type_id from sys.function_types where function_type_name = 'Scalar
function');
Running database upgrade commands:
+create function sys.normalize_monetdb_url(u string)
+returns string external name sql.normalize_monetdb_url;
+grant execute on function sys.normalize_monetdb_url(string) to public;
+update sys.functions set system = true where system <> true and name =
'normalize_monetdb_url' and schema_id = 2000;
+update sys._tables set query = sys.normalize_monetdb_url(query) where type in
(5,6);
+Running database upgrade commands:
drop view sys.geometry_columns;
create view sys.geometry_columns as
select cast(null as varchar(1)) as f_table_catalog,
diff --git a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
@@ -782,6 +782,12 @@ grant execute on function monthname(date
update sys.functions set system = true where system <> true and name in
('dayname', 'monthname') and schema_id = 2000 and type = (select
function_type_id from sys.function_types where function_type_name = 'Scalar
function');
Running database upgrade commands:
+create function sys.normalize_monetdb_url(u string)
+returns string external name sql.normalize_monetdb_url;
+grant execute on function sys.normalize_monetdb_url(string) to public;
+update sys.functions set system = true where system <> true and name =
'normalize_monetdb_url' and schema_id = 2000;
+update sys._tables set query = sys.normalize_monetdb_url(query) where type in
(5,6);
+Running database upgrade commands:
drop view sys.geometry_columns;
create view sys.geometry_columns as
select cast(null as varchar(1)) as f_table_catalog,
diff --git
a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -865,6 +865,12 @@ grant execute on function monthname(date
update sys.functions set system = true where system <> true and name in
('dayname', 'monthname') and schema_id = 2000 and type = (select
function_type_id from sys.function_types where function_type_name = 'Scalar
function');
Running database upgrade commands:
+create function sys.normalize_monetdb_url(u string)
+returns string external name sql.normalize_monetdb_url;
+grant execute on function sys.normalize_monetdb_url(string) to public;
+update sys.functions set system = true where system <> true and name =
'normalize_monetdb_url' and schema_id = 2000;
+update sys._tables set query = sys.normalize_monetdb_url(query) where type in
(5,6);
+Running database upgrade commands:
drop view sys.geometry_columns;
create view sys.geometry_columns as
select cast(null as varchar(1)) as f_table_catalog,
diff --git
a/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -779,6 +779,12 @@ grant execute on function monthname(date
update sys.functions set system = true where system <> true and name in
('dayname', 'monthname') and schema_id = 2000 and type = (select
function_type_id from sys.function_types where function_type_name = 'Scalar
function');
Running database upgrade commands:
+create function sys.normalize_monetdb_url(u string)
+returns string external name sql.normalize_monetdb_url;
+grant execute on function sys.normalize_monetdb_url(string) to public;
+update sys.functions set system = true where system <> true and name =
'normalize_monetdb_url' and schema_id = 2000;
+update sys._tables set query = sys.normalize_monetdb_url(query) where type in
(5,6);
+Running database upgrade commands:
drop view sys.geometry_columns;
create view sys.geometry_columns as
select cast(null as varchar(1)) as f_table_catalog,
diff --git a/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
b/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
--- a/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
@@ -762,6 +762,12 @@ grant execute on function monthname(date
update sys.functions set system = true where system <> true and name in
('dayname', 'monthname') and schema_id = 2000 and type = (select
function_type_id from sys.function_types where function_type_name = 'Scalar
function');
Running database upgrade commands:
+create function sys.normalize_monetdb_url(u string)
+returns string external name sql.normalize_monetdb_url;
+grant execute on function sys.normalize_monetdb_url(string) to public;
+update sys.functions set system = true where system <> true and name =
'normalize_monetdb_url' and schema_id = 2000;
+update sys._tables set query = sys.normalize_monetdb_url(query) where type in
(5,6);
+Running database upgrade commands:
drop view sys.geometry_columns;
create view sys.geometry_columns as
select cast(null as varchar(1)) as f_table_catalog,
diff --git a/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
@@ -845,6 +845,12 @@ grant execute on function monthname(date
update sys.functions set system = true where system <> true and name in
('dayname', 'monthname') and schema_id = 2000 and type = (select
function_type_id from sys.function_types where function_type_name = 'Scalar
function');
Running database upgrade commands:
+create function sys.normalize_monetdb_url(u string)
+returns string external name sql.normalize_monetdb_url;
+grant execute on function sys.normalize_monetdb_url(string) to public;
+update sys.functions set system = true where system <> true and name =
'normalize_monetdb_url' and schema_id = 2000;
+update sys._tables set query = sys.normalize_monetdb_url(query) where type in
(5,6);
+Running database upgrade commands:
drop view sys.geometry_columns;
create view sys.geometry_columns as
select cast(null as varchar(1)) as f_table_catalog,
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
@@ -273,6 +273,12 @@ grant execute on function monthname(date
update sys.functions set system = true where system <> true and name in
('dayname', 'monthname') and schema_id = 2000 and type = (select
function_type_id from sys.function_types where function_type_name = 'Scalar
function');
Running database upgrade commands:
+create function sys.normalize_monetdb_url(u string)
+returns string external name sql.normalize_monetdb_url;
+grant execute on function sys.normalize_monetdb_url(string) to public;
+update sys.functions set system = true where system <> true and name =
'normalize_monetdb_url' and schema_id = 2000;
+update sys._tables set query = sys.normalize_monetdb_url(query) where type in
(5,6);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]