Changeset: b743895dab33 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b743895dab33 Modified Files: sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 Branch: translate-scripts Log Message:
Approved test. diffs (100 lines): diff --git a/sql/test/Tests/systemfunctions.stable.out b/sql/test/Tests/systemfunctions.stable.out --- a/sql/test/Tests/systemfunctions.stable.out +++ b/sql/test/Tests/systemfunctions.stable.out @@ -655,7 +655,7 @@ Ready. [ "sys", "gethost", 1, "url", "" ] [ "sys", "getport", 0, "clob", "create function getport(theurl url) returns string\nexternal name url.\"getPort\";" ] [ "sys", "getport", 1, "url", "" ] -[ "sys", "getproj4", 0, "clob", "create function getproj4(srid_in integer) returns string\nbegin\nreturn select proj4text from spatial_ref_sys where srid=srid_in;\nend;" ] +[ "sys", "getproj4", 0, "clob", "create function getproj4(srid_in integer) returns string\nbegin\n return select proj4text from spatial_ref_sys where srid=srid_in;\nend;" ] [ "sys", "getproj4", 1, "int", "" ] [ "sys", "getprotocol", 0, "clob", "create function getprotocol(theurl url) returns string\nexternal name url.\"getProtocol\";" ] [ "sys", "getprotocol", 1, "url", "" ] @@ -1251,8 +1251,8 @@ Ready. [ "sys", "ms_trunc", 0, "double", "create function ms_trunc(num double, prc int)\nreturns double\nexternal name sql.ms_trunc;" ] [ "sys", "ms_trunc", 1, "double", "" ] [ "sys", "ms_trunc", 2, "int", "" ] -[ "sys", "netcdf_attach", 0, "varchar", "create procedure netcdf_attach(fname varchar(256))\nexternal name netcdf.attach;" ] -[ "sys", "netcdf_importvar", 0, "int", "create procedure netcdf_importvar(fid integer, varnname varchar(256))\nexternal name netcdf.importvariable;" ] +[ "sys", "netcdf_attach", 0, "varchar", "create procedure netcdf_attach(fname varchar(256))\n external name netcdf.attach;" ] +[ "sys", "netcdf_importvar", 0, "int", "create procedure netcdf_importvar(fid integer, varnname varchar(256))\n external name netcdf.importvariable;" ] [ "sys", "netcdf_importvar", 1, "varchar", "" ] [ "sys", "netmask", 0, "inet", "create function \"netmask\" (p inet) returns inet\nexternal name inet.\"netmask\";" ] [ "sys", "netmask", 1, "inet", "" ] @@ -4184,7 +4184,7 @@ Ready. [ "sys", "st_numinteriorring", 1, "geometry", "" ] [ "sys", "st_numinteriorrings", 0, "int", "create function st_numinteriorrings(geom geometry) returns integer external name geom.\"NumInteriorRings\";" ] [ "sys", "st_numinteriorrings", 1, "geometry", "" ] -[ "sys", "st_numpatches", 0, "int", "create function st_numpatches(geom geometry) returns integer begin\nreturn select st_numgeometries(geom);\nend;" ] +[ "sys", "st_numpatches", 0, "int", "create function st_numpatches(geom geometry) returns integer \nbegin\n return select st_numgeometries(geom);\nend;" ] [ "sys", "st_numpatches", 1, "geometry", "" ] [ "sys", "st_numpoints", 0, "int", "create function st_numpoints(geom geometry) returns integer external name geom.\"NumPoints\";" ] [ "sys", "st_numpoints", 1, "geometry", "" ] @@ -4194,7 +4194,7 @@ Ready. [ "sys", "st_overlaps", 0, "boolean", "create function st_overlaps(geom1 geometry, geom2 geometry) returns boolean external name geom.\"Overlaps\";" ] [ "sys", "st_overlaps", 1, "geometry", "" ] [ "sys", "st_overlaps", 2, "geometry", "" ] -[ "sys", "st_patchn", 0, "geometry", "create function st_patchn(geom geometry, patchnum integer) returns geometry begin\nreturn select st_geometryn(geom, patchnum);\nend;" ] +[ "sys", "st_patchn", 0, "geometry", "create function st_patchn(geom geometry, patchnum integer) returns geometry \nbegin\n return select st_geometryn(geom, patchnum);\nend;" ] [ "sys", "st_patchn", 1, "geometry", "" ] [ "sys", "st_patchn", 2, "int", "" ] [ "sys", "st_point", 0, "geometry", "create function st_point(x double, y double) returns geometry external name geom.\"MakePoint\";" ] @@ -4240,7 +4240,7 @@ Ready. [ "sys", "st_touches", 0, "boolean", "create function st_touches(geom1 geometry, geom2 geometry) returns boolean external name geom.\"Touches\";" ] [ "sys", "st_touches", 1, "geometry", "" ] [ "sys", "st_touches", 2, "geometry", "" ] -[ "sys", "st_transform", 0, "geometry", "create function st_transform(geom geometry, srid integer) returns geometry\nbegin\ndeclare srid_src integer;\ndeclare proj4_src string;\ndeclare proj4_dest string;\nselect st_srid(geom) into srid_src;\nselect getproj4(srid_src) into proj4_src;\nselect getproj4(srid) into proj4_dest;\nif proj4_src is null then\nreturn select internaltransform(geom, srid_src, srid, 'null', proj4_dest);\nelse\nif proj4_dest is null then\nreturn select internaltransform(geom, srid_src, srid, proj4_src, 'null');\nelse\nreturn select internaltransform(geom, srid_src, srid, proj4_src, proj4_dest);\nend if;\nend if;\nend;" ] +[ "sys", "st_transform", 0, "geometry", "create function st_transform(geom geometry, srid integer) returns geometry\nbegin\n declare srid_src integer;\n declare proj4_src string;\n declare proj4_dest string;\n select st_srid(geom) into srid_src;\n select getproj4(srid_src) into proj4_src;\n select getproj4(srid) into proj4_dest;\n if proj4_src is null then\n return select internaltransform(geom, srid_src, srid, 'null', proj4_dest);\n else\n if proj4_dest is null then\n return select internaltransform(geom, srid_src, srid, proj4_src, 'null');\n else\n return select internaltransform(geom, srid_src, srid, proj4_src, proj4_dest);\n end if;\n end if;\nend;" ] [ "sys", "st_transform", 1, "geometry", "" ] [ "sys", "st_transform", 2, "int", "" ] [ "sys", "st_translate", 0, "geometry", "create function st_translate(geom geometry, dx double, dy double) returns geometry external name geom.\"Translate\";" ] diff --git a/sql/test/Tests/systemfunctions.stable.out.int128 b/sql/test/Tests/systemfunctions.stable.out.int128 --- a/sql/test/Tests/systemfunctions.stable.out.int128 +++ b/sql/test/Tests/systemfunctions.stable.out.int128 @@ -701,7 +701,7 @@ Ready. [ "sys", "gethost", 1, "url", "" ] [ "sys", "getport", 0, "clob", "create function getport(theurl url) returns string\nexternal name url.\"getPort\";" ] [ "sys", "getport", 1, "url", "" ] -[ "sys", "getproj4", 0, "clob", "create function getproj4(srid_in integer) returns string\nbegin\nreturn select proj4text from spatial_ref_sys where srid=srid_in;\nend;" ] +[ "sys", "getproj4", 0, "clob", "create function getproj4(srid_in integer) returns string\nbegin\n return select proj4text from spatial_ref_sys where srid=srid_in;\nend;" ] [ "sys", "getproj4", 1, "int", "" ] [ "sys", "getprotocol", 0, "clob", "create function getprotocol(theurl url) returns string\nexternal name url.\"getProtocol\";" ] [ "sys", "getprotocol", 1, "url", "" ] @@ -1333,8 +1333,8 @@ Ready. [ "sys", "ms_trunc", 0, "double", "create function ms_trunc(num double, prc int)\nreturns double\nexternal name sql.ms_trunc;" ] [ "sys", "ms_trunc", 1, "double", "" ] [ "sys", "ms_trunc", 2, "int", "" ] -[ "sys", "netcdf_attach", 0, "varchar", "create procedure netcdf_attach(fname varchar(256))\nexternal name netcdf.attach;" ] -[ "sys", "netcdf_importvar", 0, "int", "create procedure netcdf_importvar(fid integer, varnname varchar(256))\nexternal name netcdf.importvariable;" ] +[ "sys", "netcdf_attach", 0, "varchar", "create procedure netcdf_attach(fname varchar(256))\n external name netcdf.attach;" ] +[ "sys", "netcdf_importvar", 0, "int", "create procedure netcdf_importvar(fid integer, varnname varchar(256))\n external name netcdf.importvariable;" ] [ "sys", "netcdf_importvar", 1, "varchar", "" ] [ "sys", "netmask", 0, "inet", "create function \"netmask\" (p inet) returns inet\nexternal name inet.\"netmask\";" ] [ "sys", "netmask", 1, "inet", "" ] @@ -4764,7 +4764,7 @@ Ready. [ "sys", "st_numinteriorring", 1, "geometry", "" ] [ "sys", "st_numinteriorrings", 0, "int", "create function st_numinteriorrings(geom geometry) returns integer external name geom.\"NumInteriorRings\";" ] [ "sys", "st_numinteriorrings", 1, "geometry", "" ] -[ "sys", "st_numpatches", 0, "int", "create function st_numpatches(geom geometry) returns integer begin\nreturn select st_numgeometries(geom);\nend;" ] +[ "sys", "st_numpatches", 0, "int", "create function st_numpatches(geom geometry) returns integer \nbegin\n return select st_numgeometries(geom);\nend;" ] [ "sys", "st_numpatches", 1, "geometry", "" ] [ "sys", "st_numpoints", 0, "int", "create function st_numpoints(geom geometry) returns integer external name geom.\"NumPoints\";" ] [ "sys", "st_numpoints", 1, "geometry", "" ] @@ -4774,7 +4774,7 @@ Ready. [ "sys", "st_overlaps", 0, "boolean", "create function st_overlaps(geom1 geometry, geom2 geometry) returns boolean external name geom.\"Overlaps\";" ] [ "sys", "st_overlaps", 1, "geometry", "" ] [ "sys", "st_overlaps", 2, "geometry", "" ] -[ "sys", "st_patchn", 0, "geometry", "create function st_patchn(geom geometry, patchnum integer) returns geometry begin\nreturn select st_geometryn(geom, patchnum);\nend;" ] +[ "sys", "st_patchn", 0, "geometry", "create function st_patchn(geom geometry, patchnum integer) returns geometry \nbegin\n return select st_geometryn(geom, patchnum);\nend;" ] [ "sys", "st_patchn", 1, "geometry", "" ] [ "sys", "st_patchn", 2, "int", "" ] [ "sys", "st_point", 0, "geometry", "create function st_point(x double, y double) returns geometry external name geom.\"MakePoint\";" ] @@ -4820,7 +4820,7 @@ Ready. [ "sys", "st_touches", 0, "boolean", "create function st_touches(geom1 geometry, geom2 geometry) returns boolean external name geom.\"Touches\";" ] [ "sys", "st_touches", 1, "geometry", "" ] [ "sys", "st_touches", 2, "geometry", "" ] -[ "sys", "st_transform", 0, "geometry", "create function st_transform(geom geometry, srid integer) returns geometry\nbegin\ndeclare srid_src integer;\ndeclare proj4_src string;\ndeclare proj4_dest string;\nselect st_srid(geom) into srid_src;\nselect getproj4(srid_src) into proj4_src;\nselect getproj4(srid) into proj4_dest;\nif proj4_src is null then\nreturn select internaltransform(geom, srid_src, srid, 'null', proj4_dest);\nelse\nif proj4_dest is null then\nreturn select internaltransform(geom, srid_src, srid, proj4_src, 'null');\nelse\nreturn select internaltransform(geom, srid_src, srid, proj4_src, proj4_dest);\nend if;\nend if;\nend;" ] +[ "sys", "st_transform", 0, "geometry", "create function st_transform(geom geometry, srid integer) returns geometry\nbegin\n declare srid_src integer;\n declare proj4_src string;\n declare proj4_dest string;\n select st_srid(geom) into srid_src;\n select getproj4(srid_src) into proj4_src;\n select getproj4(srid) into proj4_dest;\n if proj4_src is null then\n return select internaltransform(geom, srid_src, srid, 'null', proj4_dest);\n else\n if proj4_dest is null then\n return select internaltransform(geom, srid_src, srid, proj4_src, 'null');\n else\n return select internaltransform(geom, srid_src, srid, proj4_src, proj4_dest);\n end if;\n end if;\nend;" ] [ "sys", "st_transform", 1, "geometry", "" ] [ "sys", "st_transform", 2, "int", "" ] [ "sys", "st_translate", 0, "geometry", "create function st_translate(geom geometry, dx double, dy double) returns geometry external name geom.\"Translate\";" ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
