From: Regina Obe Date: Tue, 19 Feb 2019 03:46:45 +0000 (+0000) Subject: schema qualify tiger tables X-Git-Tag: 3.0.0alpha1~148 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ad465dba820fb42e4a6c53b54ef807d9d0d030f;p=postgis schema qualify tiger tables git-svn-id: http://svn.osgeo.org/postgis/trunk@17261 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/extras/tiger_geocoder/tiger_loader_2018.sql b/extras/tiger_geocoder/tiger_loader_2018.sql index ce96c98bb..4fb7ade93 100644 --- a/extras/tiger_geocoder/tiger_loader_2018.sql +++ b/extras/tiger_geocoder/tiger_loader_2018.sql @@ -411,8 +411,8 @@ SELECT , ARRAY['psql', 'data_schema','staging_schema', 'staging_fold', 'website_root'], ARRAY[platform.psql, variables.data_schema, variables.staging_schema, variables.staging_fold, variables.website_root]) AS shell_code -FROM loader_variables As variables - CROSS JOIN loader_platform As platform +FROM tiger.loader_variables As variables + CROSS JOIN tiger.loader_platform As platform WHERE platform.os = $1 -- generate script for selected platform ; $BODY$ @@ -440,7 +440,7 @@ SELECT || '_' || lu.table_name || '.dbf tiger_staging.' || lower(s.state_abbrev) || '_' || lu.table_name || ' | '::text || platform.psql || COALESCE(E'\n' || lu.post_load_process , '') , ARRAY['loader','table_name', 'lookup_name'], ARRAY[platform.loader, lu.table_name, lu.lookup_name ]) - FROM loader_lookuptables AS lu + FROM tiger.loader_lookuptables AS lu WHERE level_state = true AND load = true ORDER BY process_order, lookup_name), E'\n') ::text -- County Level files @@ -465,7 +465,7 @@ FROM loader_variables As variables CROSS JOIN (SELECT name As state, abbrev As state_abbrev, lpad(st_code::text,2,'0') As state_fips, lpad(st_code::text,2,'0') || '_' || replace(name, ' ', '_') As state_fold -FROM state_lookup) As s CROSS JOIN loader_platform As platform +FROM tiger.state_lookup) As s CROSS JOIN tiger.loader_platform As platform WHERE $1 @> ARRAY[state_abbrev::text] -- If state is contained in list of states input generate script for it AND platform.os = $2 -- generate script for selected platform ;