Add 2.2.8 to upgrade targets

Remove using of pg_constraint.consrc to allow support of 12 as noted by Laurenz Albe (pg_constraint.consrc was removed in 12devel)
Closes #4231 for postgis 2.5.2

git-svn-id: http://svn.osgeo.org/postgis/branches/2.5@17060 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/NEWS b/NEWS
index 9aa58fa97ebeba248c048e62d1f0a43c61e64b90..31db713976062ff3b55ba03f56e24548213d55db 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ PostGIS 2.5.2
 XXXX/XX/XX
 
  * Bug fixes *
+  - #4231, Support for PostgreSQL 12dev (remove use of pg_constraint.consrc)
+           (Regina Obe, Laurenz Albe)
   - #4247, Avoid undefined behaviour in next_float functions (Raúl Marín)
   - #4249, Fix undefined behaviour in raster intersection (Raúl Marín)
   - #4246, Fix undefined behaviour in ST_3DDistance (Raúl Marín)

diff --git a/extensions/upgradeable_versions.mk b/extensions/upgradeable_versions.mk
index c0a970e2afe34d1b9b4dd336a429663d64460466..44727740614260a82c819e96cb7b3130978027f8 100644 (file)
--- a/extensions/upgradeable_versions.mk
+++ b/extensions/upgradeable_versions.mk
@@ -25,6 +25,7 @@ UPGRADEABLE_VERSIONS = \
        2.2.5 \
        2.2.6 \
        2.2.7 \
+       2.2.8 \
        2.3.0 \
        2.3.1 \
        2.3.2 \

diff --git a/postgis/postgis.sql.in b/postgis/postgis.sql.in
index 73e5ce38621a68ccd0bb8c4314cf9106be1a9e10..0915846262c01d2b0a070e3a8c3f31b9c4f5c41e 100644 (file)
--- a/postgis/postgis.sql.in
+++ b/postgis/postgis.sql.in
@@ -5554,11 +5554,14 @@ $$
 LANGUAGE 'sql' STABLE STRICT _PARALLEL;
 
 -- Availability: 2.0.0
--- Deprecation in 2.2.0
+-- Undeprecated 2.5.2 needed by UpdateGeometrySRID
 CREATE OR REPLACE FUNCTION postgis_constraint_dims(geomschema text, geomtable text, geomcolumn text) RETURNS integer AS
 $$
 SELECT  replace(split_part(s.consrc, ' = ', 2), ')', '')::integer
-                FROM pg_class c, pg_namespace n, pg_attribute a, pg_constraint s
+
+                FROM pg_class c, pg_namespace n, pg_attribute a
+                , (SELECT connamespace, conrelid, conkey, pg_get_constraintdef(oid) As consrc
+                   FROM pg_constraint) AS s
                 WHERE n.nspname = $1
                 AND c.relname = $2
                 AND a.attname = $3
@@ -5573,11 +5576,15 @@ LANGUAGE 'sql' STABLE STRICT _PARALLEL;
 -- support function to pull out geometry type from constraint check
 -- will return pretty name instead of ugly name
 -- Availability: 2.0.0
