add dynamic target table; dynamically create additional columns if application columns were not defined

get rid of temporary output
?
2022-04-06 01:52:18 -04:00 · 2022-04-05 23:08:29 -04:00 · 2022-04-05 23:08:06 -04:00
7 changed files with 806 additions and 409 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -1,8 +1,705 @@
 {
  "name": "nodet",
  "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
  "requires": true,
+  "packages": {
+    "": {
+      "name": "nodet",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "body-parser": "^1.19.0",
+        "dotenv": "^8.2.0",
+        "express": "^4.17.1",
+        "fs": "0.0.1-security",
+        "https": "^1.0.0",
+        "pg": "^8.5.1",
+        "readline": "^1.3.0"
+      }
+    },
+    "node_modules/accepts": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "dependencies": {
+        "mime-types": "~2.1.24",
+        "negotiator": "0.6.2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+    },
+    "node_modules/body-parser": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
+      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+      "dependencies": {
+        "bytes": "3.1.0",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "on-finished": "~2.3.0",
+        "qs": "6.7.0",
+        "raw-body": "2.4.0",
+        "type-is": "~1.6.17"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/buffer-writer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz",
+      "integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/bytes": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/content-disposition": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
+      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "dependencies": {
+        "safe-buffer": "5.1.2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
+      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+    },
+    "node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+    },
+    "node_modules/dotenv": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
+      "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+    },
+    "node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+    },
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/express": {
+      "version": "4.17.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
+      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "dependencies": {
+        "accepts": "~1.3.7",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.19.0",
+        "content-disposition": "0.5.3",
+        "content-type": "~1.0.4",
+        "cookie": "0.4.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "~1.1.2",
+        "fresh": "0.5.2",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.5",
+        "qs": "6.7.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.1.2",
+        "send": "0.17.1",
+        "serve-static": "1.14.1",
+        "setprototypeof": "1.1.1",
+        "statuses": "~1.5.0",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/finalhandler": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fs": {
+      "version": "0.0.1-security",
+      "resolved": "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz",
+      "integrity": "sha1-invTcYa23d84E/I4WLV+yq9eQdQ="
+    },
+    "node_modules/http-errors": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.1",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/https": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https/-/https-1.0.0.tgz",
+      "integrity": "sha1-PDfHrhqO65ZpBKKtHpdaGUt+06Q="
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    },
+    "node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+    },
+    "node_modules/methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.44.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.27",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+      "dependencies": {
+        "mime-db": "1.44.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/packet-reader": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz",
+      "integrity": "sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="
+    },
+    "node_modules/parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+    },
+    "node_modules/pg": {
+      "version": "8.5.1",
+      "resolved": "https://registry.npmjs.org/pg/-/pg-8.5.1.tgz",
+      "integrity": "sha512-9wm3yX9lCfjvA98ybCyw2pADUivyNWT/yIP4ZcDVpMN0og70BUWYEGXPCTAQdGTAqnytfRADb7NERrY1qxhIqw==",
+      "dependencies": {
+        "buffer-writer": "2.0.0",
+        "packet-reader": "1.0.0",
+        "pg-connection-string": "^2.4.0",
+        "pg-pool": "^3.2.2",
+        "pg-protocol": "^1.4.0",
+        "pg-types": "^2.1.0",
+        "pgpass": "1.x"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      },
+      "peerDependencies": {
+        "pg-native": ">=2.0.0"
+      },
+      "peerDependenciesMeta": {
+        "pg-native": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/pg-connection-string": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.4.0.tgz",
+      "integrity": "sha512-3iBXuv7XKvxeMrIgym7njT+HlZkwZqqGX4Bu9cci8xHZNT+Um1gWKqCsAzcC0d95rcKMU5WBg6YRUcHyV0HZKQ=="
+    },
+    "node_modules/pg-int8": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
+      "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==",
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/pg-pool": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.2.tgz",
+      "integrity": "sha512-ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA==",
+      "peerDependencies": {
+        "pg": ">=8.0"
+      }
+    },
+    "node_modules/pg-protocol": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.4.0.tgz",
+      "integrity": "sha512-El+aXWcwG/8wuFICMQjM5ZSAm6OWiJicFdNYo+VY3QP+8vI4SvLIWVe51PppTzMhikUJR+PsyIFKqfdXPz/yxA=="
+    },
+    "node_modules/pg-types": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
+      "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
+      "dependencies": {
+        "pg-int8": "1.0.1",
+        "postgres-array": "~2.0.0",
+        "postgres-bytea": "~1.0.0",
+        "postgres-date": "~1.0.4",
+        "postgres-interval": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pgpass": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.4.tgz",
+      "integrity": "sha512-YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w==",
+      "dependencies": {
+        "split2": "^3.1.1"
+      }
+    },
+    "node_modules/postgres-array": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
+      "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postgres-bytea": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
+      "integrity": "sha1-AntTPAqokOJtFy1Hz5zOzFIazTU=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postgres-date": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
+      "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postgres-interval": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
+      "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
+      "dependencies": {
+        "xtend": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/proxy-addr": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
+      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
+      "dependencies": {
+        "forwarded": "~0.1.2",
+        "ipaddr.js": "1.9.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/qs": {
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/raw-body": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
+      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+      "dependencies": {
+        "bytes": "3.1.0",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/readline": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/readline/-/readline-1.3.0.tgz",
+      "integrity": "sha1-xYDXfvLPyHUrEySYBg3JeTp6wBw="
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "node_modules/send": {
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
+      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "~1.7.2",
+        "mime": "1.6.0",
+        "ms": "2.1.1",
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.1",
+        "statuses": "~1.5.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/send/node_modules/ms": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+    },
+    "node_modules/serve-static": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
+      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+      "dependencies": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.17.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/setprototypeof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
+    },
+    "node_modules/split2": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
+      "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
+      "dependencies": {
+        "readable-stream": "^3.0.0"
+      }
+    },
+    "node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string_decoder/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "dependencies": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
+    "node_modules/utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "engines": {
+        "node": ">=0.4"
+      }
+    }
+  },
  "dependencies": {
    "accepts": {
      "version": "1.3.7",
@ -305,7 +1002,8 @@
    "pg-pool": {
      "version": "3.2.2",
      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.2.tgz",
-      "integrity": "sha512-ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA=="
+      "integrity": "sha512-ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA==",
+      "requires": {}
    },
    "pg-protocol": {
      "version": "1.4.0",
--- a/routes/baseline/baseline.sql
+++ b/routes/baseline/baseline.sql
@ -1,363 +0,0 @@
-DELETE FROM fc.live WHERE version = 'forecast_name';
-WITH
-baseline AS (
-SELECT
-    o."ddord#"
-    ,o."dditm#"
-    ,o."fgbol#"
-    ,o."fgent#"
-    ,o."diinv#"
-    ,o."dilin#"
-    ,o.quoten
-    ,o.quotel
-    ,o.dcodat
-    ,o.ddqdat
-    ,o.dcmdat
-    ,o.fesdat
-    ,o.dhidat
-    ,o.fesind
-    ,o.dhpost
-    ,o.fspr
-    ,o.ddqtoi
-    ,o.ddqtsi
-    ,o.fgqshp
-    ,o.diqtsh
-    ,o.diext
-    ,o.ditdis
-    ,o.discj
-    ,o.dhincr
-    ,o.plnt
-    ,o.promo
-    ,o.return_reas
-    ,o.terms
-    ,o.custpo
-    ,o.remit_to
-    ,o.bill_class
-    ,o.bill_cust
-    ,o.bill_rep
-    ,o.bill_terr
-    ,o.ship_class
-    ,o.ship_cust
-    ,o.ship_rep
-    ,o.ship_terr
-    ,o.dsm
-    ,o.account
-    ,o.shipgrp
-    ,o.geo
-    ,o.chan
-    ,o.chansub
-    ,o.orig_ctry
-    ,o.orig_prov
-    ,o.orig_post
-    ,o.bill_ctry
-    ,o.bill_prov
-    ,o.bill_post
-    ,o.dest_ctry
-    ,o.dest_prov
-    ,o.dest_post
-    ,o.part
-    ,o.styc
-    ,o.colc
-    ,o.colgrp
-    ,o.coltier
-    ,o.colstat
-    ,o.sizc
-    ,o.pckg
-    ,o.kit
-    ,o.brnd
-    ,o.majg
-    ,o.ming
-    ,o.majs
-    ,o.mins
-    ,o.gldco
-    ,o.gldc
-    ,o.glec
-    ,o.harm
-    ,o.clss
-    ,o.brand
-    ,o.assc
-    ,o.ddunit
-    ,o.unti
-    ,o.lbs
-    ,o.plt
-    ,o.plcd
-    ,o.fs_line
-    ,o.r_currency
-    ,o.r_rate
-    ,o.c_currency
-    ,o.c_rate
-    ,o.fb_qty
-    ,o.fb_val_loc
-    ,o.fb_val_loc_dis
-    ,o.fb_val_loc_qt
-    ,o.fb_val_loc_pl
-    ,o.fb_val_loc_tar
-    ,o.fb_cst_loc
-    ,o.fb_cst_loc_cur
-    ,o.fb_cst_loc_fut
-    ,o.calc_status
-    ,o.flag
-    ,o.odate
-    ,o.oseas
-    ,o.rdate
-    ,o.rseas
-    ,o.sdate
-    ,o.sseas
-    ,'forecast_name' "version"
-    ,'actuals' iter
-FROM
-    fc.live o
-WHERE
-    (
-        --base period orders booked....
-        odate BETWEEN 'app_baseline_from_date'::date AND 'app_baseline_to_date'::date
-        --...or any open orders currently booked before cutoff....
-        OR (calc_status IN (app_openstatus_code) and odate <= 'app_openorder_cutoff'::date)
-        --...or anything that shipped in that period
-        OR (sdate BETWEEN 'app_baseline_from_date'::date AND 'app_baseline_to_date'::date)
-    )
-    --be sure to pre-exclude unwanted items, like canceled orders, non-gross sales, and short-ships
-UNION ALL
-SELECT
-    o."ddord#"
-    ,o."dditm#"
-    ,o."fgbol#"
-    ,o."fgent#"
-    ,o."diinv#"
-    ,o."dilin#"
-    ,o.quoten
-    ,o.quotel
-    ,o.dcodat
-    ,o.ddqdat
-    ,o.dcmdat
-    ,o.fesdat
-    ,o.dhidat
-    ,o.fesind
-    ,o.dhpost
-    ,o.fspr
-    ,o.ddqtoi
-    ,o.ddqtsi
-    ,o.fgqshp
-    ,o.diqtsh
-    ,o.diext
-    ,o.ditdis
-    ,o.discj
-    ,o.dhincr
-    ,o.plnt
-    ,o.promo
-    ,o.return_reas
-    ,o.terms
-    ,o.custpo
-    ,o.remit_to
-    ,o.bill_class
-    ,o.bill_cust
-    ,o.bill_rep
-    ,o.bill_terr
-    ,o.ship_class
-    ,o.ship_cust
-    ,o.ship_rep
-    ,o.ship_terr
-    ,o.dsm
-    ,o.account
-    ,o.shipgrp
-    ,o.geo
-    ,o.chan
-    ,o.chansub
-    ,o.orig_ctry
-    ,o.orig_prov
-    ,o.orig_post
-    ,o.bill_ctry
-    ,o.bill_prov
-    ,o.bill_post
-    ,o.dest_ctry
-    ,o.dest_prov
-    ,o.dest_post
-    ,o.part
-    ,o.styc
-    ,o.colc
-    ,o.colgrp
-    ,o.coltier
-    ,o.colstat
-    ,o.sizc
-    ,o.pckg
-    ,o.kit
-    ,o.brnd
-    ,o.majg
-    ,o.ming
-    ,o.majs
-    ,o.mins
-    ,o.gldco
-    ,o.gldc
-    ,o.glec
-    ,o.harm
-    ,o.clss
-    ,o.brand
-    ,o.assc
-    ,o.ddunit
-    ,o.unti
-    ,o.lbs
-    ,o.plt
-    ,o.plcd
-    ,o.fs_line
-    ,o.r_currency
-    ,o.r_rate
-    ,o.c_currency
-    ,o.c_rate
-    ,o.fb_qty
-    ,o.fb_val_loc
-    ,o.fb_val_loc_dis
-    ,o.fb_val_loc_qt
-    ,o.fb_val_loc_pl
-    ,o.fb_val_loc_tar
-    ,o.fb_cst_loc
-    ,o.fb_cst_loc_cur
-    ,o.fb_cst_loc_fut
-    ,o.calc_status
-    ,o.flag
-    ,o.odate + interval '1 year' AS odate
-    ,odate.ssyr
-    ,o.rdate + interval '1 year' AS rdate
-    ,rdate.ssyr
-    ,o.sdate + interval '1 year' AS sdate
-    ,sdate.ssyr
-    ,'forecast_name' "version"
-    ,'plug' iter
-FROM
-    fc.live o
-LEFT OUTER JOIN fc.perd rdate ON
-        (o.rdate + interval '1 year' )::date <@ rdate.drange
-LEFT OUTER JOIN fc.perd odate ON
-        (o.odate + interval '1 year' )::date <@ odate.drange
-LEFT OUTER JOIN fc.perd sdate ON
-        (o.sdate + interval '1 year' )::date <@ sdate.drange
-WHERE
-    odate BETWEEN 'app_plug_fromdate'::date AND 'app_plug_todate'::date
-    --be sure to pre-exclude unwanted items, like canceled orders, non-gross sales, and short-ships
-)
-,incr AS (
-SELECT
-    o."ddord#"
-    ,o."dditm#"
-    ,o."fgbol#"
-    ,o."fgent#"
-    ,o."diinv#"
-    ,o."dilin#"
-    ,o.quoten
-    ,o.quotel
-    ,o.dcodat
-    ,o.ddqdat
-    ,o.dcmdat
-    ,o.fesdat
-    ,o.dhidat
-    ,o.fesind
-    ,o.dhpost
-    ,o.fspr
-    ,o.ddqtoi
-    ,o.ddqtsi
-    ,o.fgqshp
-    ,o.diqtsh
-    ,o.diext
-    ,o.ditdis
-    ,o.discj
-    ,o.dhincr
-    ,o.plnt
-    ,o.promo
-    ,o.return_reas
-    ,o.terms
-    ,o.custpo
-    ,o.remit_to
-    ,o.bill_class
-    ,o.bill_cust
-    ,o.bill_rep
-    ,o.bill_terr
-    ,o.ship_class
-    ,o.ship_cust
-    ,o.ship_rep
-    ,o.ship_terr
-    ,o.dsm
-    ,o.account
-    ,o.shipgrp
-    ,o.geo
-    ,o.chan
-    ,o.chansub
-    ,o.orig_ctry
-    ,o.orig_prov
-    ,o.orig_post
-    ,o.bill_ctry
-    ,o.bill_prov
-    ,o.bill_post
-    ,o.dest_ctry
-    ,o.dest_prov
-    ,o.dest_post
-    ,o.part
-    ,o.styc
-    ,o.colc
-    ,o.colgrp
-    ,o.coltier
-    ,o.colstat
-    ,o.sizc
-    ,o.pckg
-    ,o.kit
-    ,o.brnd
-    ,o.majg
-    ,o.ming
-    ,o.majs
-    ,o.mins
-    ,o.gldco
-    ,o.gldc
-    ,o.glec
-    ,o.harm
-    ,o.clss
-    ,o.brand
-    ,o.assc
-    ,o.ddunit
-    ,o.unti
-    ,o.lbs
-    ,o.plt
-    ,o.plcd
-    ,o.fs_line
-    ,o.r_currency
-    ,o.r_rate
-    ,o.c_currency
-    ,o.c_rate
-    ,o.fb_qty
-    ,o.fb_val_loc
-    ,o.fb_val_loc_dis
-    ,o.fb_val_loc_qt
-    ,o.fb_val_loc_pl
-    ,o.fb_val_loc_tar
-    ,o.fb_cst_loc
-    ,o.fb_cst_loc_cur
-    ,o.fb_cst_loc_fut
-    ,o.calc_status
-    ,o.flag
-    ,o.odate + interval '1 year' AS odate
-    ,odate.ssyr
-    ,o.rdate + interval '1 year' AS rdate
-    ,rdate.ssyr
-    ,o.sdate + interval '1 year' AS sdate
-    ,sdate.ssyr
-    ,'forecast_name' "version"
-    ,'baseline' iter
-FROM
-    baseline o
-LEFT OUTER JOIN fc.perd rdate ON
-        (o.rdate + interval '1 year' )::date <@ rdate.drange
-LEFT OUTER JOIN fc.perd odate ON
-        (o.odate + interval '1 year' )::date <@ odate.drange
-LEFT OUTER JOIN fc.perd sdate ON
-        (o.sdate + interval '1 year' )::date <@ sdate.drange
-)
-,ins AS (
-INSERT INTO
-    fc.live
-SELECT
-    *
-FROM
-    incr i
-WHERE
-    i.odate >= 'app_first_forecast_date'::date
-    OR i.sdate >= 'app_first_forecast_date'::date
-RETURNING *
-)
-SELECT COUNT(*) num_rows  FROM ins
--- a/routes/baseline/gen_baseline.sql
+++ b/routes/baseline/gen_baseline.sql
@ -13,6 +13,8 @@ DECLARE
    _date_funcs jsonb;
    _perd_joins text;
    _interval interval;
+    _target_table text;
+    _version_col text;

 /*----------------parameters listing--------------
 app_baseline_from_date
@ -30,8 +32,10 @@ BEGIN
 SELECT (SELECT cname FROM fc.target_meta WHERE appcol = 'order_date') INTO _order_date;
 SELECT (SELECT cname FROM fc.target_meta WHERE appcol = 'ship_date') INTO _ship_date;
 SELECT (SELECT cname FROM fc.target_meta WHERE appcol = 'order_status') INTO _order_status;
+SELECT format('%I',max(schema))||'.'||format('%I',max(tname)) INTO _target_table FROM fc.target_meta;
 --the target interval
 SELECT interval '1 year' INTO _interval;
+SELECT cname INTO _version_col FROM fc.target_meta WHERE appcol = 'version';
 SELECT jsonb_agg(func) INTO _date_funcs FROM fc.target_meta WHERE dtype = 'date' AND fkey is NOT null;
 --create table join for each date based func in target_meta joining to fc.perd static table
 --the join, though, should be based on the target date, which is needs an interval added to get to the target
@ -70,7 +74,7 @@ SELECT
                    --...but it's not the date itself...
                    WHEN fkey IS NULL THEN 
                        --...pull the associated date field from perd table
-                        func||'.'||m.dateref
+                        func||'.'||m.fcol
                    --...and it's the primary key date...
                    ELSE 
                        --use the date key but increment by the target interval
@ -101,7 +105,7 @@ $$SELECT
    ,'forecast_name' "version"
    ,'actuals' iter
 FROM
-    fc.live o
+    $$||_target_table||$$ o
 WHERE
    (
        --base period orders booked....
@ -128,7 +132,7 @@ $$
    ,'forecast_name' "version"
    ,'plug' iter
 FROM
-    fc.live o$$||E'\n'||_perd_joins||$$
+    $$||_target_table||' o'||E'\n'||_perd_joins||$$
 WHERE
    $$||format('%I',_order_date)||$$ BETWEEN 'app_plug_fromdate'::date AND 'app_plug_todate'::date
    --be sure to pre-exclude unwanted items, like canceled orders, non-gross sales, and short-ships
@ -152,7 +156,7 @@ FROM
 )
 ,ins AS (
 INSERT INTO
-    fc.live
+    $$||_target_table||$$
 SELECT
    *
 FROM
@ -171,7 +175,7 @@ INTO
 ------------------------------stack the sql into the final format------------------------------------------------

 SELECT
-$$DELETE FROM fc.live WHERE version = 'forecast_name';
+$$DELETE FROM $$||_target_table||$$ WHERE $$||_version_col||$$ = 'forecast_name';
 WITH
 baseline AS (
 $$||_ytdbody||
--- a/setup_sql/build_master_tables.sql
+++ b/setup_sql/build_master_tables.sql
@ -5,31 +5,85 @@ $$
 DECLARE 
    f record;
    _sql text;
+    _target_table text;
+
 BEGIN
+    SELECT format('%I',max(schema))||'.'||format('%I',max(tname)) INTO _target_table FROM fc.target_meta;
    FOR f IN  
        SELECT
+            tname,
+            func,
            -------------------------------------------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) || 
-            ', PRIMARY KEY ('||string_agg(format('%I',cname),', ') FILTER (WHERE fkey = func)||'));' AS ddl,
+            ', PRIMARY KEY ('||string_agg(format('%I',cname),', ') FILTER (WHERE COALESCE(fkey,'') <> '')||'));' 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 '||
-            string_agg(format('%I',cname)||' IS NOT NULL ',' AND ') FILTER (WHERE fkey = func)||' ON CONFLICT DO NOTHING' AS pop,
+            '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 '||schema||'.'||tname||' WHERE '||
+            string_agg(format('%I',cname)||' IS NOT NULL ',' AND ') FILTER (WHERE COALESCE(fkey,'') <> '')||' 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||' ('||
-            string_agg(format('%I',cname),', ') FILTER (WHERE fkey = func)||')' AS fk
+            'ALTER TABLE '||tm.schema||'.'||tm.tname||' ADD CONSTRAINT fk_'||func||' FOREIGN KEY ('||string_agg(format('%I',cname),', ') FILTER (WHERE COALESCE(fkey,'') <> '')||') REFERENCES fc.'||func||' ('||
+            string_agg(format('%I',cname),', ') FILTER (WHERE COALESCE(fkey,'') <>'')||')' AS fk
        FROM
-            fc.target_meta
+            fc.target_meta tm
+        WHERE
+            func IS NOT NULL
        GROUP BY
-            tname
+            schema
+            ,tname
            ,func
-        HAVING
-            string_agg(cname,', ') FILTER (WHERE fkey = func) <> ''
+        --HAVING
+        --    string_agg(cname,', ') FILTER (WHERE fkey = func) <> ''
    loop 
+        INSERT INTO fc.sql SELECT f.func, f.ddl;
        EXECUTE format('%s',f.ddl);
        EXECUTE format('%s',f.pop);
        EXECUTE format('%s',f.fk);
    END LOOP;
+    -------add a version column if one doesn't exist--------------------------------
+    IF (SELECT COUNT(*) FROM fc.target_meta WHERE appcol = 'version') = 0 THEN
+        SELECT 'ALTER TABLE '||_target_table||' ADD COLUMN app_version text' INTO _sql;
+        EXECUTE format('%s',_sql);
+        --insert the newly created row meta into target_meta
+        INSERT INTO 
+            fc.target_meta
+        SELECT 
+            table_schema, table_name, column_name, ordinal_position, null::text, null::text, null::text, data_type, 'version', null::text
+        FROM 
+            information_schema.columns
+        WHERE
+            format('%I',table_schema)||'.'||format('%I',table_name) = _target_table 
+            AND column_name = 'app_version';
+    END IF;
+    -------add a iter    column if one doesn't exist--------------------------------
+    IF (SELECT COUNT(*) FROM fc.target_meta WHERE appcol = 'iter') = 0 THEN
+        SELECT 'ALTER TABLE '||_target_table||' ADD COLUMN app_iter text' INTO _sql;
+        EXECUTE format('%s',_sql);
+        --insert the newly created row meta into target_meta
+        INSERT INTO 
+            fc.target_meta
+        SELECT 
+            table_schema, table_name, column_name, ordinal_position, null::text, null::text, null::text, data_type, 'iter', null::text
+        FROM 
+            information_schema.columns
+        WHERE
+            format('%I',table_schema)||'.'||format('%I',table_name) = _target_table 
+            AND column_name = 'app_iter';
+    END IF;
+    -------add a logid column if one doesn't exist--------------------------------
+    IF (SELECT COUNT(*) FROM fc.target_meta WHERE appcol = 'logid') = 0 THEN
+        SELECT 'ALTER TABLE '||_target_table||' ADD COLUMN app_logid text' INTO _sql;
+        EXECUTE format('%s',_sql);
+        --insert the newly created row meta into target_meta
+        INSERT INTO 
+            fc.target_meta
+        SELECT 
+            table_schema, table_name, column_name, ordinal_position, null::text, null::text, null::text, data_type, 'logid', null::text
+        FROM 
+            information_schema.columns
+        WHERE
+            format('%I',table_schema)||'.'||format('%I',table_name) = _target_table
+            AND column_name = 'app_logid';
+    END IF;
 END;
 $$
--- a/setup_sql/mapping.md
+++ b/setup_sql/mapping.md
@ -1,21 +1,23 @@
-| tname   | cname          | opos | func         | fkey         | pretty | dtype   | mastcol        | appcol       | dateref |
-| ------- | -------------- | ---- | ------------ | ------------ | ------ | ------- | -------------- | ------------ | ------- |
-| fc.live | fb_cst_loc     | 91   | cost         |              |        | numeric | fb_cst_loc     |              |         |
-| fc.live | ship_cust      | 36   | scust        | scust        |        | text    | ship_cust      |              |         |
-| fc.live | rdate          | 98   | rdate        | rdate        |        | date    | drange         |              |         |
-| fc.live | geo            | 42   | scust        |              |        | text    | geo            | customer     |         |
-| fc.live | part           | 54   | item         | item         |        | text    | part           | item         |         |
-| fc.live | odate          | 96   | odate        | odate        |        | date    | drange         | order_date   |         |
-| fc.live | sdate          | 100  | sdate        | sdate        |        | date    | sdate          | ship_date    |         |
-| fc.live | oseas          | 97   | odate        |              |        | integer | ssyr           |              | ssyr    |
-| fc.live | calc_status    | 94   | order_status | order_status |        | text    | calc_status    | order_status |         |
-| fc.live | rseas          | 99   | rdate        |              |        | integer | ssyr           |              | ssyr    |
-| fc.live | sseas          | 101  | sdate        |              |        | integer | ssyr           |              | ssyr    |
-
+| schema  | tname   | cname          | opos | func         | fkey         | fcol           | dtype   | appcol       | pretty | 
+| ------- | ------- | -------------- | ---- | ------------ | ------------ | -------------- | ------- | ------------ | ------ | 
+| fc      | live    | fb_cst_loc     | 91   | cost         |              | fb_cst_loc     | numeric |              |        | 
+| fc      | live    | ship_cust      | 36   | scust        | scust        | ship_cust      | text    |              |        | 
+| fc      | live    | rdate          | 98   | rdate        | rdate        | drange         | date    |              |        | 
+| fc      | live    | geo            | 42   | scust        |              | geo            | text    | customer     |        | 
+| fc      | live    | part           | 54   | item         | item         | part           | text    | item         |        | 
+| fc      | live    | odate          | 96   | odate        | odate        | drange         | date    | order_date   |        | 
+| fc      | live    | sdate          | 100  | sdate        | sdate        | sdate          | date    | ship_date    |        | 
+| fc      | live    | oseas          | 97   | odate        |              | ssyr           | integer |              |        | 
+| fc      | live    | calc_status    | 94   | order_status | order_status | calc_status    | text    | order_status |        | 
+| fc      | live    | rseas          | 99   | rdate        |              | ssyr           | integer |              |        | 
+| fc      | live    | sseas          | 101  | sdate        |              | ssyr           | integer |              |        | 
+|         |         |                |      |              |              |                |         | version      |        | 
+|         |         |                |      |              |              |                |         | iter         |        | 
+|         |         |                |      |              |              |                |         | logid        |        | 

 * func: table name of associated data
 * fkey: primary key of assoicated dat
-* pretty: display column name 
-* mastcol: associated table column reference (whats the point of this?)
+* fcol: associated field from the master data table if it is different (oseas would refer to ssyr in fc.perd)
+* pretty: display column name (user friendly)
 * appcol: parameters that will have to be supplied but the application
 * dateref:
--- a/setup_sql/schema.sql
+++ b/setup_sql/schema.sql
@ -2,32 +2,32 @@ CREATE SCHEMA IF NOT EXISTS fc;

 --DROP TABLE IF EXISTS fc.target_meta;
 CREATE TABLE IF NOT EXISTS fc.target_meta (
-    tname       text
+    schema      text
+    ,tname       text
    ,cname      text
    ,opos       int
    ,func       text
    ,fkey       text
-    ,pretty     text
+    ,fcol       text
    ,dtype      text
-    ,mastcol    text
    ,appcol     text
-    ,dateref    text
+    ,pretty     text
 );

 --ALTER TABLE fc.target_meta DROP CONSTRAINT IF EXISTS target_meta_pk;
-ALTER TABLE fc.target_meta ADD CONSTRAINT target_meta_pk PRIMARY KEY (tname, cname);
+ALTER TABLE fc.target_meta ADD CONSTRAINT target_meta_pk PRIMARY KEY (schema, tname, cname);

 COMMENT ON TABLE fc.target_meta IS 'target table layout info';
-COMMENT ON COLUMN fc.target_meta.tname IS 'schema.table_name of target sales data table';
+COMMENT ON COLUMN fc.target_meta.schema IS 'schema of target sales data table';
+COMMENT ON COLUMN fc.target_meta.tname IS 'table_name of target sales data table';
 COMMENT ON COLUMN fc.target_meta.cname IS 'column name';
 COMMENT ON COLUMN fc.target_meta.opos IS 'ordinal position of column';
 COMMENT ON COLUMN fc.target_meta.func IS 'a functional entity (like customer, part number) that master tables will be build from';
+COMMENT ON COLUMN fc.target_meta.fcol IS 'associated field from the master data table if it is different (oseas would refer to ssyr in fc.perd)';
 COMMENT ON COLUMN fc.target_meta.fkey IS 'primary key for functional entity';
-COMMENT ON COLUMN fc.target_meta.pretty IS 'the presentation name of the column';
 COMMENT ON COLUMN fc.target_meta.dtype IS 'data type of the sales table column';
-COMMENT ON COLUMN fc.target_meta.mastcol IS 'associated field from the master data table if it is different (oseas would refer to ssyr in fc.perd)';
 COMMENT ON COLUMN fc.target_meta.appcol IS 'supply column name to be used for application variables - (specifcy the order date column)';
-COMMENT ON COLUMN fc.target_meta.dateref IS 'reference to the relevant hard coded perd table column for dates';
+COMMENT ON COLUMN fc.target_meta.pretty IS 'the presentation name of the column';

 CREATE TABLE IF NOT EXISTS fc.log  (
    id int GENERATED ALWAYS AS IDENTITY
--- a/setup_sql/target_info.sql
+++ b/setup_sql/target_info.sql
@ -3,18 +3,20 @@ BEGIN;
 INSERT INTO
    fc.target_meta
 SELECT 
-    table_schema||'.'||table_name
+    table_schema
+    ,table_name
    ,column_name
    ,ordinal_position
-    ,'doc'::text func
+    ,null::text func
    ,null::text fkey        --foreign key to a master table
-    ,null::text pretty
+    ,column_name fcol
    ,data_type::text dtype
-    ,column_name mastcol
+    ,null::text appcol
+    ,null::text pretty
 FROM 
    information_schema.columns 
 WHERE 
-    table_name = 'live' 
+    table_name = 'dcard_mapped' 
    AND table_schema = 'fc'
 ON CONFLICT ON CONSTRAINT target_meta_pk DO UPDATE SET
    opos = EXCLUDED.opos
Author	SHA1	Message	Date
Paul Trowbridge	57051675b3	add dynamic target table; dynamically create additional columns if application columns were not defined	2022-04-06 01:52:18 -04:00
Paul Trowbridge	00c8a063cd	get rid of temporary output	2022-04-05 23:08:29 -04:00
Paul Trowbridge	1c28831f1e	?	2022-04-05 23:08:06 -04:00