Changeset: db7e31b554ec for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=db7e31b554ec
Modified Files:
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
clients/Tests/SQL-dump.stable.out.oid32
clients/Tests/SQL-dump.stable.out.oid32.int128
Branch: geo
Log Message:
approved SQL-dump for geom
diffs (truncated from 19927 to 300 lines):
diff --git a/clients/Tests/SQL-dump.stable.out
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -77,6 +77,7 @@ SYSTEM TABLE sys.objects
SYSTEM TABLE sys.privileges
SYSTEM TABLE sys.schemas
SYSTEM TABLE sys.sequences
+SYSTEM TABLE sys.spatial_ref_sys
SYSTEM TABLE sys.statistics
SYSTEM TABLE sys.storagemodelinput
SYSTEM TABLE sys.systemfunctions
@@ -85,6 +86,7 @@ SYSTEM TABLE sys.types
SYSTEM TABLE sys.user_role
SYSTEM VIEW sys.columns
SYSTEM VIEW sys.environment
+SYSTEM VIEW sys.geometry_columns
SYSTEM VIEW sys.optimizers
SYSTEM VIEW sys.querylog_calls
SYSTEM VIEW sys.querylog_catalog
@@ -97,24 +99,15 @@ SYSTEM VIEW sys.tables
SYSTEM VIEW sys.tablestoragemodel
SYSTEM VIEW sys.tracelog
SYSTEM VIEW sys.users
-SYSTEM FUNCTION sys.Intersect
-SYSTEM FUNCTION sys.Union
SYSTEM FUNCTION sys.abbrev
SYSTEM FUNCTION sys.alpha
SYSTEM FUNCTION sys.analyze
-SYSTEM FUNCTION sys.area
-SYSTEM FUNCTION sys.astext
SYSTEM FUNCTION sys.bbp
-SYSTEM FUNCTION sys.boundary
SYSTEM FUNCTION sys.broadcast
-SYSTEM FUNCTION sys.buffer
SYSTEM FUNCTION sys.chi2prob
SYSTEM FUNCTION sys.columnsize
-SYSTEM FUNCTION sys.contains
SYSTEM FUNCTION sys.convert
-SYSTEM FUNCTION sys.convexhull
SYSTEM FUNCTION sys.corr
-SYSTEM FUNCTION sys.crosses
SYSTEM FUNCTION sys.date_to_str
SYSTEM FUNCTION sys.db_users
SYSTEM FUNCTION sys.degrees
@@ -135,23 +128,16 @@ SYSTEM FUNCTION sys.dependencies_tables
SYSTEM FUNCTION sys.dependencies_tables_on_views
SYSTEM FUNCTION sys.dependencies_views_on_functions
SYSTEM FUNCTION sys.dependencies_views_on_triggers
-SYSTEM FUNCTION sys.difference
-SYSTEM FUNCTION sys.dimension
-SYSTEM FUNCTION sys.disjoint
-SYSTEM FUNCTION sys.distance
SYSTEM FUNCTION sys.env
-SYSTEM FUNCTION sys.envelope
SYSTEM FUNCTION sys.environment
SYSTEM FUNCTION sys.epoch
-SYSTEM FUNCTION sys.equals
SYSTEM FUNCTION sys.evalalgebra
SYSTEM FUNCTION sys.fitsattach
SYSTEM FUNCTION sys.fitsload
SYSTEM FUNCTION sys.fuse
SYSTEM FUNCTION sys.generate_series
-SYSTEM FUNCTION sys.geomcollectionfromtext
-SYSTEM FUNCTION sys.geometrytypeid
-SYSTEM FUNCTION sys.geomfromtext
+SYSTEM FUNCTION sys.geometrytype
+SYSTEM FUNCTION sys.get_type
SYSTEM FUNCTION sys.getanchor
SYSTEM FUNCTION sys.getbasename
SYSTEM FUNCTION sys.getcontent
@@ -161,36 +147,31 @@ SYSTEM FUNCTION sys.getextension
SYSTEM FUNCTION sys.getfile
SYSTEM FUNCTION sys.gethost
SYSTEM FUNCTION sys.getport
+SYSTEM FUNCTION sys.getproj4
SYSTEM FUNCTION sys.getprotocol
SYSTEM FUNCTION sys.getquery
SYSTEM FUNCTION sys.getroboturl
SYSTEM FUNCTION sys.getuser
+SYSTEM FUNCTION sys.has_m
+SYSTEM FUNCTION sys.has_z
SYSTEM FUNCTION sys.hashsize
SYSTEM FUNCTION sys.heapsize
SYSTEM FUNCTION sys.host
SYSTEM FUNCTION sys.hostmask
SYSTEM FUNCTION sys.ilike
SYSTEM FUNCTION sys.imprintsize
-SYSTEM FUNCTION sys.intersection
+SYSTEM FUNCTION sys.internaltransform
SYSTEM FUNCTION sys.isaurl
SYSTEM FUNCTION sys.isauuid
-SYSTEM FUNCTION sys.isempty
-SYSTEM FUNCTION sys.issimple
SYSTEM FUNCTION sys.left_shift
SYSTEM FUNCTION sys.left_shift_assign
-SYSTEM FUNCTION sys.length
SYSTEM FUNCTION sys.like
-SYSTEM FUNCTION sys.linefromtext
SYSTEM FUNCTION sys.listdir
SYSTEM FUNCTION sys.listdirpat
SYSTEM FUNCTION sys.masklen
SYSTEM FUNCTION sys.mbr
-SYSTEM FUNCTION sys.mbroverlaps
SYSTEM FUNCTION sys.md5
SYSTEM FUNCTION sys.median
-SYSTEM FUNCTION sys.mlinefromtext
-SYSTEM FUNCTION sys.mpointfromtext
-SYSTEM FUNCTION sys.mpolyfromtext
SYSTEM FUNCTION sys.ms_round
SYSTEM FUNCTION sys.ms_str
SYSTEM FUNCTION sys.ms_stuff
@@ -202,13 +183,8 @@ SYSTEM FUNCTION sys.network
SYSTEM FUNCTION sys.newurl
SYSTEM FUNCTION sys.optimizer_stats
SYSTEM FUNCTION sys.optimizers
-SYSTEM FUNCTION sys.overlaps
SYSTEM FUNCTION sys.password_hash
SYSTEM FUNCTION sys.pause
-SYSTEM FUNCTION sys.point
-SYSTEM FUNCTION sys.pointfromtext
-SYSTEM FUNCTION sys.polyfromtext
-SYSTEM FUNCTION sys.polygonfromtext
SYSTEM FUNCTION sys.profiler_openstream
SYSTEM FUNCTION sys.profiler_stethoscope
SYSTEM FUNCTION sys.quantile
@@ -221,7 +197,6 @@ SYSTEM FUNCTION sys.querylog_empty
SYSTEM FUNCTION sys.querylog_enable
SYSTEM FUNCTION sys.queue
SYSTEM FUNCTION sys.radians
-SYSTEM FUNCTION sys.relate
SYSTEM FUNCTION sys.resume
SYSTEM FUNCTION sys.reuse
SYSTEM FUNCTION sys.reverse
@@ -233,7 +208,99 @@ SYSTEM FUNCTION sys.setsession
SYSTEM FUNCTION sys.settimeout
SYSTEM FUNCTION sys.shrink
SYSTEM FUNCTION sys.shutdown
-SYSTEM FUNCTION sys.srid
+SYSTEM FUNCTION sys.st_area
+SYSTEM FUNCTION sys.st_asbinary
+SYSTEM FUNCTION sys.st_asewkt
+SYSTEM FUNCTION sys.st_astext
+SYSTEM FUNCTION sys.st_bdmpolyfromtext
+SYSTEM FUNCTION sys.st_bdpolyfromtext
+SYSTEM FUNCTION sys.st_boundary
+SYSTEM FUNCTION sys.st_buffer
+SYSTEM FUNCTION sys.st_centroid
+SYSTEM FUNCTION sys.st_collect
+SYSTEM FUNCTION sys.st_contains
+SYSTEM FUNCTION sys.st_convexhull
+SYSTEM FUNCTION sys.st_coorddim
+SYSTEM FUNCTION sys.st_coveredby
+SYSTEM FUNCTION sys.st_covers
+SYSTEM FUNCTION sys.st_crosses
+SYSTEM FUNCTION sys.st_delaunaytriangles
+SYSTEM FUNCTION sys.st_difference
+SYSTEM FUNCTION sys.st_dimension
+SYSTEM FUNCTION sys.st_disjoint
+SYSTEM FUNCTION sys.st_distance
+SYSTEM FUNCTION sys.st_dump
+SYSTEM FUNCTION sys.st_dumppoints
+SYSTEM FUNCTION sys.st_dwithin
+SYSTEM FUNCTION sys.st_endpoint
+SYSTEM FUNCTION sys.st_envelope
+SYSTEM FUNCTION sys.st_equals
+SYSTEM FUNCTION sys.st_exteriorring
+SYSTEM FUNCTION sys.st_force2d
+SYSTEM FUNCTION sys.st_force3d
+SYSTEM FUNCTION sys.st_geomcollfromtext
+SYSTEM FUNCTION sys.st_geometryfromtext
+SYSTEM FUNCTION sys.st_geometryn
+SYSTEM FUNCTION sys.st_geometrytype
+SYSTEM FUNCTION sys.st_geomfromtext
+SYSTEM FUNCTION sys.st_interiorringn
+SYSTEM FUNCTION sys.st_interiorrings
+SYSTEM FUNCTION sys.st_intersection
+SYSTEM FUNCTION sys.st_intersects
+SYSTEM FUNCTION sys.st_isclosed
+SYSTEM FUNCTION sys.st_isempty
+SYSTEM FUNCTION sys.st_isring
+SYSTEM FUNCTION sys.st_issimple
+SYSTEM FUNCTION sys.st_isvalid
+SYSTEM FUNCTION sys.st_isvalidreason
+SYSTEM FUNCTION sys.st_length
+SYSTEM FUNCTION sys.st_length2d
+SYSTEM FUNCTION sys.st_linefromtext
+SYSTEM FUNCTION sys.st_makebox2d
+SYSTEM FUNCTION sys.st_makeenvelope
+SYSTEM FUNCTION sys.st_makeline
+SYSTEM FUNCTION sys.st_makepoint
+SYSTEM FUNCTION sys.st_makepointm
+SYSTEM FUNCTION sys.st_makepolygon
+SYSTEM FUNCTION sys.st_mlinefromtext
+SYSTEM FUNCTION sys.st_mpointfromtext
+SYSTEM FUNCTION sys.st_mpolyfromtext
+SYSTEM FUNCTION sys.st_npoints
+SYSTEM FUNCTION sys.st_nrings
+SYSTEM FUNCTION sys.st_numgeometries
+SYSTEM FUNCTION sys.st_numinteriorring
+SYSTEM FUNCTION sys.st_numinteriorrings
+SYSTEM FUNCTION sys.st_numpatches
+SYSTEM FUNCTION sys.st_numpoints
+SYSTEM FUNCTION sys.st_overlaps
+SYSTEM FUNCTION sys.st_patchn
+SYSTEM FUNCTION sys.st_point
+SYSTEM FUNCTION sys.st_pointfromtext
+SYSTEM FUNCTION sys.st_pointn
+SYSTEM FUNCTION sys.st_pointonsurface
+SYSTEM FUNCTION sys.st_polygon
+SYSTEM FUNCTION sys.st_polygonfromtext
+SYSTEM FUNCTION sys.st_relate
+SYSTEM FUNCTION sys.st_segmentize
+SYSTEM FUNCTION sys.st_setexteriorring
+SYSTEM FUNCTION sys.st_setsrid
+SYSTEM FUNCTION sys.st_srid
+SYSTEM FUNCTION sys.st_startpoint
+SYSTEM FUNCTION sys.st_symdifference
+SYSTEM FUNCTION sys.st_touches
+SYSTEM FUNCTION sys.st_transform
+SYSTEM FUNCTION sys.st_translate
+SYSTEM FUNCTION sys.st_union
+SYSTEM FUNCTION sys.st_within
+SYSTEM FUNCTION sys.st_wkbtosql
+SYSTEM FUNCTION sys.st_wkttosql
+SYSTEM FUNCTION sys.st_x
+SYSTEM FUNCTION sys.st_xmax
+SYSTEM FUNCTION sys.st_xmin
+SYSTEM FUNCTION sys.st_y
+SYSTEM FUNCTION sys.st_ymax
+SYSTEM FUNCTION sys.st_ymin
+SYSTEM FUNCTION sys.st_z
SYSTEM FUNCTION sys.stddev_pop
SYSTEM FUNCTION sys.stddev_samp
SYSTEM FUNCTION sys.stop
@@ -241,19 +308,14 @@ SYSTEM FUNCTION sys.storage
SYSTEM FUNCTION sys.storagemodel
SYSTEM FUNCTION sys.storagemodelinit
SYSTEM FUNCTION sys.str_to_date
-SYSTEM FUNCTION sys.symdifference
SYSTEM FUNCTION sys.text
SYSTEM FUNCTION sys.times
-SYSTEM FUNCTION sys.touches
SYSTEM FUNCTION sys.tracelog
SYSTEM FUNCTION sys.uuid
SYSTEM FUNCTION sys.vacuum
SYSTEM FUNCTION sys.var
SYSTEM FUNCTION sys.var_pop
SYSTEM FUNCTION sys.var_samp
-SYSTEM FUNCTION sys.within
-SYSTEM FUNCTION sys.x
-SYSTEM FUNCTION sys.y
SYSTEM FUNCTION sys.zorder_decode_x
SYSTEM FUNCTION sys.zorder_decode_y
SYSTEM FUNCTION sys.zorder_encode
@@ -477,10 +539,7 @@ create procedure analyze(sch string, tbl
external name sql.analyze;
create procedure analyze(sch string, tbl string, col string, "sample" bigint)
external name sql.analyze;
--- ogc Spatial Analysis methods
-create function area(g geometry) returns float external name geom."Area";
-create function astext(g geometry) returns string external name geom."AsText";
-- The BAT buffer pool overview
create function sys.bbp ()
returns table (id int, name string, htype string,
@@ -488,10 +547,8 @@ create function sys.bbp ()
location string, heat int, dirty string,
status string, kind string)
external name bbp.get;
-create function boundary(g geometry) returns geometry external name
geom."Boundary";
create function "broadcast" (p inet) returns inet
external name inet."broadcast";
-create function buffer(a geometry, distance float) returns geometry external
name geom."Buffer";
-- This Source Code Form is subject to the terms of the Mozilla Public
-- License, v. 2.0. If a copy of the MPL was not distributed with this
-- file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -530,8 +587,6 @@ begin
else return 8 * i;
end case;
end;
-create function contains(a geometry, b geometry) returns boolean external name
geom."Contains";
-create function convexhull(a geometry) returns geometry external name
geom."ConvexHull";
create aggregate corr(e1 tinyint, e2 tinyint) returns tinyint
external name "aggr"."corr";
create aggregate corr(e1 smallint, e2 smallint) returns smallint
@@ -546,7 +601,6 @@ create aggregate corr(e1 real, e2 real)
external name "aggr"."corr";
create aggregate corr(e1 double, e2 double) returns double
external name "aggr"."corr";
-create function crosses(a geometry, b geometry) returns boolean external name
geom."Crosses";
create function date_to_str(d date, format string) returns string
external name mtime."date_to_str";
CREATE FUNCTION db_users () RETURNS TABLE( name varchar(2048)) EXTERNAL NAME
sql.db_users;
@@ -634,25 +688,11 @@ return table (select v.name, f.name, 'DE
create function dependencies_views_on_triggers()
returns table (sch varchar(100), usr varchar(100), dep_type varchar(32))
return table (select v.name, tri.name, 'DEP_TRIGGER' from tables as v,
triggers as tri, dependencies as dep where dep.id = v.id and dep.depend_id
=tri.id and dep.depend_type = 8 and v.type = 1);
-create function difference(a geometry, b geometry) returns geometry external
name geom."Difference";
--- CREATE FUNCTION Point(g Geometry) RETURNS Point external name geom.point;
--- CREATE FUNCTION Curve(g Geometry) RETURNS Curve external name geom.curve;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