--- Deprecation in 2.2.0
+-- Undeprecated
+-- Changed: 2.5.2 replace use of pg_constraint.consrc with pg_get_constraintdef, consrc removed pg12
 CREATE OR REPLACE FUNCTION postgis_constraint_type(geomschema text, geomtable text, geomcolumn text) RETURNS varchar AS
 $$
 SELECT  replace(split_part(s.consrc, '''', 2), ')', '')::varchar
-                FROM pg_class c, pg_namespace n, pg_attribute a, pg_constraint s
+
+                FROM pg_class c, pg_namespace n, pg_attribute a
+                , (SELECT connamespace, conrelid, conkey, pg_get_constraintdef(oid) As consrc
+                   FROM pg_constraint) AS s
                 WHERE n.nspname = $1
                 AND c.relname = $2
                 AND a.attname = $3
@@ -5593,6 +5600,7 @@ LANGUAGE 'sql' STABLE STRICT _PARALLEL;
 -- Changed: 2.1.8 significant performance improvement for constraint based columns
 -- Changed: 2.2.0 get rid of schema, table, column cast to improve performance
 -- Changed: 2.4.0 List also Parent partitioned tables
+-- Changed: 2.5.2 replace use of pg_constraint.consrc with pg_get_constraintdef, consrc removed pg12
 CREATE OR REPLACE VIEW geometry_columns AS
  SELECT current_database()::character varying(256) AS f_table_catalog,
     n.nspname AS f_table_schema,
@@ -5608,21 +5616,24 @@ CREATE OR REPLACE VIEW geometry_columns AS
      LEFT JOIN ( SELECT s.connamespace,
             s.conrelid,
             s.conkey, replace(split_part(s.consrc, ''''::text, 2), ')'::text, ''::text) As type
-           FROM pg_constraint AS s
+           FROM (SELECT connamespace, conrelid, conkey, pg_get_constraintdef(oid) As consrc
+                               FROM pg_constraint) AS s
           WHERE s.consrc ~~* '%geometrytype(% = %'::text
 
 ) st ON st.connamespace = n.oid AND st.conrelid = c.oid AND (a.attnum = ANY (st.conkey))
      LEFT JOIN ( SELECT s.connamespace,
             s.conrelid,
             s.conkey, replace(split_part(s.consrc, ' = '::text, 2), ')'::text, ''::text)::integer As ndims
-           FROM pg_constraint AS s
+           FROM (SELECT connamespace, conrelid, conkey, pg_get_constraintdef(oid) As consrc
+                   FROM pg_constraint) AS s
           WHERE s.consrc ~~* '%ndims(% = %'::text
 
 ) sn ON sn.connamespace = n.oid AND sn.conrelid = c.oid AND (a.attnum = ANY (sn.conkey))
      LEFT JOIN ( SELECT s.connamespace,
             s.conrelid,
             s.conkey, replace(replace(split_part(s.consrc, ' = '::text, 2), ')'::text, ''::text), '('::text, ''::text)::integer As srid
-           FROM pg_constraint AS s
+           FROM (SELECT connamespace, conrelid, conkey, pg_get_constraintdef(oid) As consrc
+                   FROM pg_constraint) AS s
           WHERE s.consrc ~~* '%srid(% = %'::text
 
 ) sr ON sr.connamespace = n.oid AND sr.conrelid = c.oid AND (a.attnum = ANY (sr.conkey))

diff --git a/raster/rt_pg/rtpostgis.sql.in b/raster/rt_pg/rtpostgis.sql.in
index e83e283be76253b51499064e9d3a722c3e188f91..0a1503d04381865cd04029d8ba0067992fe91810 100644 (file)
--- a/raster/rt_pg/rtpostgis.sql.in
+++ b/raster/rt_pg/rtpostgis.sql.in
@@ -7210,7 +7210,9 @@ CREATE OR REPLACE FUNCTION _raster_constraint_info_srid(rastschema name, rasttab
                        split_part(s.consrc, ' = ', 2),
                        '[\(\)]', '', 'g'
                )::integer
-       FROM pg_class c, pg_namespace n, pg_attribute a, pg_constraint s
+       FROM pg_class c, pg_namespace n, pg_attribute a
+               , (SELECT connamespace, conrelid, conkey, pg_get_constraintdef(oid) As consrc
+                   FROM pg_constraint) AS s
        WHERE n.nspname = $1
                AND c.relname = $2
                AND a.attname = $3
@@ -7280,7 +7282,9 @@ CREATE OR REPLACE FUNCTION _raster_constraint_info_scale(rastschema name, rastta
                        ),
                        '[ ''''\(\)]', '', 'g'
                )::text AS val
-       FROM pg_class c, pg_namespace n, pg_attribute a, pg_constraint s
+       FROM pg_class c, pg_namespace n, pg_attribute a
+               , (SELECT connamespace, conrelid, conkey, pg_get_constraintdef(oid) As consrc
+                       FROM pg_constraint) AS s
        WHERE n.nspname = $1
                AND c.relname = $2
                AND a.attname = $3
@@ -7366,7 +7370,9 @@ CREATE OR REPLACE FUNCTION _raster_constraint_info_blocksize(rastschema name, ra
                                        '[\(\)]', '', 'g'
                                )::integer
                        END
-       FROM pg_class c, pg_namespace n, pg_attribute a, pg_constraint s
+       FROM pg_class c, pg_namespace n, pg_attribute a
+               , (SELECT connamespace, conrelid, conkey, pg_get_constraintdef(oid) As consrc
+                       FROM pg_constraint) AS s
        WHERE n.nspname = $1
                AND c.relname = $2
                AND a.attname = $3
@@ -7442,7 +7448,9 @@ CREATE OR REPLACE FUNCTION _raster_constraint_info_extent(rastschema name, rastt
        RETURNS geometry AS $$
        SELECT
                trim(both '''' from split_part(trim(split_part(s.consrc, ' @ ', 2)), '::', 1))::geometry
