oradm-to-gql 33.1.0 → 33.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oradm-to-gql",
-  "version": "33.1.0",
+  "version": "33.2.0",
   "description": "Oracle Data Modeler CSV Export to Apollo GraphQL Endpoint Generator",
   "main": "index.js",
   "scripts": {

package/src/graphql-generator/generateKnexSchemaSpec.js

@@ -52,6 +52,17 @@ module.exports = function (
     views: [],
     cleanSchema: getCleanSchemaCommand(dialect, schemaName),
     cleanCommonSchema: getCleanSchemaCommand(dialect, commonSchemaName),
+    extensions: [
+      {
+        cmd: "CREATE EXTENSION IF NOT EXISTS pgcrypto WITH SCHEMA ?? ",
+        isCommon: true,
+        bindings: [commonSchemaName],
+      },
+      {
+        cmd: "CREATE EXTENSION IF NOT EXISTS pgcrypto WITH SCHEMA ?? ",
+        bindings: [schemaName],
+      },
+    ],
   };
 
   _.each(modelSpec, (modelDef, modelName) => {

package/src/knex-tools/applySchema.js

@@ -45,7 +45,7 @@ async function applySchema(db, schemaSpec, initData, options = {}, appConfig) {
 
   if (!opts.skipTables) {
     log(`[ORADM-APPLY-SCHEMA] Creating extensions`);
-    await createExtensions(db, opts);
+    await createExtensions(db, schemaSpec, opts);
 
     log(`[ORADM-APPLY-SCHEMA] Creating tables and functions`);
     //clean existing schema and create tables and functions

package/src/knex-tools/createExtensions.js

@@ -1,20 +1,10 @@
 const Promise = require("bluebird");
 
-function createExtensions(db, opts = {}) {
+function createExtensions(db, schemaSpec, opts = {}) {
   const { logDebug = () => {}, commonSchema, moduleSchema } = opts;
-  const extensionCommands = [
-    {
-      cmd: "CREATE EXTENSION IF NOT EXISTS pgcrypto WITH SCHEMA ?? ",
-      isCommon: true,
-      bindings: [commonSchema],
-    },
-    {
-      cmd: "CREATE EXTENSION IF NOT EXISTS pgcrypto WITH SCHEMA ?? ",
-      bindings: [moduleSchema],
-    },
-  ];
+
   db.logSQL(`Creating extensions`);
-  return Promise.each(extensionCommands, (cmdDef) => {
+  return Promise.each(schemaSpec.extensions, (cmdDef) => {
     db.logSQL(cmdDef);
     if (cmdDef.isCommon) {
       if (commonSchema) {