Changeset: 7325f1dd4d1c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7325f1dd4d1c
Modified Files:
clients/Tests/MAL-signatures.test
sql/test/emptydb/Tests/check.stable.out
Branch: default
Log Message:
Non-hge approval of tests after removal of geometryA type.
diffs (51 lines):
diff --git a/clients/Tests/MAL-signatures.test
b/clients/Tests/MAL-signatures.test
--- a/clients/Tests/MAL-signatures.test
+++ b/clients/Tests/MAL-signatures.test
@@ -33849,11 +33849,6 @@ command geom.InteriorRingN(X_0:wkb, X_1:
wkbInteriorRingN;
Return the Nth interior linestring ring of the polygon geometry. Return NULL
if the geometry is not a polygon or the given N is out of range.
geom
-InteriorRings
-command geom.InteriorRings(X_0:wkb):wkba
-wkbInteriorRings;
-Returns an 'array' with all the interior rings of the polygon
-geom
Intersection
command geom.Intersection(X_0:wkb, X_1:wkb):wkb
wkbIntersection;
diff --git a/sql/test/emptydb/Tests/check.stable.out
b/sql/test/emptydb/Tests/check.stable.out
--- a/sql/test/emptydb/Tests/check.stable.out
+++ b/sql/test/emptydb/Tests/check.stable.out
@@ -535,7 +535,7 @@ select 'null in fkeys.delete_action', de
[ "sys._tables", "sys", "function_languages", NULL, "TABLE",
true, "COMMIT", "READONLY", NULL ]
[ "sys._tables", "sys", "function_types", NULL, "TABLE",
true, "COMMIT", "READONLY", NULL ]
[ "sys._tables", "sys", "functions", NULL, "TABLE", true,
"COMMIT", "WRITABLE", NULL ]
-[ "sys._tables", "sys", "geometry_columns", "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'));", "VIEW", true, "COMMIT",
"WRITABLE", NULL ]
+[ "sys._tables", "sys", "geometry_columns", "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 = 'wkb');", "VIEW", true, "COMMIT", "WRITABLE",
NULL ]
[ "sys._tables", "sys", "ids", "create view sys.ids (id, name,
schema_id, table_id, table_name, obj_type, sys_table, system) as select id,
name, cast(null as int) as schema_id, cast(null as int) as table_id, cast(null
as varchar(124)) as table_name, 'author' as obj_type, 'sys.auths' as sys_table,
(name in ('public','sysadmin','monetdb','.snapshot')) as system from sys.auths
union all select id, name, cast(null as int) as schema_id, cast(null as int) as
table_id, cast(null as varchar(124)) as table_name, ifthenelse(system, 'system
schema', 'schema'), 'sys.schemas', system from sys.schemas union all select
t.id, name, t.schema_id, t.id as table_id, t.name as table_name,
cast(lower(tt.table_type_name) as varchar(40)), 'sys.tables', t.system from
sys.tables t left outer join sys.table_types tt on t.type = tt.table_type_id
union all select c.id, c.name, t.schema_id, c.table_id, t.name as table_name,
ifthenelse(t.system, 'system column', 'column'), 'sys._columns', t.system from
sys._colum
ns c join sys._tables t on c.table_id = t.id union all select c.id, c.name,
t.schema_id, c.table_id, t.name as table_name, 'column', 'tmp._columns',
t.system from tmp._columns c join tmp._tables t on c.table_id = t.id union all
select k.id, k.name, t.schema_id, k.table_id, t.name as table_name,
ifthenelse(t.system, 'system key', 'key'), 'sys.keys', t.system from sys.keys k
join sys._tables t on k.table_id = t.id union all select k.id, k.name,
t.schema_id, k.table_id, t.name as table_name, 'key', 'tmp.keys', t.system from
tmp.keys k join tmp._tables t on k.table_id = t.id union all select i.id,
i.name, t.schema_id, i.table_id, t.name as table_name, ifthenelse(t.system,
'system index', 'index'), 'sys.idxs', t.system from sys.idxs i join sys._tables
t on i.table_id = t.id union all select i.id, i.name, t.schema_id, i.table_id,
t.name as table_name, 'index' , 'tmp.idxs', t.system from tmp.idxs i join
tmp._tables t on i.table_id = t.id union all select g.id, g.name, t.schema_id,
g.table_
id, t.name as table_name, ifthenelse(t.system, 'system trigger', 'trigger'),
'sys.triggers', t.system from sys.triggers g join sys._tables t on g.table_id =
t.id union all select g.id, g.name, t.schema_id, g.table_id, t.name as
table_name, 'trigger', 'tmp.triggers', t.system from tmp.triggers g join
tmp._tables t on g.table_id = t.id union all select f.id, f.name, f.schema_id,
cast(null as int) as table_id, cast(null as varchar(124)) as table_name,
cast(ifthenelse(f.system, 'system ', '') || lower(ft.function_type_keyword) as
varchar(40)), 'sys.functions', f.system from sys.functions f left outer join
sys.function_types ft on f.type = ft.function_type_id union all select a.id,
a.name, f.schema_id, a.func_id as table_id, f.name as table_name,
cast(ifthenelse(f.system, 'system ', '') || lower(ft.function_type_keyword) ||
' arg' as varchar(44)), 'sys.args', f.system from sys.args a join sys.functions
f on a.func_id = f.id left outer join sys.function_types ft on f.type =
ft.function_ty
pe_id union all select id, name, schema_id, cast(null as int) as table_id,
cast(null as varchar(124)) as table_name, 'sequence', 'sys.sequences', false
from sys.sequences union all select o.id, o.name, pt.schema_id, pt.id, pt.name,
'partition of merge table', 'sys.objects', false from sys.objects o join
sys._tables pt on o.sub = pt.id join sys._tables mt on o.nr = mt.id where
mt.type = 3 union all select id, sqlname, schema_id, cast(null as int) as
table_id, cast(null as varchar(124)) as table_name, 'type', 'sys.types',
(sqlname in ('inet','json','url','uuid')) from sys.types order by id;",
"VIEW", true, "COMMIT", "WRITABLE", NULL ]
[ "sys._tables", "sys", "idxs", NULL, "TABLE", true,
"COMMIT", "WRITABLE", NULL ]
[ "sys._tables", "sys", "index_types", NULL, "TABLE", true,
"COMMIT", "READONLY", NULL ]
@@ -2597,7 +2597,6 @@ select 'null in fkeys.delete_action', de
[ "sys.functions", "sys", "st_geomfromtext", "SYSTEM", "create
function st_geomfromtext(wkt string) returns geometry external name
geom.\"GeomFromText\";", "geom", "MAL", "Scalar function", false,
false, false, true, NULL, "result", "geometry", 0, 0,
"out", "wkt", "varchar", 0, 0, "in", NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys.functions", "sys", "st_geomfromtext", "SYSTEM", "create
function st_geomfromtext(wkt string, srid integer) returns geometry external
name geom.\"GeomFromText\";", "geom", "MAL", "Scalar function",
false, false, false, true, NULL, "result", "geometry", 0,
0, "out", "wkt", "varchar", 0, 0, "in", "srid", "int",
31, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys.functions", "sys", "st_interiorringn", "SYSTEM", "create
function st_interiorringn(geom geometry, positionnum integer) returns geometry
external name geom.\"InteriorRingN\";", "geom", "MAL", "Scalar function",
false, false, false, true, NULL, "result", "geometry", 0,
0, "out", "geom", "geometry", 0, 0, "in", "positionnum",
"int", 31, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
-[ "sys.functions", "sys", "st_interiorrings", "SYSTEM", "create
function st_interiorrings(geom geometry) returns geometrya external name
geom.\"InteriorRings\";", "geom", "MAL", "Scalar function", false,
false, false, true, NULL, "result", "geometrya", 0, 0,
"out", "geom", "geometry", 0, 0, "in", NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys.functions", "sys", "st_intersection", "SYSTEM", "create
function st_intersection(geom1 geometry, geom2 geometry) returns geometry
external name geom.\"Intersection\";", "geom", "MAL", "Scalar
function", false, false, false, true, NULL, "result",
"geometry", 0, 0, "out", "geom1", "geometry", 0,
0, "in", "geom2", "geometry", 0, 0, "in", NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL ]
[ "sys.functions", "sys", "st_intersects", "SYSTEM", "create
filter function st_intersects(geom1 geometry, geom2 geometry) external name
rtree.\"Intersects\";", "rtree", "MAL", "Filter function",
false, false, false, true, NULL, "geom1", "geometry", 0,
0, "in", "geom2", "geometry", 0, 0, "in", NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys.functions", "sys", "st_intersects_noindex", "SYSTEM",
"create filter function st_intersects_noindex(geom1 geometry, geom2 geometry)
external name geom.\"Intersects_noindex\";", "geom", "MAL", "Filter
function", false, false, false, true, NULL, "geom1",
"geometry", 0, 0, "in", "geom2", "geometry", 0,
0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL ]
@@ -4962,7 +4961,6 @@ select 'null in fkeys.delete_action', de
[ "grant on function", "sys", "st_geomfromtext", "public",
"EXECUTE", "monetdb", 0 ]
[ "grant on function", "sys", "st_geomfromtext", "public",
"EXECUTE", "monetdb", 0 ]
[ "grant on function", "sys", "st_interiorringn", "public",
"EXECUTE", "monetdb", 0 ]
-[ "grant on function", "sys", "st_interiorrings", "public",
"EXECUTE", "monetdb", 0 ]
[ "grant on function", "sys", "st_intersection", "public",
"EXECUTE", "monetdb", 0 ]
[ "grant on function", "sys", "st_intersects", "public",
"EXECUTE", "monetdb", 0 ]
[ "grant on function", "sys", "st_intersects_noindex", "public",
"EXECUTE", "monetdb", 0 ]
@@ -5163,7 +5161,6 @@ select 'null in fkeys.delete_action', de
[ "sys.types", "sys", "uuid", "uuid", 0, 0, 0, "EXTERNAL"
]
[ "sys.types", "sys", "void", "any", 0, 0, 0, "ANY" ]
[ "sys.types", "sys", "wkb", "geometry", 0, 0, 0, "GEOM"
]
-[ "sys.types", "sys", "wkba", "geometrya", 0, 0, 0,
"EXTERNAL" ]
% .%1, .a1, .a2 # table_name
% %1, name, name # name
% varchar, varchar, varchar # type
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
