From: Regina Obe <lr@pcorp.us>
Date: Thu, 22 Aug 2013 04:36:09 +0000 (+0000)
Subject: #2441 Tiger geocoder uses new features only available in Postgres 9.3.  Revised since... 
X-Git-Tag: 2.2.0rc1~1394
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=157859be9df083a360f60a0cd32a34cd1e986a78;p=postgis

#2441 Tiger geocoder uses new features only available in Postgres 9.3.  Revised since running with sh didn't like some of my changes

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

diff --git a/extras/tiger_geocoder/tiger_2011/tiger_loader_2012.sql b/extras/tiger_geocoder/tiger_2011/tiger_loader_2012.sql
index d187585e2..d232ef4dc 100644
--- a/extras/tiger_geocoder/tiger_2011/tiger_loader_2012.sql
+++ b/extras/tiger_geocoder/tiger_2011/tiger_loader_2012.sql
@@ -63,6 +63,16 @@ BEGIN
 END 
 $$ LANGUAGE 'plpgsql';
 
+DO 
+$$
+BEGIN
+  IF NOT EXISTS (SELECT * FROM information_schema.schemata WHERE schema_name = 'tiger_data') THEN
+       CREATE SCHEMA tiger_data;     
+  END IF;   
+END 
+$$ LANGUAGE 'plpgsql';
+
+
 DELETE FROM loader_platform WHERE os IN ('sh', 'windows');
 GRANT SELECT ON TABLE loader_platform TO public;
 INSERT INTO loader_platform(os, wget, pgbin, declare_sect, unzip_command, psql,path_sep,loader, environ_set_command, county_process_command)
@@ -80,7 +90,7 @@ set PSQL="%PGBIN%psql"
 set SHP2PGSQL="%PGBIN%shp2pgsql"
 cd ${staging_fold}
 ', E'del %TMPDIR%\\*.* /Q
-%PSQL% -c "DROP SCHEMA IF EXISTS ${staging_schema} CASCADE; CREATE SCHEMA ${staging_schema};"
+%PSQL% -c "DROP SCHEMA IF EXISTS ${staging_schema} CASCADE;"
 %PSQL% -c "CREATE SCHEMA ${staging_schema};"
 %PSQL% -c "DO language ''plpgsql'' $$ BEGIN IF NOT EXISTS (SELECT * FROM information_schema.schemata WHERE schema_name = ''${data_schema}'' ) THEN CREATE SCHEMA ${data_schema}; END IF;  END $$"
 for /r %%z in (*.zip) do %UNZIPTOOL% e %%z  -o%TMPDIR% 
@@ -104,10 +114,8 @@ PSQL=${PGBIN}/psql
 SHP2PGSQL=${PGBIN}/shp2pgsql
 cd ${staging_fold}
 ', E'rm -f ${TMPDIR}/*.*
-%PSQL% -c "DROP SCHEMA IF EXISTS ${staging_schema} CASCADE; CREATE SCHEMA ${staging_schema};"
-%PSQL% -c "CREATE SCHEMA ${staging_schema};"
-%PSQL% -c "DO language ''plpgsql'' $$ BEGIN IF NOT EXISTS (SELECT * FROM information_schema.schemata WHERE schema_name = ''${data_schema}'' ) THEN CREATE SCHEMA ${data_schema}; END IF;  END $$"
-
+${PSQL} -c "DROP SCHEMA IF EXISTS ${staging_schema} CASCADE;"
+${PSQL} -c "CREATE SCHEMA ${staging_schema};"
 for z in *.zip; do $UNZIPTOOL -o -d $TMPDIR $z; done
 for z in */*.zip; do $UNZIPTOOL -o -d $TMPDIR $z; done
 cd $TMPDIR;\n', '${PSQL}', '/', '${SHP2PGSQL}', 'export ',