Fix AddRasterConstraints in presence of null geoms in table

References #4547 in 2.4 branch

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

diff --git a/raster/rt_pg/rtpostgis.sql.in b/raster/rt_pg/rtpostgis.sql.in
index b2037647cd21cd947664855dd222f4f0447664b6..da62cabd9fa25e0a914b33828be6030ae4ab4f58 100644 (file)
--- a/raster/rt_pg/rtpostgis.sql.in
+++ b/raster/rt_pg/rtpostgis.sql.in
@@ -7197,24 +7197,28 @@ CREATE OR REPLACE FUNCTION _add_raster_constraint_extent(rastschema name, rastta
                attr text; srid integer;
        BEGIN
                fqtn := '';
-               IF length($1) > 0 THEN
-                       fqtn := quote_ident($1) || '.';
+               IF length(rastschema) > 0 THEN
+                       fqtn := quote_ident(rastschema) || '.';
                END IF;
-               fqtn := fqtn || quote_ident($2);
+               fqtn := fqtn || quote_ident(rasttable);
 
                sql := 'SELECT @extschema@.ST_SRID('
-                       || quote_ident($3)
+                       || quote_ident(rastcolumn)
                        || ') FROM '
                        || fqtn
                        || ' WHERE '
-                       || quote_ident($3)
+                       || quote_ident(rastcolumn)
                        || ' IS NOT NULL LIMIT 1;';
                 EXECUTE sql INTO srid;
 
-               cn := 'enforce_max_extent_' || $3;
+    IF srid IS NULL THEN
+      RETURN false;
+    END IF;
+
+               cn := 'enforce_max_extent_' || rastcolumn;
 
                sql := 'SELECT @extschema@.st_ashexewkb( @extschema@.st_setsrid( @extschema@.st_extent( @extschema@.st_envelope('
-                       || quote_ident($3)
+                       || quote_ident(rastcolumn)
                        || ')), ' || srid || ')) FROM '
                        || fqtn;
                EXECUTE sql INTO attr;
@@ -7223,7 +7227,7 @@ CREATE OR REPLACE FUNCTION _add_raster_constraint_extent(rastschema name, rastta
                sql := 'ALTER TABLE ' || fqtn
                        || ' ADD CONSTRAINT ' || quote_ident(cn)
                        || ' CHECK ( @extschema@.st_envelope('
-                       || quote_ident($3)
+                       || quote_ident(rastcolumn)
                        || ') @ ''' || attr || '''::@extschema@.geometry) NOT VALID';
                RETURN  @extschema@._add_raster_constraint(cn, sql);
        END;

diff --git a/raster/test/regress/tickets.sql b/raster/test/regress/tickets.sql
index 5501ebb8932ee4c17202ac52b71a9e59344e9426..0d94231047f9770a672f538875827f5407d1337e 100644 (file)
--- a/raster/test/regress/tickets.sql
+++ b/raster/test/regress/tickets.sql
@@ -125,4 +125,13 @@ CREATE TABLE table_4308 (r raster);
 INSERT INTO table_4308(r) values (NULL);
 INSERT INTO table_4308(r) SELECT ST_AddBand(ST_MakeEmptyRaster(10, 10, 1, 1, 2, 2, 0, 0,4326), 1, '8BSI'::text, -129, NULL);;
 SELECT AddRasterConstraints('table_4308', 'r');
-DROP TABLE table_4308;
\ No newline at end of file
+DROP TABLE table_4308;
+
+
+-- #4547
+CREATE TABLE ticket_4547(r raster);
+SELECT '#4547.1', AddRasterConstraints('ticket_4547', 'r');
+INSERT INTO ticket_4547 VALUES (null);
+INSERT INTO ticket_4547 SELECT ST_AddBand(ST_MakeEmptyRaster(10, 10, 1, 1, 2, 2, 0, 0,4326), 1, '8BSI'::text, -129, NULL);
+SELECT '#4547.2', AddRasterConstraints('ticket_4547', 'r');
+DROP TABLE ticket_4547;

diff --git a/raster/test/regress/tickets_expected b/raster/test/regress/tickets_expected
index 31ff4d4f684d625ed7a80bf2de3fcee4cc37b06e..fee0e70d45eb76cd850dc1683590d65a112195af 100644 (file)
--- a/raster/test/regress/tickets_expected
+++ b/raster/test/regress/tickets_expected
@@ -26,3 +26,42 @@ NOTICE:  Adding nodata value constraint
 NOTICE:  Adding out-of-database constraint
 NOTICE:  Adding maximum extent constraint
 t
+NOTICE:  Adding SRID constraint
+NOTICE:  Adding scale-X constraint
+NOTICE:  Adding scale-Y constraint
+NOTICE:  Adding blocksize-X constraint
+NOTICE:  Unable to add constraint: enforce_width_r
+NOTICE:  SQL used for failed constraint: ALTER TABLE public.ticket_4547 ADD CONSTRAINT enforce_width_r CHECK (st_width(r) IN ())
+NOTICE:  Returned error message: syntax error at or near ")" (42601)
+WARNING:  Unable to add constraint: 'blocksize_x'.  Skipping
+NOTICE:  Adding blocksize-Y constraint
+NOTICE:  Unable to add constraint: enforce_height_r
+NOTICE:  SQL used for failed constraint: ALTER TABLE public.ticket_4547 ADD CONSTRAINT enforce_height_r CHECK (st_height(r) IN ())
+NOTICE:  Returned error message: syntax error at or near ")" (42601)
+WARNING:  Unable to add constraint: 'blocksize_y'.  Skipping
+NOTICE:  Adding alignment constraint
+NOTICE:  Adding number of bands constraint
+NOTICE:  Adding pixel type constraint
+NOTICE:  Unable to get the pixel types of a sample raster (max < 1 or null)
+WARNING:  Unable to add constraint: 'pixel_types'.  Skipping
+NOTICE:  Adding nodata value constraint
+NOTICE:  Unable to get the nodata values of a sample raster (max < 1 or null)
+WARNING:  Unable to add constraint: 'nodata_values'.  Skipping
+NOTICE:  Adding out-of-database constraint
+NOTICE:  Unable to get the out-of-database bands of a sample raster (max < 1 or null)
+WARNING:  Unable to add constraint: 'out_db'.  Skipping
+NOTICE:  Adding maximum extent constraint
+WARNING:  Unable to add constraint: 'extent'.  Skipping
+#4547.1|t
+NOTICE:  Adding SRID constraint
+NOTICE:  Adding scale-X constraint
+NOTICE:  Adding scale-Y constraint
+NOTICE:  Adding blocksize-X constraint
+NOTICE:  Adding blocksize-Y constraint
+NOTICE:  Adding alignment constraint
+NOTICE:  Adding number of bands constraint
+NOTICE:  Adding pixel type constraint
+NOTICE:  Adding nodata value constraint
+NOTICE:  Adding out-of-database constraint
+NOTICE:  Adding maximum extent constraint
+#4547.2|t