Commit 93fdaa7b authored by Regina Obe's avatar Regina Obe

schema qualify raster function calls

references #3496

git-svn-id: http://svn.osgeo.org/postgis/trunk@15032 b70326c6-7e19-0410-871a-916f4a2858ee
parent dfbc1edb
Pipeline #3830794 passed with stage
in 19 minutes and 30 seconds
......@@ -37,7 +37,7 @@ ifeq ($(PG91),yes)
all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql sql_minor_upgrade
sql/$(EXTENSION).sql: sql_bits/postgis.sql sql_bits/postgis_proc_set_search_path.sql sql_bits/postgis_comments.sql sql_bits/rtpostgis.sql sql_bits/rtpostgis_proc_set_search_path.sql sql_bits/spatial_ref_sys_config_dump.sql sql_bits/raster_comments.sql sql_bits/spatial_ref_sys.sql
sql/$(EXTENSION).sql: sql_bits/postgis.sql sql_bits/postgis_proc_set_search_path.sql sql_bits/postgis_comments.sql sql_bits/rtpostgis.sql sql_bits/spatial_ref_sys_config_dump.sql sql_bits/raster_comments.sql sql_bits/spatial_ref_sys.sql
mkdir -p sql
echo '\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \quit' > $@
cat $^ >> $@
......@@ -74,9 +74,6 @@ sql_bits/postgis_comments.sql: ../../doc/postgis_comments.sql
sql_bits/postgis_proc_set_search_path.sql: ../../postgis/postgis_proc_set_search_path.sql
cp $< $@
sql_bits/rtpostgis_proc_set_search_path.sql: ../../raster/rt_pg/rtpostgis_proc_set_search_path.sql
cp $< $@
#strip BEGIN/COMMIT since these are not allowed in extensions
sql_bits/rtpostgis.sql: ../../raster/rt_pg/rtpostgis_for_extension.sql
$(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' $< > $@
......@@ -98,7 +95,7 @@ sql_bits/raster_comments.sql: ../../doc/raster_comments.sql
cp $< $@
#postgis_extension_upgrade_minor.sql is the one that contains both postgis AND raster
sql_bits/postgis_extension_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/postgis_upgrade.sql sql_bits/postgis_proc_set_search_path.sql sql_bits/rtpostgis_upgrade.sql sql_bits/rtpostgis_proc_set_search_path.sql ../../doc/raster_comments.sql ../../doc/postgis_comments.sql ../postgis_extension_helper_uninstall.sql
sql_bits/postgis_extension_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/postgis_upgrade.sql sql_bits/postgis_proc_set_search_path.sql sql_bits/rtpostgis_upgrade.sql ../../doc/raster_comments.sql ../../doc/postgis_comments.sql ../postgis_extension_helper_uninstall.sql
echo '\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \quit' > $@
cat $^ >> $@
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -302,7 +302,7 @@ SELECT
round(max::numeric, 3),
count,
round(percent::numeric, 3)
FROM ST_Histogram('test1', 'rast', 1, TRUE, 0, NULL, FALSE);
FROM ST_Histogram('test_histogram', 'rast', 1, TRUE, 0, NULL, FALSE);
ROLLBACK TO SAVEPOINT test;
RELEASE SAVEPOINT test;
SAVEPOINT test;
......@@ -311,7 +311,7 @@ SELECT
round(max::numeric, 3),
count,
round(percent::numeric, 3)
FROM ST_Histogram('test_histogram', 'rast1', 1, TRUE, 0, NULL, FALSE);
FROM ST_Histogram('test_histogram', 'rast', 1, TRUE, 0, NULL, FALSE);
ROLLBACK TO SAVEPOINT test;
RELEASE SAVEPOINT test;
ROLLBACK;
......@@ -90,11 +90,13 @@ ERROR: RASTER_histogramCoverage: Cannot get summary stats of coverage
COMMIT
RELEASE
SAVEPOINT
ERROR: relation "test1" does not exist at character 82
-10.000|-3.429|10|0.500
-3.429|3.142|10|0.500
COMMIT
RELEASE
SAVEPOINT
ERROR: column "rast1" does not exist at character 50
-10.000|-3.429|10|0.500
-3.429|3.142|10|0.500
COMMIT
RELEASE
COMMIT
......@@ -277,11 +277,11 @@ SELECT round(ST_Quantile('test_quantile', 'rast', 2, 0.5)::numeric, 3);
ROLLBACK TO SAVEPOINT test;
RELEASE SAVEPOINT test;
SAVEPOINT test;
SELECT round(ST_Quantile('test_quantile1', 'rast', 0.5)::numeric, 3);
SELECT round(ST_Quantile('test_quantile', 'rast', 0.5)::numeric, 3);
ROLLBACK TO SAVEPOINT test;
RELEASE SAVEPOINT test;
SAVEPOINT test;
SELECT round(ST_Quantile('test_quantile', 'rast2', 1, 0.5)::numeric, 3);
SELECT round(ST_Quantile('test_quantile', 'rast', 1, 0.5)::numeric, 3);
ROLLBACK TO SAVEPOINT test;
RELEASE SAVEPOINT test;
SAVEPOINT test;
......
......@@ -101,11 +101,11 @@ NOTICE: Invalid band index (must use 1-based). Returning NULL
COMMIT
RELEASE
SAVEPOINT
ERROR: relation "test_quantile1" does not exist at character 82
3.142
COMMIT
RELEASE
SAVEPOINT
ERROR: column "rast2" does not exist at character 50
3.142
COMMIT
RELEASE
SAVEPOINT
......
......@@ -215,7 +215,7 @@ SELECT
round(stddev::numeric, 3),
round(min::numeric, 3),
round(max::numeric, 3)
FROM ST_SummaryStats('test1', 'rast');
FROM ST_SummaryStats('test_summarystats', 'rast');
ROLLBACK TO SAVEPOINT test;
RELEASE SAVEPOINT test;
SAVEPOINT test;
......@@ -226,7 +226,7 @@ SELECT
round(stddev::numeric, 3),
round(min::numeric, 3),
round(max::numeric, 3)
FROM ST_SummaryStats('test_summarystats', 'rast1');
FROM ST_SummaryStats('test_summarystats', 'rast');
ROLLBACK TO SAVEPOINT test;
RELEASE SAVEPOINT test;
SAVEPOINT test;
......
......@@ -30,11 +30,11 @@ NOTICE: Raster does not have band at index 2. Skipping raster
COMMIT
RELEASE
SAVEPOINT
ERROR: relation "test1" does not exist at character 82
20|-68.584|-3.429|6.571|-10.000|3.142
COMMIT
RELEASE
SAVEPOINT
ERROR: column "rast1" does not exist at character 50
20|-68.584|-3.429|6.571|-10.000|3.142
COMMIT
RELEASE
SAVEPOINT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment