sql/build_master_tables.sql

@@ -10,11 +10,11 @@ BEGIN
         SELECT
             -------------------------------------------create table---------------------------------------------------------------------------------------------------------
             'DROP TABLE IF EXISTS fc.'||func||' CASCADE; CREATE TABLE IF NOT EXISTS fc.'||func||' (' || 
-                string_agg(format('%I',cname) || ' ' || dtype,', ' ORDER BY CASE WHEN fkey IS NOT NULL THEN 0 ELSE opos END ASC) || 
+            string_agg(format('%I',cname) || ' ' || dtype,', ' ORDER BY opos ASC) || 
             ', PRIMARY KEY ('||string_agg(format('%I',cname),', ') FILTER (WHERE fkey = func)||'));' AS ddl,
             -------------------------------------------populate table-------------------------------------------------------------------------------------------------------
             ---need to add a clause to exclude where the key is null
-            'INSERT INTO fc.'||func||' SELECT DISTINCT ' || string_agg(format('%I',cname),', ' ORDER BY CASE WHEN fkey IS NOT NULL THEN 0 ELSE opos END ASC) || ' FROM '||tname||' WHERE '||
+            'INSERT INTO fc.'||func||' SELECT DISTINCT ' || string_agg(format('%I',cname),', ' ORDER BY opos ASC) || ' FROM '||tname||' WHERE '||
             string_agg(format('%I',cname)||' IS NOT NULL ',' AND ') FILTER (WHERE fkey = func)||' ON CONFLICT DO NOTHING' AS pop,
             -------------------------------------------setup foreign keys---------------------------------------------------------------------------------------------------
             'ALTER TABLE fc.live ADD CONSTRAINT fk_'||func||' FOREIGN KEY ('||string_agg(format('%I',cname),', ') FILTER (WHERE fkey = func)||') REFERENCES fc.'||func||' ('||

sql/col_interval.sql

@@ -7,7 +7,7 @@ BEGIN
 -------------------------------build a column list----------------------------------------
 SELECT 
     string_agg(
-        format('%I',cname) || CASE WHEN func IN ('odate','sdate') AND dtype = 'date' THEN ' + interval ''1 year''' ELSE '' END,E'\n,' ORDER BY opos ASC)
+        format('%I',cname) || CASE WHEN func IN ('odate','sdate') THEN ' + interval ''1 year''' ELSE '' END,E'\n,' ORDER BY opos ASC)
 INTO
     clist
 FROM 

sql/schema.sql

@@ -9,7 +9,6 @@ CREATE TABLE fc.target_meta (
     ,fkey   text
     ,pretty text
     ,dtype  text
-    ,mastcol text
 );
 
 --ALTER TABLE fc.target_meta DROP CONSTRAINT IF EXISTS target_meta_pk;

sql/target_info.sql

@@ -3,14 +3,13 @@ BEGIN;
 INSERT INTO
     fc.target_meta
 SELECT 
-    table_schema||'.'||table_name
+    table_name
     ,column_name
     ,ordinal_position
     ,'doc'::text func
     ,null::text fkey        --foreign key to a master table
     ,null::text pretty
     ,data_type::text dtype
-    ,column_name mastcol
 FROM 
     information_schema.columns 
 WHERE