-       FROM pg_class c, pg_namespace n, pg_attribute a, pg_constraint s
+       FROM pg_class c, pg_namespace n, pg_attribute a
+               , (SELECT connamespace, conrelid, conkey, pg_get_constraintdef(oid) As consrc
+                       FROM pg_constraint) AS s
        WHERE n.nspname = $1
                AND c.relname = $2
                AND a.attname = $3
@@ -7504,7 +7512,9 @@ CREATE OR REPLACE FUNCTION _raster_constraint_info_alignment(rastschema name, ra
        RETURNS boolean AS $$
        SELECT
                TRUE
-       FROM pg_class c, pg_namespace n, pg_attribute a, pg_constraint s
+       FROM pg_class c, pg_namespace n, pg_attribute a
+               , (SELECT connamespace, conrelid, conkey, pg_get_constraintdef(oid) As consrc
+                       FROM pg_constraint) AS s
        WHERE n.nspname = $1
                AND c.relname = $2
                AND a.attname = $3
@@ -7545,7 +7555,7 @@ CREATE OR REPLACE FUNCTION _add_raster_constraint_alignment(rastschema name, ras
 
                sql := 'ALTER TABLE ' || fqtn ||
                        ' ADD CONSTRAINT ' || quote_ident(cn) ||
-                       ' CHECK (st_samealignment(' || quote_ident($3) || ', ''' || attr || '''::raster))';
+                       ' CHECK (@extschema@.st_samealignment(' || quote_ident($3) || ', ''' || attr || '''::raster))';
                RETURN  @extschema@._add_raster_constraint(cn, sql);
        END;
        $$ LANGUAGE 'plpgsql' VOLATILE STRICT
@@ -7561,7 +7571,10 @@ CREATE OR REPLACE FUNCTION _raster_constraint_info_spatially_unique(rastschema n
        RETURNS boolean AS $$
        SELECT
                TRUE
-       FROM pg_class c, pg_namespace n, pg_attribute a, pg_constraint s, pg_index idx, pg_operator op
+       FROM pg_class c, pg_namespace n, pg_attribute a
+               , (SELECT connamespace, conrelid, conindid, conkey, contype, conexclop, pg_get_constraintdef(oid) As consrc
+                       FROM pg_constraint) AS s
+               , pg_index idx, pg_operator op
        WHERE n.nspname = $1
                AND c.relname = $2
                AND a.attname = $3
@@ -7609,7 +7622,10 @@ CREATE OR REPLACE FUNCTION _drop_raster_constraint_spatially_unique(rastschema n
        BEGIN
                SELECT
                        s.conname INTO cn
-               FROM pg_class c, pg_namespace n, pg_attribute a, pg_constraint s, pg_index idx, pg_operator op
+               FROM pg_class c, pg_namespace n, pg_attribute a
+               , (SELECT connamespace, conname, conrelid, conkey, conindid, contype, conexclop, pg_get_constraintdef(oid) As consrc
+                       FROM pg_constraint) AS s
+               , pg_index idx, pg_operator op
                WHERE n.nspname = $1
                        AND c.relname = $2
                        AND a.attname = $3
@@ -7632,7 +7648,9 @@ CREATE OR REPLACE FUNCTION _raster_constraint_info_coverage_tile(rastschema name
        RETURNS boolean AS $$
        SELECT
                TRUE
-       FROM pg_class c, pg_namespace n, pg_attribute a, pg_constraint s
+       FROM pg_class c, pg_namespace n, pg_attribute a
+                       , (SELECT connamespace, conrelid, conkey, pg_get_constraintdef(oid) As consrc
+                       FROM pg_constraint) AS s
        WHERE n.nspname = $1
                AND c.relname = $2
                AND a.attname = $3
@@ -7743,7 +7761,9 @@ CREATE OR REPLACE FUNCTION _raster_constraint_info_num_bands(rastschema name, ra
                        split_part(s.consrc, ' = ', 2),
                        '[\(\)]', '', 'g'
                )::integer
-       FROM pg_class c, pg_namespace n, pg_attribute a, pg_constraint s
+       FROM pg_class c, pg_namespace n, pg_attribute a
+               , (SELECT connamespace, conrelid, conkey, pg_get_constraintdef(oid) As consrc
+                       FROM pg_constraint) AS s
        WHERE n.nspname = $1
                AND c.relname = $2
                AND a.attname = $3
@@ -7810,7 +7830,9 @@ CREATE OR REPLACE FUNCTION _raster_constraint_info_pixel_types(rastschema name,
                                '::', 1
                        )
                )::text[]
-       FROM pg_class c, pg_namespace n, pg_attribute a, pg_constraint s
+       FROM pg_class c, pg_namespace n, pg_attribute a
+               , (SELECT connamespace, conrelid, conkey, pg_get_constraintdef(oid) As consrc
+                       FROM pg_constraint) AS s
        WHERE n.nspname = $1
                AND c.relname = $2
                AND a.attname = $3
@@ -7893,7 +7915,9 @@ CREATE OR REPLACE FUNCTION _raster_constraint_info_nodata_values(rastschema name
                                '::', 1
                        )
                )::double precision[]
-       FROM pg_class c, pg_namespace n, pg_attribute a, pg_constraint s
+       FROM pg_class c, pg_namespace n, pg_attribute a
+               , (SELECT connamespace, conrelid, conkey, pg_get_constraintdef(oid) As consrc
+                       FROM pg_constraint) AS s
        WHERE n.nspname = $1
                AND c.relname = $2
                AND a.attname = $3
@@ -7982,7 +8006,9 @@ CREATE OR REPLACE FUNCTION _raster_constraint_info_out_db(rastschema name, rastt
                                '::', 1
                        )
                )::boolean[]
-       FROM pg_class c, pg_namespace n, pg_attribute a, pg_constraint s
+       FROM pg_class c, pg_namespace n, pg_attribute a
+                       , (SELECT connamespace, conrelid, conkey, pg_get_constraintdef(oid) As consrc
+                       FROM pg_constraint) AS s
        WHERE n.nspname = $1
                AND c.relname = $2
                AND a.attname = $3
@@ -8624,7 +8650,9 @@ CREATE OR REPLACE FUNCTION _overview_constraint_info(
                split_part(split_part(s.consrc, '''::name', 2), '''', 2)::name,
                split_part(split_part(s.consrc, '''::name', 3), '''', 2)::name,
                trim(both from split_part(s.consrc, ',', 2))::integer
-       FROM pg_class c, pg_namespace n, pg_attribute a, pg_constraint s
+       FROM pg_class c, pg_namespace n, pg_attribute a
+               , (SELECT connamespace, conrelid, conkey, pg_get_constraintdef(oid) As consrc
+                       FROM pg_constraint) AS s
        WHERE n.nspname = $1
                AND c.relname = $2
                AND a.attname = $3
@@ -8694,7 +8722,8 @@ CREATE OR REPLACE VIEW raster_overviews AS
                pg_attribute a,
                pg_type t,
                pg_namespace n,
-               pg_constraint s
+               (SELECT connamespace, conrelid, conkey, pg_get_constraintdef(oid) As consrc
+                       FROM pg_constraint) AS s
        WHERE t.typname = 'raster'::name
                AND a.attisdropped = false
                AND a.atttypid = t.oid

diff --git a/topology/topology.sql.in b/topology/topology.sql.in
index 9ddf0789f6d85bf33efab749dee6ef88c23f1cd5..839bd90082dd37a41ac5e546551745032c037a77 100644 (file)
--- a/topology/topology.sql.in
+++ b/topology/topology.sql.in
@@ -829,7 +829,8 @@ $$
     --c.consrc src,
     regexp_matches(c.consrc,
       '\.topology_id = (\d+).*\.layer_id = (\d+).*\.type = (\d+)') inf
-  FROM pg_constraint c, pg_class r, pg_namespace n
+  FROM (SELECT conname, connamespace, conrelid, conkey, pg_get_constraintdef(oid) As consrc
+                   FROM pg_constraint) AS c, pg_class r, pg_namespace n
   WHERE c.conname LIKE 'check_topogeom_%'
     AND r.oid = c.conrelid
     AND n.oid = r.relnamespace