From: Sandro Santilli <strk@keybit.net>
Date: Fri, 20 Jan 2012 09:11:42 +0000 (+0000)
Subject: Exclude raster_columns from geometry_columns (#1122)
X-Git-Tag: 2.0.0alpha2~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4661b67807aeca2732a5fe9bcf9cf3664314ead8;p=postgis

Exclude raster_columns from geometry_columns (#1122)

Add regress test, with a newborn "tickets" testcase for raster

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

diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c
index 35a9356aa..c19f4a4f3 100644
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -4344,7 +4344,8 @@ CREATE OR REPLACE VIEW geometry_columns AS
     AND a.attrelid = c.oid 
     AND c.relnamespace = n.oid 
     AND (c.relkind = 'r'::"char" OR c.relkind = 'v'::"char")
-    AND NOT pg_is_other_temp_schema(c.relnamespace);
+    AND NOT pg_is_other_temp_schema(c.relnamespace)
+    AND NOT ( n.nspname = 'public' AND c.relname = 'raster_columns' );
 
 -- TODO: support RETURNING and raise a WARNING
 CREATE OR REPLACE RULE geometry_columns_insert AS
diff --git a/raster/test/regress/Makefile.in b/raster/test/regress/Makefile.in
index 3c7ab0d11..09786b9c4 100644
--- a/raster/test/regress/Makefile.in
+++ b/raster/test/regress/Makefile.in
@@ -123,7 +123,8 @@ TEST_SREL = \
 	$(NULL)
 	
 TEST_BUGS = \
-	bug_test_car5.sql
+	bug_test_car5.sql \
+	tickets.sql
 
 TESTS = $(TEST_METADATA) $(TEST_IO) $(TEST_FUNC) \
 		$(TEST_PROPS) $(TEST_BANDPROPS) \
diff --git a/raster/test/regress/tickets.sql b/raster/test/regress/tickets.sql
new file mode 100644
index 000000000..9ea0f447a
--- /dev/null
+++ b/raster/test/regress/tickets.sql
@@ -0,0 +1,3 @@
+-- #1485
+SELECT '#1485', count(*) FROM geometry_columns
+WHERE f_table_name = 'raster_columns';
diff --git a/raster/test/regress/tickets_expected b/raster/test/regress/tickets_expected
new file mode 100644
index 000000000..1c1b1e09e
--- /dev/null
+++ b/raster/test/regress/tickets_expected
@@ -0,0 +1 @@
+#1485|0