mirror of
https://git.osgeo.org/gitea/postgis/postgis
synced 2024-10-25 17:42:38 +00:00
Clean up old compatibility code. (#196)
git-svn-id: http://svn.osgeo.org/postgis/trunk@4166 b70326c6-7e19-0410-871a-916f4a2858ee
This commit is contained in:
Paul Ramsey
parent
709784580a
commit
e58330f614
|
|
@ -22,7 +22,7 @@
|
|||
-- UnlockRows(authid)
|
||||
-- removes all locks held by the given auth
|
||||
-- returns the number of locks released
|
||||
CREATEFUNCTION UnlockRows(text)
|
||||
CREATE OR REPLACE FUNCTION UnlockRows(text)
|
||||
RETURNS int
|
||||
AS $$
|
||||
DECLARE
|
||||
|
|
@ -45,7 +45,7 @@ LANGUAGE 'plpgsql' _VOLATILE_STRICT;
|
|||
|
||||
-- LockRow([schema], table, rowid, auth, [expires])
|
||||
-- Returns 1 if successfully obtained the lock, 0 otherwise
|
||||
CREATEFUNCTION LockRow(text, text, text, text, timestamp)
|
||||
CREATE OR REPLACE FUNCTION LockRow(text, text, text, text, timestamp)
|
||||
RETURNS int
|
||||
AS $$
|
||||
DECLARE
|
||||
|
|
@ -96,28 +96,28 @@ $$
|
|||
LANGUAGE 'plpgsql' _VOLATILE_STRICT;
|
||||
|
||||
-- LockRow(schema, table, rid, authid);
|
||||
CREATEFUNCTION LockRow(text, text, text, text)
|
||||
CREATE OR REPLACE FUNCTION LockRow(text, text, text, text)
|
||||
RETURNS int
|
||||
AS
|
||||
$$ SELECT LockRow($1, $2, $3, $4, now()::timestamp+'1:00'); $$
|
||||
LANGUAGE 'sql' _VOLATILE_STRICT;
|
||||
|
||||
-- LockRow(table, rid, authid);
|
||||
CREATEFUNCTION LockRow(text, text, text)
|
||||
CREATE OR REPLACE FUNCTION LockRow(text, text, text)
|
||||
RETURNS int
|
||||
AS
|
||||
$$ SELECT LockRow(current_schema(), $1, $2, $3, now()::timestamp+'1:00'); $$
|
||||
LANGUAGE 'sql' _VOLATILE_STRICT;
|
||||
|
||||
-- LockRow(schema, table, rid, expires);
|
||||
CREATEFUNCTION LockRow(text, text, text, timestamp)
|
||||
CREATE OR REPLACE FUNCTION LockRow(text, text, text, timestamp)
|
||||
RETURNS int
|
||||
AS
|
||||
$$ SELECT LockRow(current_schema(), $1, $2, $3, $4); $$
|
||||
LANGUAGE 'sql' _VOLATILE_STRICT;
|
||||
|
||||
|
||||
CREATEFUNCTION AddAuth(text)
|
||||
CREATE OR REPLACE FUNCTION AddAuth(text)
|
||||
RETURNS BOOLEAN
|
||||
AS $$
|
||||
DECLARE
|
||||
|
|
@ -154,7 +154,7 @@ LANGUAGE PLPGSQL;
|
|||
--
|
||||
-- Returns 0
|
||||
--
|
||||
CREATEFUNCTION CheckAuth(text, text, text)
|
||||
CREATE OR REPLACE FUNCTION CheckAuth(text, text, text)
|
||||
RETURNS INT
|
||||
AS $$
|
||||
DECLARE
|
||||
|
|
@ -183,18 +183,18 @@ $$
|
|||
LANGUAGE 'plpgsql';
|
||||
|
||||
-- CheckAuth(<table>, <ridcolumn>)
|
||||
CREATEFUNCTION CheckAuth(text, text)
|
||||
CREATE OR REPLACE FUNCTION CheckAuth(text, text)
|
||||
RETURNS INT
|
||||
AS
|
||||
$$ SELECT CheckAuth('', $1, $2) $$
|
||||
LANGUAGE 'SQL';
|
||||
|
||||
CREATEFUNCTION CheckAuthTrigger()
|
||||
CREATE OR REPLACE FUNCTION CheckAuthTrigger()
|
||||
RETURNS trigger AS
|
||||
'MODULE_PATHNAME', 'check_authorization'
|
||||
LANGUAGE C;
|
||||
|
||||
CREATEFUNCTION GetTransactionID()
|
||||
CREATE OR REPLACE FUNCTION GetTransactionID()
|
||||
RETURNS xid AS
|
||||
'MODULE_PATHNAME', 'getTransactionID'
|
||||
LANGUAGE C;
|
||||
|
|
@ -205,7 +205,7 @@ CREATEFUNCTION GetTransactionID()
|
|||
--
|
||||
-- Creates the authorization_table if not already existing
|
||||
--
|
||||
CREATEFUNCTION EnableLongTransactions()
|
||||
CREATE OR REPLACE FUNCTION EnableLongTransactions()
|
||||
RETURNS TEXT
|
||||
AS $$
|
||||
DECLARE
|
||||
|
|
@ -261,7 +261,7 @@ LANGUAGE 'plpgsql';
|
|||
--
|
||||
-- Check if Long transactions support is enabled
|
||||
--
|
||||
CREATEFUNCTION LongTransactionsEnabled()
|
||||
CREATE OR REPLACE FUNCTION LongTransactionsEnabled()
|
||||
RETURNS bool
|
||||
AS $$
|
||||
DECLARE
|
||||
|
|
@ -283,7 +283,7 @@ LANGUAGE 'plpgsql';
|
|||
-- (2) Drop the authorization_table
|
||||
-- (3) KEEP the authorized_tables view
|
||||
--
|
||||
CREATEFUNCTION DisableLongTransactions()
|
||||
CREATE OR REPLACE FUNCTION DisableLongTransactions()
|
||||
RETURNS TEXT
|
||||
AS $$
|
||||
DECLARE
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -17,15 +17,4 @@
|
|||
#define _POSTGIS_SQL_SELECT_POSTGIS_BUILD_DATE 'SELECT ''@POSTGIS_BUILD_DATE@''::text AS version'
|
||||
#define _POSTGIS_SQL_SELECT_POSTGIS_SCRIPTS_VERSION 'SELECT ''@POSTGIS_SCRIPTS_VERSION@''::text AS version'
|
||||
|
||||
#define CREATEFUNCTION CREATE OR REPLACE FUNCTION
|
||||
|
||||
# define _IMMUTABLE_STRICT IMMUTABLE STRICT
|
||||
# define _IMMUTABLE IMMUTABLE
|
||||
# define _STABLE_STRICT STABLE STRICT
|
||||
# define _STABLE STABLE
|
||||
# define _VOLATILE_STRICT VOLATILE STRICT
|
||||
# define _VOLATILE VOLATILE
|
||||
# define _STRICT STRICT
|
||||
# define _SECURITY_DEFINER SECURITY DEFINER
|
||||
|
||||
#endif /* _LWPGIS_DEFINES */
|
||||
|
|
|
|||
|
|
@ -50,10 +50,10 @@
|
|||
|
||||
-- PostGIS equivalent function: ST_GeometryFromText(text)
|
||||
-- Note: Defaults to an SRID=-1, not 0 as per SQL/MM specs.
|
||||
CREATEFUNCTION ST_WKTToSQL(text)
|
||||
RETURNS geometry
|
||||
AS 'MODULE_PATHNAME','LWGEOM_from_text'
|
||||
LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
|
||||
CREATE OR REPLACE FUNCTION ST_WKTToSQL(text)
|
||||
RETURNS geometry
|
||||
AS 'MODULE_PATHNAME','LWGEOM_from_text'
|
||||
LANGUAGE 'C' IMMUTABLE STRICT;
|
||||
|
||||
-- ST_GeomFromText(text, int4) - already defined
|
||||
-- ST_PointFromText(text, int4) - already defined
|
||||
|
|
@ -71,10 +71,10 @@ CREATEFUNCTION ST_WKTToSQL(text)
|
|||
-- PostGIS equivalent function: GeomFromWKB(bytea))
|
||||
-- Note: Defaults to an SRID=-1, not 0 as per SQL/MM specs.
|
||||
|
||||
CREATEFUNCTION ST_WKBToSQL(bytea)
|
||||
CREATE OR REPLACE FUNCTION ST_WKBToSQL(bytea)
|
||||
RETURNS geometry
|
||||
AS 'MODULE_PATHNAME','LWGEOM_from_WKB'
|
||||
LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
|
||||
LANGUAGE 'C' IMMUTABLE STRICT;
|
||||
|
||||
-- ST_GeomFromWKB(bytea, int) - already defined
|
||||
-- ST_PointFromWKB(bytea, int) - already defined
|
||||
|
|
@ -118,20 +118,20 @@ CREATEFUNCTION ST_WKBToSQL(bytea)
|
|||
-------------------------------------------------------------------------------
|
||||
|
||||
-- TODO: SE_AsShape(geometry)
|
||||
--CREATEFUNCTION SE_AsShape(geometry)
|
||||
--CREATE OR REPLACE FUNCTION SE_AsShape(geometry)
|
||||
-- RETURNS bytea
|
||||
-- AS 'MODULE_PATHNAME','LWGEOM_AsShape'
|
||||
-- LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
|
||||
-- LANGUAGE 'C' IMMUTABLE STRICT;
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
-- SQL/MM (ArcSDE subset) - SQL Functions on type ST_Geometry
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
-- PostGIS equivalent function: ndims(geometry)
|
||||
CREATEFUNCTION ST_CoordDim(geometry)
|
||||
RETURNS smallint
|
||||
AS 'MODULE_PATHNAME', 'LWGEOM_ndims'
|
||||
LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
|
||||
CREATE OR REPLACE FUNCTION ST_CoordDim(geometry)
|
||||
RETURNS smallint
|
||||
AS 'MODULE_PATHNAME', 'LWGEOM_ndims'
|
||||
LANGUAGE 'C' IMMUTABLE STRICT;
|
||||
|
||||
-- ST_Dimension(geometry) - already defined.
|
||||
-- ST_GeometryType(geometry) - already defined.
|
||||
|
|
@ -149,40 +149,40 @@ CREATEFUNCTION ST_CoordDim(geometry)
|
|||
-- ST_Y(geometry) - already defined.
|
||||
|
||||
-- PostGIS equivalent function: ~=
|
||||
CREATEFUNCTION ST_OrderingEquals(geometry, geometry)
|
||||
RETURNS boolean
|
||||
AS $$
|
||||
SELECT $1 && $2 AND $1 ~= $2
|
||||
CREATE OR REPLACE FUNCTION ST_OrderingEquals(geometry, geometry)
|
||||
RETURNS boolean
|
||||
AS $$
|
||||
SELECT $1 && $2 AND $1 ~= $2
|
||||
$$
|
||||
LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
|
||||
LANGUAGE 'SQL' IMMUTABLE STRICT;
|
||||
|
||||
-- PostGIS equivalent function: zmflag(geometry)
|
||||
CREATEFUNCTION SE_Is3D(geometry)
|
||||
RETURNS boolean
|
||||
AS $$
|
||||
SELECT CASE ST_zmflag($1)
|
||||
WHEN 0 THEN false
|
||||
WHEN 1 THEN false
|
||||
WHEN 2 THEN true
|
||||
WHEN 3 THEN true
|
||||
ELSE false
|
||||
END
|
||||
CREATE OR REPLACE FUNCTION SE_Is3D(geometry)
|
||||
RETURNS boolean
|
||||
AS $$
|
||||
SELECT CASE ST_zmflag($1)
|
||||
WHEN 0 THEN false
|
||||
WHEN 1 THEN false
|
||||
WHEN 2 THEN true
|
||||
WHEN 3 THEN true
|
||||
ELSE false
|
||||
END
|
||||
$$
|
||||
LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
|
||||
LANGUAGE 'SQL' IMMUTABLE STRICT;
|
||||
|
||||
-- PostGIS equivalent function: zmflag(geometry)
|
||||
CREATEFUNCTION SE_IsMeasured(geometry)
|
||||
RETURNS boolean
|
||||
AS $$
|
||||
SELECT CASE ST_zmflag($1)
|
||||
WHEN 0 THEN false
|
||||
WHEN 1 THEN true
|
||||
WHEN 2 THEN false
|
||||
WHEN 3 THEN true
|
||||
ELSE false
|
||||
END
|
||||
CREATE OR REPLACE FUNCTION SE_IsMeasured(geometry)
|
||||
RETURNS boolean
|
||||
AS $$
|
||||
SELECT CASE ST_zmflag($1)
|
||||
WHEN 0 THEN false
|
||||
WHEN 1 THEN true
|
||||
WHEN 2 THEN false
|
||||
WHEN 3 THEN true
|
||||
ELSE false
|
||||
END
|
||||
$$
|
||||
LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
|
||||
LANGUAGE 'SQL' IMMUTABLE STRICT;
|
||||
|
||||
|
||||
|
||||
|
|
@ -193,22 +193,22 @@ CREATEFUNCTION SE_IsMeasured(geometry)
|
|||
-------------------------------------------------------------------------------
|
||||
|
||||
-- PostGIS equivalent function: makePoint(float8,float8)
|
||||
CREATEFUNCTION ST_Point(float8, float8)
|
||||
CREATE OR REPLACE FUNCTION ST_Point(float8, float8)
|
||||
RETURNS geometry
|
||||
AS 'MODULE_PATHNAME', 'LWGEOM_makepoint'
|
||||
LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (iscachable,isstrict);
|
||||
LANGUAGE 'C' IMMUTABLE STRICT;
|
||||
|
||||
-- PostGIS equivalent function: Z(geometry)
|
||||
CREATEFUNCTION SE_Z(geometry)
|
||||
CREATE OR REPLACE FUNCTION SE_Z(geometry)
|
||||
RETURNS float8
|
||||
AS 'MODULE_PATHNAME','LWGEOM_z_point'
|
||||
LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
|
||||
LANGUAGE 'C' IMMUTABLE STRICT;
|
||||
|
||||
-- PostGIS equivalent function: M(geometry)
|
||||
CREATEFUNCTION SE_M(geometry)
|
||||
CREATE OR REPLACE FUNCTION SE_M(geometry)
|
||||
RETURNS float8
|
||||
AS 'MODULE_PATHNAME','LWGEOM_m_point'
|
||||
LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict);
|
||||
LANGUAGE 'C' IMMUTABLE STRICT;
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
-- SQL/MM (ArcSDE subset) - SQL Functions on type ST_Curve
|
||||
|
|
@ -241,12 +241,12 @@ CREATEFUNCTION SE_M(geometry)
|
|||
-------------------------------------------------------------------------------
|
||||
|
||||
-- PostGIS equivalent function: MakePolygon(geometry)
|
||||
CREATEFUNCTION ST_Polygon(geometry, int)
|
||||
CREATE OR REPLACE FUNCTION ST_Polygon(geometry, int)
|
||||
RETURNS geometry
|
||||
AS $$
|
||||
SELECT setSRID(makepolygon($1), $2)
|
||||
$$
|
||||
LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
|
||||
LANGUAGE 'SQL' IMMUTABLE STRICT;
|
||||
|
||||
-- ST_ExteriorRing(geometry) - already defined.
|
||||
-- ST_NumInteriorRing(geometry) - already defined.
|
||||
|
|
@ -290,12 +290,12 @@ CREATEFUNCTION ST_Polygon(geometry, int)
|
|||
-- ST_Relate(geometry, geometry, text) - already defined.
|
||||
|
||||
-- PostGIS equivalent function: none
|
||||
CREATEFUNCTION SE_EnvelopesIntersect(geometry,geometry)
|
||||
RETURNS boolean
|
||||
CREATE OR REPLACE FUNCTION SE_EnvelopesIntersect(geometry,geometry)
|
||||
RETURNS boolean
|
||||
AS $$
|
||||
SELECT $1 && $2
|
||||
$$
|
||||
LANGUAGE 'SQL' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
|
||||
LANGUAGE 'SQL' IMMUTABLE STRICT;
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
-- SQL/MM (ArcSDE subset) - SQL Functions for distance relationships
|
||||
|
|
@ -315,16 +315,16 @@ CREATEFUNCTION SE_EnvelopesIntersect(geometry,geometry)
|
|||
-- ST_ConvexHull(geometry) already defined.
|
||||
|
||||
-- PostGIS equivalent function: locate_along_measure(geometry, float8)
|
||||
CREATEFUNCTION SE_LocateAlong(geometry, float8)
|
||||
CREATE OR REPLACE FUNCTION SE_LocateAlong(geometry, float8)
|
||||
RETURNS geometry
|
||||
AS $$ SELECT locate_between_measures($1, $2, $2) $$
|
||||
LANGUAGE 'sql' _IMMUTABLE_STRICT;
|
||||
LANGUAGE 'sql' IMMUTABLE STRICT;
|
||||
|
||||
-- PostGIS equivalent function: locate_between_measures(geometry, float8, float8)
|
||||
CREATEFUNCTION SE_LocateBetween(geometry, float8, float8)
|
||||
CREATE OR REPLACE FUNCTION SE_LocateBetween(geometry, float8, float8)
|
||||
RETURNS geometry
|
||||
AS 'MODULE_PATHNAME', 'LWGEOM_locate_between_m'
|
||||
LANGUAGE 'C' _IMMUTABLE_STRICT;
|
||||
LANGUAGE 'C' IMMUTABLE STRICT;
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue