Changeset: 28aa6622a956 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/28aa6622a956
Modified Files:
sql/backends/monet5/sql_upgrades.c
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-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-chain/Tests/upgrade.stable.out.ppc64.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-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:
sys.similarity is gone.
diffs (truncated from 961 to 300 lines):
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -5603,9 +5603,6 @@ sql_update_jun2023(Client c, mvc *sql, s
"create function
sys.qgramnormalize(x string)\n"
"returns string external name
txtsim.qgramnormalize;\n"
"grant execute on function
qgramnormalize(string) to public;\n"
- "create function sys.similarity(x
string, y string)\n"
- "returns double external name
txtsim.similarity;\n"
- "grant execute on function
similarity(string, string) to public;\n"
"create function asciify(x string)\n"
"returns string external name
str.asciify;\n"
@@ -5647,7 +5644,7 @@ sql_update_jun2023(Client c, mvc *sql, s
"external name str.contains;\n"
"grant execute on filter function
contains(string, string, boolean) to public;\n"
- "update sys.functions set system =
true where system <> true and name in ('levenshtein', 'dameraulevenshtein',
'jarowinkler', 'editdistance', 'editdistance2', 'soundex', 'difference',
'qgramnormalize', 'similarity') and schema_id = 2000 and type = %d;\n"
+ "update sys.functions set system =
true where system <> true and name in ('levenshtein', 'dameraulevenshtein',
'jarowinkler', 'editdistance', 'editdistance2', 'soundex', 'difference',
'qgramnormalize') and schema_id = 2000 and type = %d;\n"
"update sys.functions set system =
true where system <> true and name in ('maxlevenshtein', 'minjarowinkler') and
schema_id = 2000 and type = %d;\n"
"update sys.functions set system =
true where system <> true and name in ('asciify', 'startswith', 'endswith',
'contains') and schema_id = 2000 and type = %d;\n"
"update sys.functions set system =
true where system <> true and name in ('startswith', 'endswith', 'contains')
and schema_id = 2000 and type = %d;\n"
@@ -5850,6 +5847,21 @@ sql_update_default_geom(Client c, mvc *s
return err;
}
+static str
+sql_update_default(Client c, mvc *sql, sql_schema *s)
+{
+ sql_subtype tp;
+ char *err = NULL;
+
+ sql_find_subtype(&tp, "varchar", 0, 0);
+ if (sql_bind_func(sql, s->base.name, "similarity", &tp, &tp, F_FUNC,
true)) {
+ const char *query = "drop function sys.similarity(string,
string) cascade;\n";
+ printf("Running database upgrade commands:\n%s\n", query);
+ err = SQLstatementIntern(c, query, "update", true, false, NULL);
+ }
+ return err;
+}
+
int
SQLupgrades(Client c, mvc *m)
{
@@ -6048,5 +6060,11 @@ SQLupgrades(Client c, mvc *m)
return -1;
}
+ if ((err = sql_update_default(c, m, s)) != NULL) {
+ TRC_CRITICAL(SQL_PARSER, "%s\n", err);
+ freeException(err);
+ return -1;
+ }
+
return 0;
}
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
@@ -364,6 +364,11 @@ update sys.functions set system = true w
delete from sys.triggers where name = 'system_update_tables' and table_id =
2067;
Running database upgrade commands:
+drop procedure if exists SHPattach(string) cascade;
+drop procedure if exists SHPload(integer) cascade;
+drop procedure if exists SHPload(integer, geometry) cascade;
+
+Running database upgrade commands:
create procedure SHPLoad(fname string, schemaname string, tablename string)
external name shp.load;
create procedure SHPLoad(fname string, tablename string) external name
shp.load;
update sys.functions set system = true where schema_id = 2000 and name in
('shpload');
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
@@ -364,6 +364,11 @@ update sys.functions set system = true w
delete from sys.triggers where name = 'system_update_tables' and table_id =
2067;
Running database upgrade commands:
+drop procedure if exists SHPattach(string) cascade;
+drop procedure if exists SHPload(integer) cascade;
+drop procedure if exists SHPload(integer, geometry) cascade;
+
+Running database upgrade commands:
create procedure SHPLoad(fname string, schemaname string, tablename string)
external name shp.load;
create procedure SHPLoad(fname string, tablename string) external name
shp.load;
update sys.functions set system = true where schema_id = 2000 and name in
('shpload');
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
@@ -433,6 +433,11 @@ update sys.functions set system = true w
delete from sys.triggers where name = 'system_update_tables' and table_id =
2067;
Running database upgrade commands:
+drop procedure if exists SHPattach(string) cascade;
+drop procedure if exists SHPload(integer) cascade;
+drop procedure if exists SHPload(integer, geometry) cascade;
+
+Running database upgrade commands:
create procedure SHPLoad(fname string, schemaname string, tablename string)
external name shp.load;
create procedure SHPLoad(fname string, tablename string) external name
shp.load;
update sys.functions set system = true where schema_id = 2000 and name in
('shpload');
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
@@ -0,0 +1,58 @@
+Running database upgrade commands to update system tables.
+
+Running database upgrade commands:
+drop procedure if exists SHPattach(string) cascade;
+drop procedure if exists SHPload(integer) cascade;
+drop procedure if exists SHPload(integer, geometry) cascade;
+
+Running database upgrade commands:
+create procedure SHPLoad(fname string, schemaname string, tablename string)
external name shp.load;
+create procedure SHPLoad(fname string, tablename string) external name
shp.load;
+update sys.functions set system = true where schema_id = 2000 and name in
('shpload');
+Running database upgrade commands:
+drop function if exists sys.st_intersects(geometry, geometry) cascade;
+drop function if exists sys.st_dwithin(geometry, geometry, double) cascade;
+drop view if exists sys.geometry_columns cascade;
+drop function if exists sys.st_collect(geometry, geometry) cascade;
+drop aggregate if exists sys.st_collect(geometry) cascade;
+drop aggregate if exists sys.st_makeline(geometry) 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,
+ 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 geometry_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;
+CREATE FUNCTION ST_Collect(geom1 Geometry, geom2 Geometry) RETURNS Geometry
EXTERNAL NAME geom."Collect";
+GRANT EXECUTE ON FUNCTION ST_Collect(Geometry, Geometry) TO PUBLIC;
+CREATE AGGREGATE ST_Collect(geom Geometry) RETURNS Geometry external name
aggr."Collect";
+GRANT EXECUTE ON AGGREGATE ST_Collect(Geometry) TO PUBLIC;
+CREATE FUNCTION ST_DistanceGeographic(geom1 Geometry, geom2 Geometry) RETURNS
double EXTERNAL NAME geom."DistanceGeographic";
+GRANT EXECUTE ON FUNCTION ST_DistanceGeographic(Geometry, Geometry) TO PUBLIC;
+CREATE FILTER FUNCTION ST_DWithinGeographic(geom1 Geometry, geom2 Geometry,
distance double) EXTERNAL NAME geom."DWithinGeographic";
+GRANT EXECUTE ON FILTER ST_DWithinGeographic(Geometry, Geometry, double) TO
PUBLIC;
+CREATE FILTER FUNCTION ST_DWithin(geom1 Geometry, geom2 Geometry, distance
double) EXTERNAL NAME rtree."DWithin";
+GRANT EXECUTE ON FILTER ST_DWithin(Geometry, Geometry, double) TO PUBLIC;
+CREATE FILTER FUNCTION ST_DWithin_NoIndex(geom1 Geometry, geom2 Geometry,
distance double) EXTERNAL NAME geom."DWithin_noindex";
+GRANT EXECUTE ON FILTER ST_DWithin_NoIndex(Geometry, Geometry, double) TO
PUBLIC;
+CREATE FUNCTION ST_DWithin2(geom1 Geometry, geom2 Geometry, bbox1 mbr, bbox2
mbr, dst double) RETURNS boolean EXTERNAL NAME geom."DWithin2";
+GRANT EXECUTE ON FUNCTION ST_DWithin2(Geometry, Geometry, mbr, mbr, double) TO
PUBLIC;
+CREATE FILTER FUNCTION ST_IntersectsGeographic(geom1 Geometry, geom2 Geometry)
EXTERNAL NAME geom."IntersectsGeographic";
+GRANT EXECUTE ON FILTER ST_IntersectsGeographic(Geometry, Geometry) TO PUBLIC;
+CREATE FILTER FUNCTION ST_Intersects(geom1 Geometry, geom2 Geometry) EXTERNAL
NAME rtree."Intersects";
+GRANT EXECUTE ON FILTER ST_Intersects(Geometry, Geometry) TO PUBLIC;
+CREATE FILTER FUNCTION ST_Intersects_NoIndex(geom1 Geometry, geom2 Geometry)
EXTERNAL NAME geom."Intersects_noindex";
+GRANT EXECUTE ON FILTER ST_Intersects_NoIndex(Geometry, Geometry) TO PUBLIC;
+CREATE AGGREGATE ST_MakeLine(geom Geometry) RETURNS Geometry external name
aggr."MakeLine";
+GRANT EXECUTE ON AGGREGATE ST_MakeLine(Geometry) TO PUBLIC;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('st_collect', 'st_distancegeographic',
'st_dwithingeographic', 'st_dwithin', 'st_dwithin_noindex', 'st_dwithin2',
'st_intersectsgeographic', 'st_intersects', 'st_intersects_noindex',
'st_makeline');
+update sys._tables set system = true where system <> true and schema_id = 2000
and name = 'geometry_columns';
+
+Running database upgrade commands:
+drop function sys.similarity(string, string) cascade;
+
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
@@ -416,3 +416,59 @@ GRANT EXECUTE ON AGGREGATE ST_MakeLine(G
update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('st_collect', 'st_distancegeographic',
'st_dwithingeographic', 'st_dwithin', 'st_dwithin_noindex', 'st_dwithin2',
'st_intersectsgeographic', 'st_intersects', 'st_intersects_noindex',
'st_makeline');
update sys._tables set system = true where system <> true and schema_id = 2000
and name = 'geometry_columns';
+Running database upgrade commands:
+drop procedure if exists SHPattach(string) cascade;
+drop procedure if exists SHPload(integer) cascade;
+drop procedure if exists SHPload(integer, geometry) cascade;
+
+Running database upgrade commands:
+create procedure SHPLoad(fname string, schemaname string, tablename string)
external name shp.load;
+create procedure SHPLoad(fname string, tablename string) external name
shp.load;
+update sys.functions set system = true where schema_id = 2000 and name in
('shpload');
+Running database upgrade commands:
+drop function if exists sys.st_intersects(geometry, geometry) cascade;
+drop function if exists sys.st_dwithin(geometry, geometry, double) cascade;
+drop view if exists sys.geometry_columns cascade;
+drop function if exists sys.st_collect(geometry, geometry) cascade;
+drop aggregate if exists sys.st_collect(geometry) cascade;
+drop aggregate if exists sys.st_makeline(geometry) 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,
+ 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 geometry_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;
+CREATE FUNCTION ST_Collect(geom1 Geometry, geom2 Geometry) RETURNS Geometry
EXTERNAL NAME geom."Collect";
+GRANT EXECUTE ON FUNCTION ST_Collect(Geometry, Geometry) TO PUBLIC;
+CREATE AGGREGATE ST_Collect(geom Geometry) RETURNS Geometry external name
aggr."Collect";
+GRANT EXECUTE ON AGGREGATE ST_Collect(Geometry) TO PUBLIC;
+CREATE FUNCTION ST_DistanceGeographic(geom1 Geometry, geom2 Geometry) RETURNS
double EXTERNAL NAME geom."DistanceGeographic";
+GRANT EXECUTE ON FUNCTION ST_DistanceGeographic(Geometry, Geometry) TO PUBLIC;
+CREATE FILTER FUNCTION ST_DWithinGeographic(geom1 Geometry, geom2 Geometry,
distance double) EXTERNAL NAME geom."DWithinGeographic";
+GRANT EXECUTE ON FILTER ST_DWithinGeographic(Geometry, Geometry, double) TO
PUBLIC;
+CREATE FILTER FUNCTION ST_DWithin(geom1 Geometry, geom2 Geometry, distance
double) EXTERNAL NAME rtree."DWithin";
+GRANT EXECUTE ON FILTER ST_DWithin(Geometry, Geometry, double) TO PUBLIC;
+CREATE FILTER FUNCTION ST_DWithin_NoIndex(geom1 Geometry, geom2 Geometry,
distance double) EXTERNAL NAME geom."DWithin_noindex";
+GRANT EXECUTE ON FILTER ST_DWithin_NoIndex(Geometry, Geometry, double) TO
PUBLIC;
+CREATE FUNCTION ST_DWithin2(geom1 Geometry, geom2 Geometry, bbox1 mbr, bbox2
mbr, dst double) RETURNS boolean EXTERNAL NAME geom."DWithin2";
+GRANT EXECUTE ON FUNCTION ST_DWithin2(Geometry, Geometry, mbr, mbr, double) TO
PUBLIC;
+CREATE FILTER FUNCTION ST_IntersectsGeographic(geom1 Geometry, geom2 Geometry)
EXTERNAL NAME geom."IntersectsGeographic";
+GRANT EXECUTE ON FILTER ST_IntersectsGeographic(Geometry, Geometry) TO PUBLIC;
+CREATE FILTER FUNCTION ST_Intersects(geom1 Geometry, geom2 Geometry) EXTERNAL
NAME rtree."Intersects";
+GRANT EXECUTE ON FILTER ST_Intersects(Geometry, Geometry) TO PUBLIC;
+CREATE FILTER FUNCTION ST_Intersects_NoIndex(geom1 Geometry, geom2 Geometry)
EXTERNAL NAME geom."Intersects_noindex";
+GRANT EXECUTE ON FILTER ST_Intersects_NoIndex(Geometry, Geometry) TO PUBLIC;
+CREATE AGGREGATE ST_MakeLine(geom Geometry) RETURNS Geometry external name
aggr."MakeLine";
+GRANT EXECUTE ON AGGREGATE ST_MakeLine(Geometry) TO PUBLIC;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('st_collect', 'st_distancegeographic',
'st_dwithingeographic', 'st_dwithin', 'st_dwithin_noindex', 'st_dwithin2',
'st_intersectsgeographic', 'st_intersects', 'st_intersects_noindex',
'st_makeline');
+update sys._tables set system = true where system <> true and schema_id = 2000
and name = 'geometry_columns';
+
+Running database upgrade commands:
+drop function sys.similarity(string, string) cascade;
+
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
@@ -69,3 +69,59 @@ update sys.functions set system = true w
update sys.functions set system = true where system <> true and name in
('stddev_samp', 'stddev_pop', 'var_samp', 'covar_samp', 'var_pop', 'covar_pop',
'corr') and schema_id = (select id from sys.schemas where name = 'sys') and
type = 6;
update sys.functions set system = true where system <> true and name =
'filter' and schema_id = (select id from sys.schemas where name = 'json') and
type = 1;
+Running database upgrade commands:
+drop procedure if exists SHPattach(string) cascade;
+drop procedure if exists SHPload(integer) cascade;
+drop procedure if exists SHPload(integer, geometry) cascade;
+
+Running database upgrade commands:
+create procedure SHPLoad(fname string, schemaname string, tablename string)
external name shp.load;
+create procedure SHPLoad(fname string, tablename string) external name
shp.load;
+update sys.functions set system = true where schema_id = 2000 and name in
('shpload');
+Running database upgrade commands:
+drop function if exists sys.st_intersects(geometry, geometry) cascade;
+drop function if exists sys.st_dwithin(geometry, geometry, double) cascade;
+drop view if exists sys.geometry_columns cascade;
+drop function if exists sys.st_collect(geometry, geometry) cascade;
+drop aggregate if exists sys.st_collect(geometry) cascade;
+drop aggregate if exists sys.st_makeline(geometry) 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,
+ 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 geometry_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;
+CREATE FUNCTION ST_Collect(geom1 Geometry, geom2 Geometry) RETURNS Geometry
EXTERNAL NAME geom."Collect";
+GRANT EXECUTE ON FUNCTION ST_Collect(Geometry, Geometry) TO PUBLIC;
+CREATE AGGREGATE ST_Collect(geom Geometry) RETURNS Geometry external name
aggr."Collect";
+GRANT EXECUTE ON AGGREGATE ST_Collect(Geometry) TO PUBLIC;
+CREATE FUNCTION ST_DistanceGeographic(geom1 Geometry, geom2 Geometry) RETURNS
double EXTERNAL NAME geom."DistanceGeographic";
+GRANT EXECUTE ON FUNCTION ST_DistanceGeographic(Geometry, Geometry) TO PUBLIC;
+CREATE FILTER FUNCTION ST_DWithinGeographic(geom1 Geometry, geom2 Geometry,
distance double) EXTERNAL NAME geom."DWithinGeographic";
+GRANT EXECUTE ON FILTER ST_DWithinGeographic(Geometry, Geometry, double) TO
PUBLIC;
+CREATE FILTER FUNCTION ST_DWithin(geom1 Geometry, geom2 Geometry, distance
double) EXTERNAL NAME rtree."DWithin";
+GRANT EXECUTE ON FILTER ST_DWithin(Geometry, Geometry, double) TO PUBLIC;
+CREATE FILTER FUNCTION ST_DWithin_NoIndex(geom1 Geometry, geom2 Geometry,
distance double) EXTERNAL NAME geom."DWithin_noindex";
+GRANT EXECUTE ON FILTER ST_DWithin_NoIndex(Geometry, Geometry, double) TO
PUBLIC;
+CREATE FUNCTION ST_DWithin2(geom1 Geometry, geom2 Geometry, bbox1 mbr, bbox2
mbr, dst double) RETURNS boolean EXTERNAL NAME geom."DWithin2";
+GRANT EXECUTE ON FUNCTION ST_DWithin2(Geometry, Geometry, mbr, mbr, double) TO
PUBLIC;
+CREATE FILTER FUNCTION ST_IntersectsGeographic(geom1 Geometry, geom2 Geometry)
EXTERNAL NAME geom."IntersectsGeographic";
+GRANT EXECUTE ON FILTER ST_IntersectsGeographic(Geometry, Geometry) TO PUBLIC;
+CREATE FILTER FUNCTION ST_Intersects(geom1 Geometry, geom2 Geometry) EXTERNAL
NAME rtree."Intersects";
+GRANT EXECUTE ON FILTER ST_Intersects(Geometry, Geometry) TO PUBLIC;
+CREATE FILTER FUNCTION ST_Intersects_NoIndex(geom1 Geometry, geom2 Geometry)
EXTERNAL NAME geom."Intersects_noindex";
+GRANT EXECUTE ON FILTER ST_Intersects_NoIndex(Geometry, Geometry) TO PUBLIC;
+CREATE AGGREGATE ST_MakeLine(geom Geometry) RETURNS Geometry external name
aggr."MakeLine";
+GRANT EXECUTE ON AGGREGATE ST_MakeLine(Geometry) TO PUBLIC;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('st_collect', 'st_distancegeographic',
'st_dwithingeographic', 'st_dwithin', 'st_dwithin_noindex', 'st_dwithin2',
'st_intersectsgeographic', 'st_intersects', 'st_intersects_noindex',
'st_makeline');
+update sys._tables set system = true where system <> true and schema_id = 2000
and name = 'geometry_columns';
+
+Running database upgrade commands:
+drop function sys.similarity(string, string) cascade;
+
diff --git
a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
@@ -69,3 +69,59 @@ update sys.functions set system = true w
update sys.functions set system = true where system <> true and name in
('stddev_samp', 'stddev_pop', 'var_samp', 'covar_samp', 'var_pop', 'covar_pop',
'corr') and schema_id = (select id from sys.schemas where name = 'sys') and
type = 6;
update sys.functions set system = true where system <> true and name =
'filter' and schema_id = (select id from sys.schemas where name = 'json') and
type = 1;
+Running database upgrade commands:
+drop procedure if exists SHPattach(string) cascade;
+drop procedure if exists SHPload(integer) cascade;
+drop procedure if exists SHPload(integer, geometry) cascade;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
