From: Sandro Santilli <strk@keybit.net>
Date: Fri, 11 Apr 2014 09:26:39 +0000 (+0000)
Subject: Fix testsuite with custom POSTGIS_REGRESS_DB set
X-Git-Tag: 2.2.0rc1~1132
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7fabc192953e790ec64102b38a1624d7a52c9871;p=postgis

Fix testsuite with custom POSTGIS_REGRESS_DB set

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

diff --git a/regress/typmod.sql b/regress/typmod.sql
index 83c5bcde3..f1e7bcfeb 100644
--- a/regress/typmod.sql
+++ b/regress/typmod.sql
@@ -223,9 +223,9 @@ SELECT 'gg',
  coord_dimension, srid, type
 from geography_columns ORDER BY f_table_name;
 
-SELECT distinct 'catalog-schema', f_table_catalog,f_table_schema FROM geometry_columns
+SELECT distinct 'catalog-schema', f_table_catalog = current_database(),f_table_schema FROM geometry_columns
 UNION
-SELECT distinct 'catalog-schema', f_table_catalog,f_table_schema FROM geography_columns
+SELECT distinct 'catalog-schema', f_table_catalog = current_database(),f_table_schema FROM geography_columns
 ;
 
 CREATE TABLE tm.types (id serial, g geometry);
diff --git a/regress/typmod_expected b/regress/typmod_expected
index 55df91822..1cf5a8a25 100644
--- a/regress/typmod_expected
+++ b/regress/typmod_expected
@@ -286,7 +286,7 @@ gg|polygonz4326|gg|3|4326|PolygonZ
 gg|polygonzm|gg|4|4326|PolygonZM
 gg|polygonzm0|gg|4|4326|PolygonZM
 gg|polygonzm4326|gg|4|4326|PolygonZM
-catalog-schema|postgis_reg|tm
+catalog-schema|t|tm
 circularstring|0|Point|0|KO-BKO
 circularstring|0|LineString|0|KO-BKO
 circularstring|0|Polygon|0|KO-BKO