Mercurial > gemma
diff schema/gemma.sql @ 4897:638a61fb881b fairway-marks-import
Merge branch default into fairway-marks-import
author | Tom Gottfried <tom@intevation.de> |
---|---|
date | Fri, 31 Jan 2020 16:53:06 +0100 |
parents | dd888bbb7e43 566e9ee70d45 |
children | 6f244b5eb716 |
line wrap: on
line diff
--- a/schema/gemma.sql Fri Jan 24 17:37:41 2020 +0100 +++ b/schema/gemma.sql Fri Jan 31 16:53:06 2020 +0100 @@ -27,7 +27,6 @@ -- -- Check if a given string can be used as a FROM item in an SQL statement --- All objects in stmt should be schema qualified if not in the public schema CREATE OR REPLACE FUNCTION is_valid_from_item(stmt text) RETURNS boolean AS $$ BEGIN @@ -39,7 +38,6 @@ RETURN false; END $$ - SET search_path TO 'public' LANGUAGE plpgsql STRICT; @@ -231,7 +229,7 @@ LANGUAGE plpgsql AS $$ BEGIN - IF NOT public.ST_Intersects((SELECT area + IF NOT st_intersects((SELECT area FROM waterway.bottlenecks WHERE bottleneck_id = NEW.bottleneck_id AND validity @> NEW.date_info::timestamptz),