Changeset: e83a5567886e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e83a5567886e Modified Files: geom/monetdb5/geom_upgrade.c sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out 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 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: default Log Message:
Fix geom upgrade code to mark more functions as system functions. This is needed since changeset 604ae9397192. diffs (144 lines): diff --git a/geom/monetdb5/geom_upgrade.c b/geom/monetdb5/geom_upgrade.c --- a/geom/monetdb5/geom_upgrade.c +++ b/geom/monetdb5/geom_upgrade.c @@ -120,10 +120,50 @@ geom_catalog_upgrade(void *lg, int EC_GE BATiter cti, cdi, csi; char *s = "sys", n[64]; BUN p,q; - char *nt[] = {"types_id", "types_systemname", "types_sqlname", "types_digits", "types_scale", "types_radix", "types_eclass", "types_schema_id"}; - unsigned char ntt[] = {TYPE_int, TYPE_str, TYPE_str, TYPE_int, TYPE_int, TYPE_int, TYPE_int, TYPE_int}; - char *nf[] = {"functions_id", "functions_name", "functions_func", "functions_mod", "functions_language", "functions_type", "functions_side_effect", "functions_varres", "functions_vararg", "functions_schema_id"}; - unsigned char nft[] = {TYPE_int, TYPE_str, TYPE_str, TYPE_str, TYPE_int, TYPE_int, TYPE_bit, TYPE_bit, TYPE_bit, TYPE_int}; + char *nt[] = { + "types_id", + "types_systemname", + "types_sqlname", + "types_digits", + "types_scale", + "types_radix", + "types_eclass", + "types_schema_id" + }; + unsigned char ntt[] = { + TYPE_int, + TYPE_str, + TYPE_str, + TYPE_int, + TYPE_int, + TYPE_int, + TYPE_int, + TYPE_int + }; + char *nf[] = { + "functions_id", + "functions_name", + "functions_func", + "functions_mod", + "functions_language", + "functions_type", + "functions_side_effect", + "functions_varres", + "functions_vararg", + "functions_schema_id" + }; + unsigned char nft[] = { + TYPE_int, + TYPE_str, + TYPE_str, + TYPE_str, + TYPE_int, + TYPE_int, + TYPE_bit, + TYPE_bit, + TYPE_bit, + TYPE_int + }; BAT *tt[8], *ttn[8], *ff[10], *ffn[10]; BATiter tti[8], ffi[10]; int val, maxid, i; @@ -4529,7 +4569,12 @@ geom_sql_upgrade(int olddb) pos += snprintf(buf + pos, bufsize - pos, "insert into sys.systemfunctions (select id from sys.functions where name in (" "'contains', 'geometrytype', 'getproj4', 'get_type', " - "'has_m', 'has_z', 'internaltransform', 'mbr', " + "'has_m', 'has_z', 'internaltransform', 'left_shift', " + "'mbr', 'mbr_above', 'mbr_below', 'mbr_contained', " + "'mbr_contains', 'mbr_distance', 'mbr_equal', " + "'mbr_left', 'mbr_overlap', 'mbr_overlap_or_above', " + "'mbr_overlap_or_below', 'mbr_overlap_or_left', " + "'mbr_overlap_or_right', 'mbr_right', 'right_shift', " "'st_area', 'st_asbinary', 'st_asewkt', 'st_astext', " "'st_bdmpolyfromtext', 'st_bdpolyfromtext', " "'st_boundary', 'st_buffer', 'st_centroid', " diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out --- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out +++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out @@ -4194,7 +4194,7 @@ 32766|'EPSG'|32766|'PROJCS["WGS 84 / TM 900913|'spatialreferencing.org'|900913|'PROJCS["Popular Visualisation CRS / Mercator (deprecated)",GEOGCS["Popular Visualisation CRS",DATUM["Popular_Visualisation_Datum",SPHEROID["Popular Visualisation Sphere",6378137,0,AUTHORITY["EPSG","7059"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6055"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4055"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],AUTHORITY["EPSG","3785"],AXIS["X",EAST],AXIS["Y",NORTH]]'|'+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs' -insert into sys.systemfunctions (select id from sys.functions where name in ('contains', 'geometrytype', 'getproj4', 'get_type', 'has_m', 'has_z', 'internaltransform', 'mbr', 'st_area', 'st_asbinary', 'st_asewkt', 'st_astext', 'st_bdmpolyfromtext', 'st_bdpolyfromtext', 'st_boundary', 'st_buffer', 'st_centroid', 'st_collect', 'st_contains', 'st_contains', 'st_convexhull', 'st_coorddim', 'st_coveredby', 'st_covers', 'st_crosses', 'st_delaunaytriangles', 'st_difference', 'st_dimension', 'st_disjoint', 'st_distance', 'st_distance', 'st_dump', 'st_dumppoints', 'st_dwithin', 'st_endpoint', 'st_envelope', 'st_equals', 'st_equals', 'st_exteriorring', 'st_force2d', 'st_force3d', 'st_geomcollfromtext', 'st_geomcollfromtext', 'st_geometryfromtext', 'st_geometryfromtext', 'st_geometryn', 'st_geometrytype', 'st_geomfromtext', 'st_geomfromtext', 'st_interiorringn', 'st_interiorrings', 'st_intersection', 'st_intersects', 'st_isclosed', 'st_isempty', 'st_isring', 'st_issimple', 'st_isvalid', 'st_is validreason', 'st_length', 'st_length2d', 'st_linefromtext', 'st_linefromtext', 'st_makebox2d', 'st_makeenvelope', 'st_makeenvelope', 'st_makeline', 'st_makepoint', 'st_makepoint', 'st_makepoint', 'st_makepointm', 'st_makepolygon', 'st_mlinefromtext', 'st_mlinefromtext', 'st_mpointfromtext', 'st_mpointfromtext', 'st_mpolyfromtext', 'st_mpolyfromtext', 'st_npoints', 'st_nrings', 'st_numgeometries', 'st_numinteriorring', 'st_numinteriorrings', 'st_numpatches', 'st_numpoints', 'st_overlaps', 'st_overlaps', 'st_patchn', 'st_point', 'st_pointfromtext', 'st_pointfromtext', 'st_pointn', 'st_pointonsurface', 'st_polygon', 'st_polygonfromtext', 'st_polygonfromtext', 'st_relate', 'st_segmentize', 'st_setexteriorring', 'st_setsrid', 'st_srid', 'st_startpoint', 'st_symdifference', 'st_touches', 'st_transform', 'st_translate', 'st_translate', 'st_union', 'st_within', 'st_wkbtosql', 'st_wkttosql', 'st_x', 'st_xmax', 'st_xmax', 'st_xmin', 'st_xmin', 'st_y', 'st_ymax', 'st_ymax', 'st_ymin', 'st_ymi n', 'st_z') 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 in ('contains', 'geometrytype', 'getproj4', 'get_type', 'has_m', 'has_z', 'internaltransform', 'left_shift', 'mbr', 'mbr_above', 'mbr_below', 'mbr_contained', 'mbr_contains', 'mbr_distance', 'mbr_equal', 'mbr_left', 'mbr_overlap', 'mbr_overlap_or_above', 'mbr_overlap_or_below', 'mbr_overlap_or_left', 'mbr_overlap_or_right', 'mbr_right', 'right_shift', 'st_area', 'st_asbinary', 'st_asewkt', 'st_astext', 'st_bdmpolyfromtext', 'st_bdpolyfromtext', 'st_boundary', 'st_buffer', 'st_centroid', 'st_collect', 'st_contains', 'st_contains', 'st_convexhull', 'st_coorddim', 'st_coveredby', 'st_covers', 'st_crosses', 'st_delaunaytriangles', 'st_difference', 'st_dimension', 'st_disjoint', 'st_distance', 'st_distance', 'st_dump', 'st_dumppoints', 'st_dwithin', 'st_endpoint', 'st_envelope', 'st_equals', 'st_equals', 'st_exteriorring', 'st_force2d', 'st_force3d', 'st_geomcollfromtext', 'st_geomcollfromtext', 'st_geometryfromtext ', 'st_geometryfromtext', 'st_geometryn', 'st_geometrytype', 'st_geomfromtext', 'st_geomfromtext', 'st_interiorringn', 'st_interiorrings', 'st_intersection', 'st_intersects', 'st_isclosed', 'st_isempty', 'st_isring', 'st_issimple', 'st_isvalid', 'st_isvalidreason', 'st_length', 'st_length2d', 'st_linefromtext', 'st_linefromtext', 'st_makebox2d', 'st_makeenvelope', 'st_makeenvelope', 'st_makeline', 'st_makepoint', 'st_makepoint', 'st_makepoint', 'st_makepointm', 'st_makepolygon', 'st_mlinefromtext', 'st_mlinefromtext', 'st_mpointfromtext', 'st_mpointfromtext', 'st_mpolyfromtext', 'st_mpolyfromtext', 'st_npoints', 'st_nrings', 'st_numgeometries', 'st_numinteriorring', 'st_numinteriorrings', 'st_numpatches', 'st_numpoints', 'st_overlaps', 'st_overlaps', 'st_patchn', 'st_point', 'st_pointfromtext', 'st_pointfromtext', 'st_pointn', 'st_pointonsurface', 'st_polygon', 'st_polygonfromtext', 'st_polygonfromtext', 'st_relate', 'st_segmentize', 'st_setexteriorring', 'st_setsrid', 'st_srid', 's t_startpoint', 'st_symdifference', 'st_touches', 'st_transform', 'st_translate', 'st_translate', 'st_union', 'st_within', 'st_wkbtosql', 'st_wkttosql', 'st_x', 'st_xmax', 'st_xmax', 'st_xmin', 'st_xmin', 'st_y', 'st_ymax', 'st_ymax', 'st_ymin', 'st_ymin', 'st_z') and schema_id = (select id from sys.schemas where name = 'sys') and id not in (select function_id from sys.systemfunctions)); update _tables set system = true where name in ('geometry_columns', 'spatial_ref_sys') and schema_id = (select id from schemas where name = 'sys'); set schema "testschema"; diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out --- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out +++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out @@ -4191,7 +4191,7 @@ 32766|'EPSG'|32766|'PROJCS["WGS 84 / TM 900913|'spatialreferencing.org'|900913|'PROJCS["Popular Visualisation CRS / Mercator (deprecated)",GEOGCS["Popular Visualisation CRS",DATUM["Popular_Visualisation_Datum",SPHEROID["Popular Visualisation Sphere",6378137,0,AUTHORITY["EPSG","7059"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6055"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4055"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],AUTHORITY["EPSG","3785"],AXIS["X",EAST],AXIS["Y",NORTH]]'|'+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs' -insert into sys.systemfunctions (select id from sys.functions where name in ('contains', 'geometrytype', 'getproj4', 'get_type', 'has_m', 'has_z', 'internaltransform', 'mbr', 'st_area', 'st_asbinary', 'st_asewkt', 'st_astext', 'st_bdmpolyfromtext', 'st_bdpolyfromtext', 'st_boundary', 'st_buffer', 'st_centroid', 'st_collect', 'st_contains', 'st_contains', 'st_convexhull', 'st_coorddim', 'st_coveredby', 'st_covers', 'st_crosses', 'st_delaunaytriangles', 'st_difference', 'st_dimension', 'st_disjoint', 'st_distance', 'st_distance', 'st_dump', 'st_dumppoints', 'st_dwithin', 'st_endpoint', 'st_envelope', 'st_equals', 'st_equals', 'st_exteriorring', 'st_force2d', 'st_force3d', 'st_geomcollfromtext', 'st_geomcollfromtext', 'st_geometryfromtext', 'st_geometryfromtext', 'st_geometryn', 'st_geometrytype', 'st_geomfromtext', 'st_geomfromtext', 'st_interiorringn', 'st_interiorrings', 'st_intersection', 'st_intersects', 'st_isclosed', 'st_isempty', 'st_isring', 'st_issimple', 'st_isvalid', 'st_is validreason', 'st_length', 'st_length2d', 'st_linefromtext', 'st_linefromtext', 'st_makebox2d', 'st_makeenvelope', 'st_makeenvelope', 'st_makeline', 'st_makepoint', 'st_makepoint', 'st_makepoint', 'st_makepointm', 'st_makepolygon', 'st_mlinefromtext', 'st_mlinefromtext', 'st_mpointfromtext', 'st_mpointfromtext', 'st_mpolyfromtext', 'st_mpolyfromtext', 'st_npoints', 'st_nrings', 'st_numgeometries', 'st_numinteriorring', 'st_numinteriorrings', 'st_numpatches', 'st_numpoints', 'st_overlaps', 'st_overlaps', 'st_patchn', 'st_point', 'st_pointfromtext', 'st_pointfromtext', 'st_pointn', 'st_pointonsurface', 'st_polygon', 'st_polygonfromtext', 'st_polygonfromtext', 'st_relate', 'st_segmentize', 'st_setexteriorring', 'st_setsrid', 'st_srid', 'st_startpoint', 'st_symdifference', 'st_touches', 'st_transform', 'st_translate', 'st_translate', 'st_union', 'st_within', 'st_wkbtosql', 'st_wkttosql', 'st_x', 'st_xmax', 'st_xmax', 'st_xmin', 'st_xmin', 'st_y', 'st_ymax', 'st_ymax', 'st_ymin', 'st_ymi n', 'st_z') 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 in ('contains', 'geometrytype', 'getproj4', 'get_type', 'has_m', 'has_z', 'internaltransform', 'left_shift', 'mbr', 'mbr_above', 'mbr_below', 'mbr_contained', 'mbr_contains', 'mbr_distance', 'mbr_equal', 'mbr_left', 'mbr_overlap', 'mbr_overlap_or_above', 'mbr_overlap_or_below', 'mbr_overlap_or_left', 'mbr_overlap_or_right', 'mbr_right', 'right_shift', 'st_area', 'st_asbinary', 'st_asewkt', 'st_astext', 'st_bdmpolyfromtext', 'st_bdpolyfromtext', 'st_boundary', 'st_buffer', 'st_centroid', 'st_collect', 'st_contains', 'st_contains', 'st_convexhull', 'st_coorddim', 'st_coveredby', 'st_covers', 'st_crosses', 'st_delaunaytriangles', 'st_difference', 'st_dimension', 'st_disjoint', 'st_distance', 'st_distance', 'st_dump', 'st_dumppoints', 'st_dwithin', 'st_endpoint', 'st_envelope', 'st_equals', 'st_equals', 'st_exteriorring', 'st_force2d', 'st_force3d', 'st_geomcollfromtext', 'st_geomcollfromtext', 'st_geometryfromtext ', 'st_geometryfromtext', 'st_geometryn', 'st_geometrytype', 'st_geomfromtext', 'st_geomfromtext', 'st_interiorringn', 'st_interiorrings', 'st_intersection', 'st_intersects', 'st_isclosed', 'st_isempty', 'st_isring', 'st_issimple', 'st_isvalid', 'st_isvalidreason', 'st_length', 'st_length2d', 'st_linefromtext', 'st_linefromtext', 'st_makebox2d', 'st_makeenvelope', 'st_makeenvelope', 'st_makeline', 'st_makepoint', 'st_makepoint', 'st_makepoint', 'st_makepointm', 'st_makepolygon', 'st_mlinefromtext', 'st_mlinefromtext', 'st_mpointfromtext', 'st_mpointfromtext', 'st_mpolyfromtext', 'st_mpolyfromtext', 'st_npoints', 'st_nrings', 'st_numgeometries', 'st_numinteriorring', 'st_numinteriorrings', 'st_numpatches', 'st_numpoints', 'st_overlaps', 'st_overlaps', 'st_patchn', 'st_point', 'st_pointfromtext', 'st_pointfromtext', 'st_pointn', 'st_pointonsurface', 'st_polygon', 'st_polygonfromtext', 'st_polygonfromtext', 'st_relate', 'st_segmentize', 'st_setexteriorring', 'st_setsrid', 'st_srid', 's t_startpoint', 'st_symdifference', 'st_touches', 'st_transform', 'st_translate', 'st_translate', 'st_union', 'st_within', 'st_wkbtosql', 'st_wkttosql', 'st_x', 'st_xmax', 'st_xmax', 'st_xmin', 'st_xmin', 'st_y', 'st_ymax', 'st_ymax', 'st_ymin', 'st_ymin', 'st_z') and schema_id = (select id from sys.schemas where name = 'sys') and id not in (select function_id from sys.systemfunctions)); update _tables set system = true where name in ('geometry_columns', 'spatial_ref_sys') and schema_id = (select id from schemas where name = 'sys'); set schema "testschema"; diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 --- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 +++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 @@ -4236,7 +4236,7 @@ 32766|'EPSG'|32766|'PROJCS["WGS 84 / TM 900913|'spatialreferencing.org'|900913|'PROJCS["Popular Visualisation CRS / Mercator (deprecated)",GEOGCS["Popular Visualisation CRS",DATUM["Popular_Visualisation_Datum",SPHEROID["Popular Visualisation Sphere",6378137,0,AUTHORITY["EPSG","7059"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6055"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4055"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],AUTHORITY["EPSG","3785"],AXIS["X",EAST],AXIS["Y",NORTH]]'|'+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs' -insert into sys.systemfunctions (select id from sys.functions where name in ('contains', 'geometrytype', 'getproj4', 'get_type', 'has_m', 'has_z', 'internaltransform', 'mbr', 'st_area', 'st_asbinary', 'st_asewkt', 'st_astext', 'st_bdmpolyfromtext', 'st_bdpolyfromtext', 'st_boundary', 'st_buffer', 'st_centroid', 'st_collect', 'st_contains', 'st_contains', 'st_convexhull', 'st_coorddim', 'st_coveredby', 'st_covers', 'st_crosses', 'st_delaunaytriangles', 'st_difference', 'st_dimension', 'st_disjoint', 'st_distance', 'st_distance', 'st_dump', 'st_dumppoints', 'st_dwithin', 'st_endpoint', 'st_envelope', 'st_equals', 'st_equals', 'st_exteriorring', 'st_force2d', 'st_force3d', 'st_geomcollfromtext', 'st_geomcollfromtext', 'st_geometryfromtext', 'st_geometryfromtext', 'st_geometryn', 'st_geometrytype', 'st_geomfromtext', 'st_geomfromtext', 'st_interiorringn', 'st_interiorrings', 'st_intersection', 'st_intersects', 'st_isclosed', 'st_isempty', 'st_isring', 'st_issimple', 'st_isvalid', 'st_is validreason', 'st_length', 'st_length2d', 'st_linefromtext', 'st_linefromtext', 'st_makebox2d', 'st_makeenvelope', 'st_makeenvelope', 'st_makeline', 'st_makepoint', 'st_makepoint', 'st_makepoint', 'st_makepointm', 'st_makepolygon', 'st_mlinefromtext', 'st_mlinefromtext', 'st_mpointfromtext', 'st_mpointfromtext', 'st_mpolyfromtext', 'st_mpolyfromtext', 'st_npoints', 'st_nrings', 'st_numgeometries', 'st_numinteriorring', 'st_numinteriorrings', 'st_numpatches', 'st_numpoints', 'st_overlaps', 'st_overlaps', 'st_patchn', 'st_point', 'st_pointfromtext', 'st_pointfromtext', 'st_pointn', 'st_pointonsurface', 'st_polygon', 'st_polygonfromtext', 'st_polygonfromtext', 'st_relate', 'st_segmentize', 'st_setexteriorring', 'st_setsrid', 'st_srid', 'st_startpoint', 'st_symdifference', 'st_touches', 'st_transform', 'st_translate', 'st_translate', 'st_union', 'st_within', 'st_wkbtosql', 'st_wkttosql', 'st_x', 'st_xmax', 'st_xmax', 'st_xmin', 'st_xmin', 'st_y', 'st_ymax', 'st_ymax', 'st_ymin', 'st_ymi n', 'st_z') 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 in ('contains', 'geometrytype', 'getproj4', 'get_type', 'has_m', 'has_z', 'internaltransform', 'left_shift', 'mbr', 'mbr_above', 'mbr_below', 'mbr_contained', 'mbr_contains', 'mbr_distance', 'mbr_equal', 'mbr_left', 'mbr_overlap', 'mbr_overlap_or_above', 'mbr_overlap_or_below', 'mbr_overlap_or_left', 'mbr_overlap_or_right', 'mbr_right', 'right_shift', 'st_area', 'st_asbinary', 'st_asewkt', 'st_astext', 'st_bdmpolyfromtext', 'st_bdpolyfromtext', 'st_boundary', 'st_buffer', 'st_centroid', 'st_collect', 'st_contains', 'st_contains', 'st_convexhull', 'st_coorddim', 'st_coveredby', 'st_covers', 'st_crosses', 'st_delaunaytriangles', 'st_difference', 'st_dimension', 'st_disjoint', 'st_distance', 'st_distance', 'st_dump', 'st_dumppoints', 'st_dwithin', 'st_endpoint', 'st_envelope', 'st_equals', 'st_equals', 'st_exteriorring', 'st_force2d', 'st_force3d', 'st_geomcollfromtext', 'st_geomcollfromtext', 'st_geometryfromtext ', 'st_geometryfromtext', 'st_geometryn', 'st_geometrytype', 'st_geomfromtext', 'st_geomfromtext', 'st_interiorringn', 'st_interiorrings', 'st_intersection', 'st_intersects', 'st_isclosed', 'st_isempty', 'st_isring', 'st_issimple', 'st_isvalid', 'st_isvalidreason', 'st_length', 'st_length2d', 'st_linefromtext', 'st_linefromtext', 'st_makebox2d', 'st_makeenvelope', 'st_makeenvelope', 'st_makeline', 'st_makepoint', 'st_makepoint', 'st_makepoint', 'st_makepointm', 'st_makepolygon', 'st_mlinefromtext', 'st_mlinefromtext', 'st_mpointfromtext', 'st_mpointfromtext', 'st_mpolyfromtext', 'st_mpolyfromtext', 'st_npoints', 'st_nrings', 'st_numgeometries', 'st_numinteriorring', 'st_numinteriorrings', 'st_numpatches', 'st_numpoints', 'st_overlaps', 'st_overlaps', 'st_patchn', 'st_point', 'st_pointfromtext', 'st_pointfromtext', 'st_pointn', 'st_pointonsurface', 'st_polygon', 'st_polygonfromtext', 'st_polygonfromtext', 'st_relate', 'st_segmentize', 'st_setexteriorring', 'st_setsrid', 'st_srid', 's t_startpoint', 'st_symdifference', 'st_touches', 'st_transform', 'st_translate', 'st_translate', 'st_union', 'st_within', 'st_wkbtosql', 'st_wkttosql', 'st_x', 'st_xmax', 'st_xmax', 'st_xmin', 'st_xmin', 'st_y', 'st_ymax', 'st_ymax', 'st_ymin', 'st_ymin', 'st_z') and schema_id = (select id from sys.schemas where name = 'sys') and id not in (select function_id from sys.systemfunctions)); update _tables set system = true where name in ('geometry_columns', 'spatial_ref_sys') and schema_id = (select id from schemas where name = 'sys'); set schema "testschema"; diff --git a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out --- a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out +++ b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out @@ -4196,7 +4196,7 @@ 32766|'EPSG'|32766|'PROJCS["WGS 84 / TM 900913|'spatialreferencing.org'|900913|'PROJCS["Popular Visualisation CRS / Mercator (deprecated)",GEOGCS["Popular Visualisation CRS",DATUM["Popular_Visualisation_Datum",SPHEROID["Popular Visualisation Sphere",6378137,0,AUTHORITY["EPSG","7059"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6055"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4055"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],AUTHORITY["EPSG","3785"],AXIS["X",EAST],AXIS["Y",NORTH]]'|'+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs' -insert into sys.systemfunctions (select id from sys.functions where name in ('contains', 'geometrytype', 'getproj4', 'get_type', 'has_m', 'has_z', 'internaltransform', 'mbr', 'st_area', 'st_asbinary', 'st_asewkt', 'st_astext', 'st_bdmpolyfromtext', 'st_bdpolyfromtext', 'st_boundary', 'st_buffer', 'st_centroid', 'st_collect', 'st_contains', 'st_contains', 'st_convexhull', 'st_coorddim', 'st_coveredby', 'st_covers', 'st_crosses', 'st_delaunaytriangles', 'st_difference', 'st_dimension', 'st_disjoint', 'st_distance', 'st_distance', 'st_dump', 'st_dumppoints', 'st_dwithin', 'st_endpoint', 'st_envelope', 'st_equals', 'st_equals', 'st_exteriorring', 'st_force2d', 'st_force3d', 'st_geomcollfromtext', 'st_geomcollfromtext', 'st_geometryfromtext', 'st_geometryfromtext', 'st_geometryn', 'st_geometrytype', 'st_geomfromtext', 'st_geomfromtext', 'st_interiorringn', 'st_interiorrings', 'st_intersection', 'st_intersects', 'st_isclosed', 'st_isempty', 'st_isring', 'st_issimple', 'st_isvalid', 'st_is validreason', 'st_length', 'st_length2d', 'st_linefromtext', 'st_linefromtext', 'st_makebox2d', 'st_makeenvelope', 'st_makeenvelope', 'st_makeline', 'st_makepoint', 'st_makepoint', 'st_makepoint', 'st_makepointm', 'st_makepolygon', 'st_mlinefromtext', 'st_mlinefromtext', 'st_mpointfromtext', 'st_mpointfromtext', 'st_mpolyfromtext', 'st_mpolyfromtext', 'st_npoints', 'st_nrings', 'st_numgeometries', 'st_numinteriorring', 'st_numinteriorrings', 'st_numpatches', 'st_numpoints', 'st_overlaps', 'st_overlaps', 'st_patchn', 'st_point', 'st_pointfromtext', 'st_pointfromtext', 'st_pointn', 'st_pointonsurface', 'st_polygon', 'st_polygonfromtext', 'st_polygonfromtext', 'st_relate', 'st_segmentize', 'st_setexteriorring', 'st_setsrid', 'st_srid', 'st_startpoint', 'st_symdifference', 'st_touches', 'st_transform', 'st_translate', 'st_translate', 'st_union', 'st_within', 'st_wkbtosql', 'st_wkttosql', 'st_x', 'st_xmax', 'st_xmax', 'st_xmin', 'st_xmin', 'st_y', 'st_ymax', 'st_ymax', 'st_ymin', 'st_ymi n', 'st_z') 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 in ('contains', 'geometrytype', 'getproj4', 'get_type', 'has_m', 'has_z', 'internaltransform', 'left_shift', 'mbr', 'mbr_above', 'mbr_below', 'mbr_contained', 'mbr_contains', 'mbr_distance', 'mbr_equal', 'mbr_left', 'mbr_overlap', 'mbr_overlap_or_above', 'mbr_overlap_or_below', 'mbr_overlap_or_left', 'mbr_overlap_or_right', 'mbr_right', 'right_shift', 'st_area', 'st_asbinary', 'st_asewkt', 'st_astext', 'st_bdmpolyfromtext', 'st_bdpolyfromtext', 'st_boundary', 'st_buffer', 'st_centroid', 'st_collect', 'st_contains', 'st_contains', 'st_convexhull', 'st_coorddim', 'st_coveredby', 'st_covers', 'st_crosses', 'st_delaunaytriangles', 'st_difference', 'st_dimension', 'st_disjoint', 'st_distance', 'st_distance', 'st_dump', 'st_dumppoints', 'st_dwithin', 'st_endpoint', 'st_envelope', 'st_equals', 'st_equals', 'st_exteriorring', 'st_force2d', 'st_force3d', 'st_geomcollfromtext', 'st_geomcollfromtext', 'st_geometryfromtext ', 'st_geometryfromtext', 'st_geometryn', 'st_geometrytype', 'st_geomfromtext', 'st_geomfromtext', 'st_interiorringn', 'st_interiorrings', 'st_intersection', 'st_intersects', 'st_isclosed', 'st_isempty', 'st_isring', 'st_issimple', 'st_isvalid', 'st_isvalidreason', 'st_length', 'st_length2d', 'st_linefromtext', 'st_linefromtext', 'st_makebox2d', 'st_makeenvelope', 'st_makeenvelope', 'st_makeline', 'st_makepoint', 'st_makepoint', 'st_makepoint', 'st_makepointm', 'st_makepolygon', 'st_mlinefromtext', 'st_mlinefromtext', 'st_mpointfromtext', 'st_mpointfromtext', 'st_mpolyfromtext', 'st_mpolyfromtext', 'st_npoints', 'st_nrings', 'st_numgeometries', 'st_numinteriorring', 'st_numinteriorrings', 'st_numpatches', 'st_numpoints', 'st_overlaps', 'st_overlaps', 'st_patchn', 'st_point', 'st_pointfromtext', 'st_pointfromtext', 'st_pointn', 'st_pointonsurface', 'st_polygon', 'st_polygonfromtext', 'st_polygonfromtext', 'st_relate', 'st_segmentize', 'st_setexteriorring', 'st_setsrid', 'st_srid', 's t_startpoint', 'st_symdifference', 'st_touches', 'st_transform', 'st_translate', 'st_translate', 'st_union', 'st_within', 'st_wkbtosql', 'st_wkttosql', 'st_x', 'st_xmax', 'st_xmax', 'st_xmin', 'st_xmin', 'st_y', 'st_ymax', 'st_ymax', 'st_ymin', 'st_ymin', 'st_z') and schema_id = (select id from sys.schemas where name = 'sys') and id not in (select function_id from sys.systemfunctions)); update _tables set system = true where name in ('geometry_columns', 'spatial_ref_sys') and schema_id = (select id from schemas where name = 'sys'); set schema "testschema"; diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out b/sql/test/testdb-upgrade/Tests/upgrade.stable.out --- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out +++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out @@ -4188,7 +4188,7 @@ 32766|'EPSG'|32766|'PROJCS["WGS 84 / TM 900913|'spatialreferencing.org'|900913|'PROJCS["Popular Visualisation CRS / Mercator (deprecated)",GEOGCS["Popular Visualisation CRS",DATUM["Popular_Visualisation_Datum",SPHEROID["Popular Visualisation Sphere",6378137,0,AUTHORITY["EPSG","7059"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6055"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4055"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],AUTHORITY["EPSG","3785"],AXIS["X",EAST],AXIS["Y",NORTH]]'|'+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs' -insert into sys.systemfunctions (select id from sys.functions where name in ('contains', 'geometrytype', 'getproj4', 'get_type', 'has_m', 'has_z', 'internaltransform', 'mbr', 'st_area', 'st_asbinary', 'st_asewkt', 'st_astext', 'st_bdmpolyfromtext', 'st_bdpolyfromtext', 'st_boundary', 'st_buffer', 'st_centroid', 'st_collect', 'st_contains', 'st_contains', 'st_convexhull', 'st_coorddim', 'st_coveredby', 'st_covers', 'st_crosses', 'st_delaunaytriangles', 'st_difference', 'st_dimension', 'st_disjoint', 'st_distance', 'st_distance', 'st_dump', 'st_dumppoints', 'st_dwithin', 'st_endpoint', 'st_envelope', 'st_equals', 'st_equals', 'st_exteriorring', 'st_force2d', 'st_force3d', 'st_geomcollfromtext', 'st_geomcollfromtext', 'st_geometryfromtext', 'st_geometryfromtext', 'st_geometryn', 'st_geometrytype', 'st_geomfromtext', 'st_geomfromtext', 'st_interiorringn', 'st_interiorrings', 'st_intersection', 'st_intersects', 'st_isclosed', 'st_isempty', 'st_isring', 'st_issimple', 'st_isvalid', 'st_is validreason', 'st_length', 'st_length2d', 'st_linefromtext', 'st_linefromtext', 'st_makebox2d', 'st_makeenvelope', 'st_makeenvelope', 'st_makeline', 'st_makepoint', 'st_makepoint', 'st_makepoint', 'st_makepointm', 'st_makepolygon', 'st_mlinefromtext', 'st_mlinefromtext', 'st_mpointfromtext', 'st_mpointfromtext', 'st_mpolyfromtext', 'st_mpolyfromtext', 'st_npoints', 'st_nrings', 'st_numgeometries', 'st_numinteriorring', 'st_numinteriorrings', 'st_numpatches', 'st_numpoints', 'st_overlaps', 'st_overlaps', 'st_patchn', 'st_point', 'st_pointfromtext', 'st_pointfromtext', 'st_pointn', 'st_pointonsurface', 'st_polygon', 'st_polygonfromtext', 'st_polygonfromtext', 'st_relate', 'st_segmentize', 'st_setexteriorring', 'st_setsrid', 'st_srid', 'st_startpoint', 'st_symdifference', 'st_touches', 'st_transform', 'st_translate', 'st_translate', 'st_union', 'st_within', 'st_wkbtosql', 'st_wkttosql', 'st_x', 'st_xmax', 'st_xmax', 'st_xmin', 'st_xmin', 'st_y', 'st_ymax', 'st_ymax', 'st_ymin', 'st_ymi n', 'st_z') 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 in ('contains', 'geometrytype', 'getproj4', 'get_type', 'has_m', 'has_z', 'internaltransform', 'left_shift', 'mbr', 'mbr_above', 'mbr_below', 'mbr_contained', 'mbr_contains', 'mbr_distance', 'mbr_equal', 'mbr_left', 'mbr_overlap', 'mbr_overlap_or_above', 'mbr_overlap_or_below', 'mbr_overlap_or_left', 'mbr_overlap_or_right', 'mbr_right', 'right_shift', 'st_area', 'st_asbinary', 'st_asewkt', 'st_astext', 'st_bdmpolyfromtext', 'st_bdpolyfromtext', 'st_boundary', 'st_buffer', 'st_centroid', 'st_collect', 'st_contains', 'st_contains', 'st_convexhull', 'st_coorddim', 'st_coveredby', 'st_covers', 'st_crosses', 'st_delaunaytriangles', 'st_difference', 'st_dimension', 'st_disjoint', 'st_distance', 'st_distance', 'st_dump', 'st_dumppoints', 'st_dwithin', 'st_endpoint', 'st_envelope', 'st_equals', 'st_equals', 'st_exteriorring', 'st_force2d', 'st_force3d', 'st_geomcollfromtext', 'st_geomcollfromtext', 'st_geometryfromtext ', 'st_geometryfromtext', 'st_geometryn', 'st_geometrytype', 'st_geomfromtext', 'st_geomfromtext', 'st_interiorringn', 'st_interiorrings', 'st_intersection', 'st_intersects', 'st_isclosed', 'st_isempty', 'st_isring', 'st_issimple', 'st_isvalid', 'st_isvalidreason', 'st_length', 'st_length2d', 'st_linefromtext', 'st_linefromtext', 'st_makebox2d', 'st_makeenvelope', 'st_makeenvelope', 'st_makeline', 'st_makepoint', 'st_makepoint', 'st_makepoint', 'st_makepointm', 'st_makepolygon', 'st_mlinefromtext', 'st_mlinefromtext', 'st_mpointfromtext', 'st_mpointfromtext', 'st_mpolyfromtext', 'st_mpolyfromtext', 'st_npoints', 'st_nrings', 'st_numgeometries', 'st_numinteriorring', 'st_numinteriorrings', 'st_numpatches', 'st_numpoints', 'st_overlaps', 'st_overlaps', 'st_patchn', 'st_point', 'st_pointfromtext', 'st_pointfromtext', 'st_pointn', 'st_pointonsurface', 'st_polygon', 'st_polygonfromtext', 'st_polygonfromtext', 'st_relate', 'st_segmentize', 'st_setexteriorring', 'st_setsrid', 'st_srid', 's t_startpoint', 'st_symdifference', 'st_touches', 'st_transform', 'st_translate', 'st_translate', 'st_union', 'st_within', 'st_wkbtosql', 'st_wkttosql', 'st_x', 'st_xmax', 'st_xmax', 'st_xmin', 'st_xmin', 'st_y', 'st_ymax', 'st_ymax', 'st_ymin', 'st_ymin', 'st_z') and schema_id = (select id from sys.schemas where name = 'sys') and id not in (select function_id from sys.systemfunctions)); update _tables set system = true where name in ('geometry_columns', 'spatial_ref_sys') and schema_id = (select id from schemas where name = 'sys'); set schema "testschema"; diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 --- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 +++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 @@ -4233,7 +4233,7 @@ 32766|'EPSG'|32766|'PROJCS["WGS 84 / TM 900913|'spatialreferencing.org'|900913|'PROJCS["Popular Visualisation CRS / Mercator (deprecated)",GEOGCS["Popular Visualisation CRS",DATUM["Popular_Visualisation_Datum",SPHEROID["Popular Visualisation Sphere",6378137,0,AUTHORITY["EPSG","7059"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6055"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4055"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],AUTHORITY["EPSG","3785"],AXIS["X",EAST],AXIS["Y",NORTH]]'|'+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs' -insert into sys.systemfunctions (select id from sys.functions where name in ('contains', 'geometrytype', 'getproj4', 'get_type', 'has_m', 'has_z', 'internaltransform', 'mbr', 'st_area', 'st_asbinary', 'st_asewkt', 'st_astext', 'st_bdmpolyfromtext', 'st_bdpolyfromtext', 'st_boundary', 'st_buffer', 'st_centroid', 'st_collect', 'st_contains', 'st_contains', 'st_convexhull', 'st_coorddim', 'st_coveredby', 'st_covers', 'st_crosses', 'st_delaunaytriangles', 'st_difference', 'st_dimension', 'st_disjoint', 'st_distance', 'st_distance', 'st_dump', 'st_dumppoints', 'st_dwithin', 'st_endpoint', 'st_envelope', 'st_equals', 'st_equals', 'st_exteriorring', 'st_force2d', 'st_force3d', 'st_geomcollfromtext', 'st_geomcollfromtext', 'st_geometryfromtext', 'st_geometryfromtext', 'st_geometryn', 'st_geometrytype', 'st_geomfromtext', 'st_geomfromtext', 'st_interiorringn', 'st_interiorrings', 'st_intersection', 'st_intersects', 'st_isclosed', 'st_isempty', 'st_isring', 'st_issimple', 'st_isvalid', 'st_is validreason', 'st_length', 'st_length2d', 'st_linefromtext', 'st_linefromtext', 'st_makebox2d', 'st_makeenvelope', 'st_makeenvelope', 'st_makeline', 'st_makepoint', 'st_makepoint', 'st_makepoint', 'st_makepointm', 'st_makepolygon', 'st_mlinefromtext', 'st_mlinefromtext', 'st_mpointfromtext', 'st_mpointfromtext', 'st_mpolyfromtext', 'st_mpolyfromtext', 'st_npoints', 'st_nrings', 'st_numgeometries', 'st_numinteriorring', 'st_numinteriorrings', 'st_numpatches', 'st_numpoints', 'st_overlaps', 'st_overlaps', 'st_patchn', 'st_point', 'st_pointfromtext', 'st_pointfromtext', 'st_pointn', 'st_pointonsurface', 'st_polygon', 'st_polygonfromtext', 'st_polygonfromtext', 'st_relate', 'st_segmentize', 'st_setexteriorring', 'st_setsrid', 'st_srid', 'st_startpoint', 'st_symdifference', 'st_touches', 'st_transform', 'st_translate', 'st_translate', 'st_union', 'st_within', 'st_wkbtosql', 'st_wkttosql', 'st_x', 'st_xmax', 'st_xmax', 'st_xmin', 'st_xmin', 'st_y', 'st_ymax', 'st_ymax', 'st_ymin', 'st_ymi n', 'st_z') 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 in ('contains', 'geometrytype', 'getproj4', 'get_type', 'has_m', 'has_z', 'internaltransform', 'left_shift', 'mbr', 'mbr_above', 'mbr_below', 'mbr_contained', 'mbr_contains', 'mbr_distance', 'mbr_equal', 'mbr_left', 'mbr_overlap', 'mbr_overlap_or_above', 'mbr_overlap_or_below', 'mbr_overlap_or_left', 'mbr_overlap_or_right', 'mbr_right', 'right_shift', 'st_area', 'st_asbinary', 'st_asewkt', 'st_astext', 'st_bdmpolyfromtext', 'st_bdpolyfromtext', 'st_boundary', 'st_buffer', 'st_centroid', 'st_collect', 'st_contains', 'st_contains', 'st_convexhull', 'st_coorddim', 'st_coveredby', 'st_covers', 'st_crosses', 'st_delaunaytriangles', 'st_difference', 'st_dimension', 'st_disjoint', 'st_distance', 'st_distance', 'st_dump', 'st_dumppoints', 'st_dwithin', 'st_endpoint', 'st_envelope', 'st_equals', 'st_equals', 'st_exteriorring', 'st_force2d', 'st_force3d', 'st_geomcollfromtext', 'st_geomcollfromtext', 'st_geometryfromtext ', 'st_geometryfromtext', 'st_geometryn', 'st_geometrytype', 'st_geomfromtext', 'st_geomfromtext', 'st_interiorringn', 'st_interiorrings', 'st_intersection', 'st_intersects', 'st_isclosed', 'st_isempty', 'st_isring', 'st_issimple', 'st_isvalid', 'st_isvalidreason', 'st_length', 'st_length2d', 'st_linefromtext', 'st_linefromtext', 'st_makebox2d', 'st_makeenvelope', 'st_makeenvelope', 'st_makeline', 'st_makepoint', 'st_makepoint', 'st_makepoint', 'st_makepointm', 'st_makepolygon', 'st_mlinefromtext', 'st_mlinefromtext', 'st_mpointfromtext', 'st_mpointfromtext', 'st_mpolyfromtext', 'st_mpolyfromtext', 'st_npoints', 'st_nrings', 'st_numgeometries', 'st_numinteriorring', 'st_numinteriorrings', 'st_numpatches', 'st_numpoints', 'st_overlaps', 'st_overlaps', 'st_patchn', 'st_point', 'st_pointfromtext', 'st_pointfromtext', 'st_pointn', 'st_pointonsurface', 'st_polygon', 'st_polygonfromtext', 'st_polygonfromtext', 'st_relate', 'st_segmentize', 'st_setexteriorring', 'st_setsrid', 'st_srid', 's t_startpoint', 'st_symdifference', 'st_touches', 'st_transform', 'st_translate', 'st_translate', 'st_union', 'st_within', 'st_wkbtosql', 'st_wkttosql', 'st_x', 'st_xmax', 'st_xmax', 'st_xmin', 'st_xmin', 'st_y', 'st_ymax', 'st_ymax', 'st_ymin', 'st_ymin', 'st_z') and schema_id = (select id from sys.schemas where name = 'sys') and id not in (select function_id from sys.systemfunctions)); update _tables set system = true where name in ('geometry_columns', 'spatial_ref_sys') and schema_id = (select id from schemas where name = 'sys'); set schema "testschema"; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list