From 1626697eede12ccf46cb5e9156520902e964ffa9 Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Sat, 24 Oct 2015 22:11:40 +0000 Subject: [PATCH] addresses #3347 force order of staged insert columns to be in table column order git-svn-id: http://svn.osgeo.org/postgis/trunk@14316 b70326c6-7e19-0410-871a-916f4a2858ee --- extras/tiger_geocoder/tiger_loader_2013.sql | 6 ++++-- extras/tiger_geocoder/tiger_loader_2014.sql | 6 ++++-- extras/tiger_geocoder/tiger_loader_2015.sql | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/extras/tiger_geocoder/tiger_loader_2013.sql b/extras/tiger_geocoder/tiger_loader_2013.sql index da65bc540..dfbb83ccc 100644 --- a/extras/tiger_geocoder/tiger_loader_2013.sql +++ b/extras/tiger_geocoder/tiger_loader_2013.sql @@ -373,12 +373,14 @@ BEGIN FROM information_schema.columns WHERE table_name = param_target_table AND table_schema = var_data_schema - AND column_name <> ALL(param_columns_exclude) ), ',') || ') SELECT ' + AND column_name <> ALL(param_columns_exclude) + ORDER BY ordinal_position ), ',') || ') SELECT ' || array_to_string(ARRAY(SELECT quote_ident(column_name::text) FROM information_schema.columns WHERE table_name = param_staging_table AND table_schema = var_staging_schema - AND column_name <> ALL( param_columns_exclude) ), ',') ||' FROM ' + AND column_name <> ALL( param_columns_exclude) + ORDER BY ordinal_position ), ',') ||' FROM ' || var_staging_schema || '.' || param_staging_table || ';'; RAISE NOTICE '%', var_sql; EXECUTE (var_sql); diff --git a/extras/tiger_geocoder/tiger_loader_2014.sql b/extras/tiger_geocoder/tiger_loader_2014.sql index ac02c9b8d..ddd699664 100644 --- a/extras/tiger_geocoder/tiger_loader_2014.sql +++ b/extras/tiger_geocoder/tiger_loader_2014.sql @@ -486,12 +486,14 @@ BEGIN FROM information_schema.columns WHERE table_name = param_target_table AND table_schema = var_data_schema - AND column_name <> ALL(param_columns_exclude) ), ',') || ') SELECT ' + AND column_name <> ALL(param_columns_exclude) + ORDER BY ordinal_position ), ',') || ') SELECT ' || array_to_string(ARRAY(SELECT quote_ident(column_name::text) FROM information_schema.columns WHERE table_name = param_staging_table AND table_schema = var_staging_schema - AND column_name <> ALL( param_columns_exclude) ), ',') ||' FROM ' + AND column_name <> ALL( param_columns_exclude) + ORDER BY ordinal_position ), ',') ||' FROM ' || var_staging_schema || '.' || param_staging_table || ';'; RAISE NOTICE '%', var_sql; EXECUTE (var_sql); diff --git a/extras/tiger_geocoder/tiger_loader_2015.sql b/extras/tiger_geocoder/tiger_loader_2015.sql index 66d54a716..91a332ee4 100644 --- a/extras/tiger_geocoder/tiger_loader_2015.sql +++ b/extras/tiger_geocoder/tiger_loader_2015.sql @@ -486,12 +486,14 @@ BEGIN FROM information_schema.columns WHERE table_name = param_target_table AND table_schema = var_data_schema - AND column_name <> ALL(param_columns_exclude) ), ',') || ') SELECT ' + AND column_name <> ALL(param_columns_exclude) + ORDER BY ordinal_position ), ',') || ') SELECT ' || array_to_string(ARRAY(SELECT quote_ident(column_name::text) FROM information_schema.columns WHERE table_name = param_staging_table AND table_schema = var_staging_schema - AND column_name <> ALL( param_columns_exclude) ), ',') ||' FROM ' + AND column_name <> ALL( param_columns_exclude) + ORDER BY ordinal_position ), ',') ||' FROM ' || var_staging_schema || '.' || param_staging_table || ';'; RAISE NOTICE '%', var_sql; EXECUTE (var_sql); -- 2.40.0