diff options
author | Peter Eisentraut <peter_e@gmx.net> | 2006-02-27 16:09:50 +0000 |
---|---|---|
committer | Peter Eisentraut <peter_e@gmx.net> | 2006-02-27 16:09:50 +0000 |
commit | 7f4f42fa100872507ca10d8e0f7d923acc266ee8 (patch) | |
tree | c297cd70679cb60b470f8199ab707d80de108d5c /contrib/earthdistance | |
parent | fe83b3ebc6b8d65fbb14100bdc476b7dbc32454c (diff) | |
download | postgresql-7f4f42fa100872507ca10d8e0f7d923acc266ee8.tar.gz |
Clean up CREATE FUNCTION syntax usage in contrib and elsewhere, in
particular get rid of single quotes around language names and old WITH ()
construct.
Diffstat (limited to 'contrib/earthdistance')
-rw-r--r-- | contrib/earthdistance/earthdistance.sql.in | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/contrib/earthdistance/earthdistance.sql.in b/contrib/earthdistance/earthdistance.sql.in index b5de753443..3811b1d77f 100644 --- a/contrib/earthdistance/earthdistance.sql.in +++ b/contrib/earthdistance/earthdistance.sql.in @@ -8,7 +8,7 @@ SET search_path = public; -- in order to use different units (or a better value for the Earth's radius). CREATE OR REPLACE FUNCTION earth() RETURNS float8 -LANGUAGE 'sql' IMMUTABLE +LANGUAGE SQL IMMUTABLE AS 'SELECT \'6378168\'::float8'; -- Astromers may want to change the earth function so that distances will be @@ -17,7 +17,7 @@ AS 'SELECT \'6378168\'::float8'; -- tests. -- -- CREATE OR REPLACE FUNCTION earth() RETURNS float8 --- LANGUAGE 'sql' IMMUTABLE +-- LANGUAGE SQL IMMUTABLE -- AS 'SELECT 180/pi()'; -- Define domain for locations on the surface of the earth using a cube @@ -35,43 +35,43 @@ CREATE DOMAIN earth AS cube CREATE OR REPLACE FUNCTION sec_to_gc(float8) RETURNS float8 -LANGUAGE 'sql' +LANGUAGE SQL IMMUTABLE STRICT AS 'SELECT CASE WHEN $1 < 0 THEN 0::float8 WHEN $1/(2*earth()) > 1 THEN pi()*earth() ELSE 2*earth()*asin($1/(2*earth())) END'; CREATE OR REPLACE FUNCTION gc_to_sec(float8) RETURNS float8 -LANGUAGE 'sql' +LANGUAGE SQL IMMUTABLE STRICT AS 'SELECT CASE WHEN $1 < 0 THEN 0::float8 WHEN $1/earth() > pi() THEN 2*earth() ELSE 2*earth()*sin($1/(2*earth())) END'; CREATE OR REPLACE FUNCTION ll_to_earth(float8, float8) RETURNS earth -LANGUAGE 'sql' +LANGUAGE SQL IMMUTABLE STRICT AS 'SELECT cube(cube(cube(earth()*cos(radians($1))*cos(radians($2))),earth()*cos(radians($1))*sin(radians($2))),earth()*sin(radians($1)))::earth'; CREATE OR REPLACE FUNCTION latitude(earth) RETURNS float8 -LANGUAGE 'sql' +LANGUAGE SQL IMMUTABLE STRICT AS 'SELECT CASE WHEN cube_ll_coord($1, 3)/earth() < -1 THEN -90::float8 WHEN cube_ll_coord($1, 3)/earth() > 1 THEN 90::float8 ELSE degrees(asin(cube_ll_coord($1, 3)/earth())) END'; CREATE OR REPLACE FUNCTION longitude(earth) RETURNS float8 -LANGUAGE 'sql' +LANGUAGE SQL IMMUTABLE STRICT AS 'SELECT degrees(atan2(cube_ll_coord($1, 2), cube_ll_coord($1, 1)))'; CREATE OR REPLACE FUNCTION earth_distance(earth, earth) RETURNS float8 -LANGUAGE 'sql' +LANGUAGE SQL IMMUTABLE STRICT AS 'SELECT sec_to_gc(cube_distance($1, $2))'; CREATE OR REPLACE FUNCTION earth_box(earth, float8) RETURNS cube -LANGUAGE 'sql' +LANGUAGE SQL IMMUTABLE STRICT AS 'SELECT cube_enlarge($1, gc_to_sec($2), 3)'; @@ -79,7 +79,7 @@ AS 'SELECT cube_enlarge($1, gc_to_sec($2), 3)'; CREATE OR REPLACE FUNCTION geo_distance (point, point) RETURNS float8 -LANGUAGE 'C' IMMUTABLE STRICT AS 'MODULE_PATHNAME'; +LANGUAGE C IMMUTABLE STRICT AS 'MODULE_PATHNAME'; --------------- geo_distance as operator <@> |