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

diff --git a/extras/tiger_geocoder/tiger_loader_2013.sql b/extras/tiger_geocoder/tiger_loader_2013.sql
index da65bc540becedb8d41f9ec8197b60ccbd0730fc..dfbb83ccc7ce727c57134a0e5d4158354052d021 100644 (file)
--- 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 ac02c9b8d22a8a5a4b61884052fbb669a1ba8c88..ddd6996641902041dca111bed40f6d8c77a63f46 100644 (file)
--- 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 66d54a716431f0615db542fa2a1c8311487cb21b..91a332ee455b76a0b3b0be2b39e46bc94c2b3aee 100644 (file)
--- 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);