Changeset: b1aba12865e9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b1aba12865e9
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/Tests/upgrade.stable.out
Branch: Jun2016
Log Message:
Upgrade approvals.
diffs (truncated from 4280 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
@@ -26,13 +26,6 @@ stdout of test 'upgrade` in directory 's
Ready.
Running database upgrade commands:
set schema "sys";
-create function sys."epoch"(sec INT) returns TIMESTAMP external name
timestamp."epoch";
-create function sys."epoch"(ts TIMESTAMP) returns INT external name
timestamp."epoch";
-insert into sys.systemfunctions (select id from sys.functions where name =
'epoch' and schema_id = (select id from sys.schemas where name = 'sys') and id
not in (select function_id from sys.systemfunctions));
-set schema "sys";
-
-Running database upgrade commands:
-set schema "sys";
grant execute on filter function "like"(string, string, string) to public;
grant execute on filter function "ilike"(string, string, string) to public;
grant execute on filter function "like"(string, string) to public;
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
@@ -26,13 +26,6 @@ stdout of test 'upgrade` in directory 's
Ready.
Running database upgrade commands:
set schema "sys";
-create function sys."epoch"(sec INT) returns TIMESTAMP external name
timestamp."epoch";
-create function sys."epoch"(ts TIMESTAMP) returns INT external name
timestamp."epoch";
-insert into sys.systemfunctions (select id from sys.functions where name =
'epoch' and schema_id = (select id from sys.schemas where name = 'sys') and id
not in (select function_id from sys.systemfunctions));
-set schema "sys";
-
-Running database upgrade commands:
-set schema "sys";
grant execute on filter function "like"(string, string, string) to public;
grant execute on filter function "ilike"(string, string, string) to public;
grant execute on filter function "like"(string, string) to public;
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
@@ -64,20 +64,13 @@ from sys.storagemodel() group by "schema
insert into sys.systemfunctions (select id from sys.functions where name in
('fuse', 'generate_series', 'stddev_samp', 'stddev_pop', 'var_samp', 'var_pop',
'median', 'quantile', 'corr') and schema_id = (select id from sys.schemas where
name = 'sys') and id not in (select function_id from sys.systemfunctions));
insert into sys.systemfunctions (select id from sys.functions where name =
'filter' and schema_id = (select id from sys.schemas where name = 'json') and
id not in (select function_id from sys.systemfunctions));
update sys._tables set system = true where name = 'tablestoragemodel' and
schema_id = (select id from sys.schemas where name = 'sys');
-insert into sys.types values(7513, 'hge', 'hugeint', 128, 1, 2, 6, 0);
-insert into sys.types values(7514, 'hge', 'decimal', 39, 1, 10, 8, 0);
+insert into sys.types values(7521, 'hge', 'hugeint', 128, 1, 2, 6, 0);
+insert into sys.types values(7522, 'hge', 'decimal', 39, 1, 10, 8, 0);
update sys.types set digits = 18 where systemname = 'lng' and sqlname =
'decimal';
set schema "sys";
Running database upgrade commands:
set schema "sys";
-create function sys."epoch"(sec INT) returns TIMESTAMP external name
timestamp."epoch";
-create function sys."epoch"(ts TIMESTAMP) returns INT external name
timestamp."epoch";
-insert into sys.systemfunctions (select id from sys.functions where name =
'epoch' and schema_id = (select id from sys.schemas where name = 'sys') and id
not in (select function_id from sys.systemfunctions));
-set schema "sys";
-
-Running database upgrade commands:
-set schema "sys";
grant execute on filter function "like"(string, string, string) to public;
grant execute on filter function "ilike"(string, string, string) to public;
grant execute on filter function "like"(string, string) to public;
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
@@ -24,11 +24,4213 @@ stdout of test 'upgrade` in directory 's
# MonetDB/R module loaded
Ready.
+Running database upgrade commands:
+set schema "sys";
+grant execute on filter function "like"(string, string, string) to public;
+grant execute on filter function "ilike"(string, string, string) to public;
+grant execute on filter function "like"(string, string) to public;
+grant execute on filter function "ilike"(string, string) to public;
+grant execute on function degrees to public;
+grant execute on function radians to public;
+grant execute on procedure times to public;
+grant execute on function str_to_date to public;
+grant execute on function date_to_str to public;
+grant execute on function str_to_time to public;
+grant execute on function time_to_str to public;
+grant execute on function str_to_timestamp to public;
+grant execute on function timestamp_to_str to public;
+grant execute on function sys."epoch"(BIGINT) to public;
+grant execute on function sys."epoch"(INT) to public;
+grant execute on function sys."epoch"(TIMESTAMP) to public;
+grant execute on function sys."epoch"(TIMESTAMP WITH TIME ZONE) to public;
+grant execute on function MS_STUFF to public;
+grant execute on function MS_TRUNC to public;
+grant execute on function MS_ROUND to public;
+grant execute on function MS_STR to public;
+grant execute on function alpha to public;
+grant execute on function zorder_encode to public;
+grant execute on function zorder_decode_x to public;
+grant execute on function zorder_decode_y to public;
+grant execute on function rejects to public;
+grant execute on function md5 to public;
+create function sys."storage"( sname string)
+returns table (
+ "schema" string,
+ "table" string,
+ "column" string,
+ "type" string,
+ "mode" string,
+ location string,
+ "count" bigint,
+ typewidth int,
+ columnsize bigint,
+ heapsize bigint,
+ hashes bigint,
+ phash boolean,
+ imprints bigint,
+ sorted boolean
+)
+external name sql."storage";
+create function sys."storage"( sname string, tname string)
+returns table (
+ "schema" string,
+ "table" string,
+ "column" string,
+ "type" string,
+ "mode" string,
+ location string,
+ "count" bigint,
+ typewidth int,
+ columnsize bigint,
+ heapsize bigint,
+ hashes bigint,
+ phash boolean,
+ imprints bigint,
+ sorted boolean
+)
+external name sql."storage";
-# 16:53:31 >
-# 16:53:31 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-30908" "--port=39660"
-# 16:53:31 >
+create function sys."storage"( sname string, tname string, cname string)
+returns table (
+ "schema" string,
+ "table" string,
+ "column" string,
+ "type" string,
+ "mode" string,
+ location string,
+ "count" bigint,
+ typewidth int,
+ columnsize bigint,
+ heapsize bigint,
+ hashes bigint,
+ phash boolean,
+ imprints bigint,
+ sorted boolean
+)
+external name sql."storage";
+insert into sys.systemfunctions (select id from sys.functions where name =
'storage' and schema_id = (select id from sys.schemas where name = 'sys') and
id not in (select function_id from sys.systemfunctions));
+UPDATE sys.types SET schema_id = (SELECT id FROM sys.schemas WHERE name =
'sys') WHERE schema_id = 0 AND schema_id NOT IN (SELECT id from sys.schemas);
+UPDATE sys.functions SET schema_id = (SELECT id FROM sys.schemas WHERE name =
'sys') WHERE schema_id = 0 AND schema_id NOT IN (SELECT id from sys.schemas);
+set schema "sys";
+
+Running database upgrade commands:
+set schema "sys";
+drop function "mbr";
+drop function "mbroverlaps";
+drop function "geomfromtext";
+drop function "pointfromtext";
+drop function "linefromtext";
+drop function "polyfromtext";
+drop function "mpointfromtext";
+drop function "mlinefromtext";
+drop function "mpolyfromtext";
+drop function "geomcollectionfromtext";
+drop function "polygonfromtext";
+drop function "astext";
+drop function "x";
+drop function "y";
+drop function "point";drop function "dimension";drop function
"geometrytypeid";drop function "srid";drop function "envelope";drop function
"isempty";drop function "issimple";drop function "boundary";drop function
"equals";drop function "disjoint";drop function "Intersect";drop function
"touches";drop function "crosses";drop function "within";drop all function
"contains";drop function "overlaps";drop function "relate";drop function
"area";drop function "length";drop function "distance";drop function
"buffer";drop function "convexhull";drop function "intersection";drop function
"Union";drop function "difference";drop function "symdifference";drop type
"point";
+drop type "curve";
+drop type "linestring";
+drop type "surface";
+drop type "polygon";
+drop type "multipoint";
+drop type "multicurve";
+drop type "multilinestring";
+drop type "multisurface";
+drop type "multipolygon";
+drop type "geomcollection";
+CREATE FUNCTION Has_Z(info integer) RETURNS integer EXTERNAL NAME geom."hasZ";
+CREATE FUNCTION Has_M(info integer) RETURNS integer EXTERNAL NAME geom."hasM";
+CREATE FUNCTION get_type(info integer, format integer) RETURNS string EXTERNAL
NAME geom."getType";
+CREATE TABLE spatial_ref_sys (srid INTEGER NOT NULL PRIMARY KEY, auth_name
VARCHAR (256), auth_srid INTEGER, srtext VARCHAR (2048), proj4text VARCHAR
(2048));
+CREATE VIEW geometry_columns AS
+ SELECT e.value 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,
+ has_z(info)+has_m(info)+2 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';
+CREATE FUNCTION mbr(geom Geometry) RETURNS mbr external name geom."mbr";
+CREATE FUNCTION ST_Overlaps(box1 mbr, box2 mbr) RETURNS boolean EXTERNAL NAME
geom."mbrOverlaps";
+CREATE FUNCTION ST_Contains(box1 mbr, box2 mbr) RETURNS boolean EXTERNAL NAME
geom."mbrContains";
+CREATE FUNCTION ST_Equals(box1 mbr, box2 mbr) RETURNS boolean EXTERNAL NAME
geom."mbrEqual";
+CREATE FUNCTION ST_Distance(box1 mbr, box2 mbr) RETURNS double EXTERNAL NAME
geom."mbrDistance";
+CREATE FUNCTION ST_WKTToSQL(wkt string) RETURNS Geometry external name
geom."GeomFromText";
+CREATE FUNCTION ST_WKBToSQL(geom string) RETURNS Geometry EXTERNAL NAME
geom."FromBinary";
+CREATE FUNCTION ST_AsText(geom Geometry) RETURNS string EXTERNAL NAME
geom."AsText";
+CREATE FUNCTION ST_AsBinary(geom Geometry) RETURNS string EXTERNAL NAME
geom."AsBinary";
+CREATE FUNCTION ST_Dimension(geom Geometry) RETURNS integer EXTERNAL NAME
geom."Dimension";
+CREATE FUNCTION ST_GeometryType(geom Geometry) RETURNS string EXTERNAL NAME
geom."GeometryType2";
+CREATE FUNCTION ST_SRID(geom Geometry) RETURNS integer EXTERNAL NAME
geom."getSRID";
+CREATE FUNCTION ST_SetSRID(geom Geometry, srid integer) RETURNS Geometry
EXTERNAL NAME geom."setSRID";
+CREATE FUNCTION ST_IsEmpty(geom Geometry) RETURNS boolean EXTERNAL NAME
geom."IsEmpty";
+CREATE FUNCTION ST_IsSimple(geom Geometry) RETURNS boolean EXTERNAL NAME
geom."IsSimple";
+CREATE FUNCTION ST_Boundary(geom Geometry) RETURNS Geometry EXTERNAL NAME
geom."Boundary";
+CREATE FUNCTION ST_Envelope(geom Geometry) RETURNS Geometry EXTERNAL NAME
geom."Envelope";
+CREATE FUNCTION ST_Equals(geom1 Geometry, geom2 Geometry) RETURNS boolean
EXTERNAL NAME geom."Equals";
+CREATE FUNCTION ST_Disjoint(geom1 Geometry, geom2 Geometry) RETURNS boolean
EXTERNAL NAME geom."Disjoint";
+CREATE FUNCTION ST_Intersects(geom1 Geometry, geom2 Geometry) RETURNS boolean
EXTERNAL NAME geom."Intersects";
+CREATE FUNCTION ST_Touches(geom1 Geometry, geom2 Geometry) RETURNS boolean
EXTERNAL NAME geom."Touches";
+CREATE FUNCTION ST_Crosses(geom1 Geometry, geom2 Geometry) RETURNS boolean
EXTERNAL NAME geom."Crosses";
+CREATE FUNCTION ST_Within(geom1 Geometry, geom2 Geometry) RETURNS boolean
EXTERNAL NAME geom."Within";
+CREATE FUNCTION ST_Contains(geom1 Geometry, geom2 Geometry) RETURNS boolean
EXTERNAL NAME geom."Contains";
+CREATE FUNCTION ST_Overlaps(geom1 Geometry, geom2 Geometry) RETURNS boolean
EXTERNAL NAME geom."Overlaps";
+CREATE FUNCTION ST_Relate(geom1 Geometry, geom2 Geometry,
intersection_matrix_pattern string) RETURNS boolean EXTERNAL NAME geom."Relate";
+CREATE FUNCTION ST_Distance(geom1 Geometry, geom2 Geometry) RETURNS double
EXTERNAL NAME geom."Distance";
+CREATE FUNCTION ST_Intersection(geom1 Geometry, geom2 Geometry) RETURNS
Geometry EXTERNAL NAME geom."Intersection";
+CREATE FUNCTION ST_Difference(geom1 Geometry, geom2 Geometry) RETURNS Geometry
EXTERNAL NAME geom."Difference";
+CREATE FUNCTION ST_Union(geom1 Geometry, geom2 Geometry) RETURNS Geometry
EXTERNAL NAME geom."Union";
+CREATE AGGREGATE ST_Union(geom Geometry) RETURNS Geometry external name
geom."Union";
+CREATE FUNCTION ST_SymDifference(geom1 Geometry, geom2 Geometry) RETURNS
Geometry EXTERNAL NAME geom."SymDifference";
+CREATE FUNCTION ST_Buffer(geom Geometry, radius double) RETURNS Geometry
EXTERNAL NAME geom."Buffer";
+CREATE FUNCTION ST_ConvexHull(geom Geometry) RETURNS Geometry EXTERNAL NAME
geom."ConvexHull";
+CREATE FUNCTION ST_X(geom Geometry) RETURNS double EXTERNAL NAME geom."X";
+CREATE FUNCTION ST_Y(geom Geometry) RETURNS double EXTERNAL NAME geom."Y";
+CREATE FUNCTION ST_Z(geom Geometry) RETURNS double EXTERNAL NAME geom."Z";
+CREATE FUNCTION ST_StartPoint(geom Geometry) RETURNS Geometry EXTERNAL NAME
geom."StartPoint";
+CREATE FUNCTION ST_EndPoint(geom Geometry) RETURNS Geometry EXTERNAL NAME
geom."EndPoint";
+CREATE FUNCTION ST_IsRing(geom Geometry) RETURNS boolean EXTERNAL NAME
geom."IsRing";
+CREATE FUNCTION ST_Length(geom Geometry) RETURNS double EXTERNAL NAME
geom."Length";
+CREATE FUNCTION ST_IsClosed(geom Geometry) RETURNS boolean EXTERNAL NAME
geom."IsClosed";
+CREATE FUNCTION ST_NumPoints(geom Geometry) RETURNS integer EXTERNAL NAME
geom."NumPoints";
+CREATE FUNCTION ST_PointN(geom Geometry, positionNum integer) RETURNS Geometry
EXTERNAL NAME geom."PointN";
+CREATE FUNCTION ST_Centroid(geom Geometry) RETURNS Geometry EXTERNAL NAME
geom."Centroid";
+CREATE FUNCTION ST_PointOnSurface(geom Geometry) RETURNS Geometry EXTERNAL
NAME geom."PointOnSurface";
+CREATE FUNCTION ST_Area(geom Geometry) RETURNS double EXTERNAL NAME
geom."Area";
+CREATE FUNCTION ST_ExteriorRing(geom Geometry) RETURNS Geometry EXTERNAL NAME
geom."ExteriorRing";
+CREATE FUNCTION ST_SetExteriorRing(geom Geometry) RETURNS Geometry external
name geom."MakePolygon";
+CREATE FUNCTION ST_NumInteriorRing(geom Geometry) RETURNS integer EXTERNAL
NAME geom."NumInteriorRings";
+CREATE FUNCTION ST_InteriorRingN(geom Geometry, positionNum integer) RETURNS
Geometry EXTERNAL NAME geom."InteriorRingN";
+CREATE FUNCTION ST_InteriorRings(geom Geometry) RETURNS GeometryA EXTERNAL
NAME geom."InteriorRings";
+CREATE FUNCTION ST_NumGeometries(geom Geometry) RETURNS integer EXTERNAL NAME
geom."NumGeometries";
+CREATE FUNCTION ST_GeometryN(geom Geometry, positionNum integer) RETURNS
Geometry EXTERNAL NAME geom."GeometryN";
+CREATE FUNCTION ST_NumPatches(geom Geometry) RETURNS integer
+BEGIN
+ RETURN SELECT ST_NumGeometries(geom);
+END;
+CREATE FUNCTION ST_PatchN(geom Geometry, patchNum integer) RETURNS Geometry
+BEGIN
+ RETURN SELECT ST_GeometryN(geom, patchNum);
+END;
+CREATE FUNCTION ST_GeomFromText(wkt string, srid integer) RETURNS Geometry
EXTERNAL NAME geom."GeomFromText";
+CREATE FUNCTION ST_PointFromText(wkt string, srid integer) RETURNS Geometry
EXTERNAL NAME geom."PointFromText";
+CREATE FUNCTION ST_LineFromText(wkt string, srid integer) RETURNS Geometry
EXTERNAL NAME geom."LineFromText";
+CREATE FUNCTION ST_PolygonFromText(wkt string, srid integer) RETURNS Geometry
EXTERNAL NAME geom."PolygonFromText";
+CREATE FUNCTION ST_MPointFromText(wkt string, srid integer) RETURNS Geometry
EXTERNAL NAME geom."MPointFromText";
+CREATE FUNCTION ST_MLineFromText(wkt string, srid integer) RETURNS Geometry
EXTERNAL NAME geom."MLineFromText";
+CREATE FUNCTION ST_MPolyFromText(wkt string, srid integer) RETURNS Geometry
EXTERNAL NAME geom."MPolyFromText";
+CREATE FUNCTION ST_GeomCollFromText(wkt string, srid integer) RETURNS Geometry
EXTERNAL NAME geom."GeomCollFromText";
+CREATE FUNCTION ST_BdPolyFromText(wkt string, srid integer) RETURNS Geometry
external name geom."BdPolyFromText";
+CREATE FUNCTION ST_BdMPolyFromText(wkt string, srid integer) RETURNS Geometry
external name geom."BdMPolyFromText";
+CREATE FUNCTION ST_GeometryFromText(wkt string, srid integer) RETURNS Geometry
EXTERNAL NAME geom."GeomFromText";
+CREATE FUNCTION ST_GeomFromText(wkt string) RETURNS Geometry EXTERNAL NAME
geom."GeomFromText";
+CREATE FUNCTION ST_GeometryFromText(wkt string) RETURNS Geometry EXTERNAL NAME
geom."GeomFromText";
+CREATE FUNCTION ST_PointFromText(wkt string) RETURNS Geometry EXTERNAL NAME
geom."PointFromText";
+CREATE FUNCTION ST_LineFromText(wkt string) RETURNS Geometry EXTERNAL NAME
geom."LineFromText";
+CREATE FUNCTION ST_PolygonFromText(wkt string) RETURNS Geometry EXTERNAL NAME
geom."PolygonFromText";
+CREATE FUNCTION ST_MPointFromText(wkt string) RETURNS Geometry EXTERNAL NAME
geom."MPointFromText";
+CREATE FUNCTION ST_MLineFromText(wkt string) RETURNS Geometry EXTERNAL NAME
geom."MLineFromText";
+CREATE FUNCTION ST_MPolyFromText(wkt string) RETURNS Geometry EXTERNAL NAME
geom."MPolyFromText";
+CREATE FUNCTION ST_GeomCollFromText(wkt string) RETURNS Geometry EXTERNAL NAME
geom."GeomCollFromText";
+CREATE FUNCTION ST_MakePoint(x double, y double) RETURNS Geometry EXTERNAL
NAME geom."MakePoint";
+CREATE FUNCTION ST_Point(x double, y double) RETURNS Geometry EXTERNAL NAME
geom."MakePoint";
+CREATE FUNCTION ST_MakePoint(x double, y double, z double) RETURNS Geometry
EXTERNAL NAME geom."MakePoint";
+CREATE FUNCTION ST_MakePoint(x double, y double, z double, m double) RETURNS
Geometry EXTERNAL NAME geom."MakePoint";
+CREATE FUNCTION ST_MakePointM(x double, y double, m double) RETURNS Geometry
EXTERNAL NAME geom."MakePointM";
+CREATE AGGREGATE ST_MakeLine(geom Geometry) RETURNS Geometry external name
geom."MakeLine";
+CREATE FUNCTION ST_MakeLine(geom1 Geometry, geom2 Geometry) RETURNS Geometry
external name geom."MakeLine";
+CREATE FUNCTION ST_MakeEnvelope(xmin double, ymin double, xmax double, ymax
double, srid integer) RETURNS Geometry external name geom."MakeEnvelope";
+CREATE FUNCTION ST_MakeEnvelope(xmin double, ymin double, xmax double, ymax
double) RETURNS Geometry external name geom."MakeEnvelope";
+CREATE FUNCTION ST_MakePolygon(geom Geometry) RETURNS Geometry external name
geom."MakePolygon";
+CREATE FUNCTION ST_Polygon(geom Geometry, srid integer) RETURNS Geometry
external name geom."MakePolygon";
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
