oradm-to-gql 32.1.0 → 33.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oradm-to-gql",
-  "version": "32.1.0",
+  "version": "33.2.0",
   "description": "Oracle Data Modeler CSV Export to Apollo GraphQL Endpoint Generator",
   "main": "index.js",
   "scripts": {
@@ -51,7 +51,7 @@
     "graphql-server-express": "^0.8.5",
     "graphql-tools": "^1.0.0",
     "jest": "^23.2.0",
-    "knex": "^0.13.0",
+    "knex": "^0.95.11",
     "pg": "^6.4.0",
     "require-from-string": "^1.2.1",
     "tg-client-query-builder": "^2.2.0"

package/src/data-lib-generator/core-files/buildQuery.js

@@ -1,32 +1,45 @@
-const { isNumber } = require('lodash');
-const queryResolver = require('tg-knex-query-resolver');
-const applyFilter = require('./applyFilter');
-const tableMap = require('../db/table-map.json');
+const { isNumber } = require("lodash");
+const queryResolver = require("tg-knex-query-resolver");
+const applyFilter = require("./applyFilter");
+const tableMap = require("../db/table-map.json");
 
-function buildQuery(qry, tableColumns, entityName, modelName, select, filter, sortBy, pageNumber, pageSize){
-        
-    qry = qry(tableMap[entityName].tableName).select(select);
-    
-    qry = applyFilter(qry, modelName, filter);
+function buildQuery(
+  qry,
+  tableColumns,
+  entityName,
+  modelName,
+  select,
+  filter,
+  sortBy,
+  pageNumber,
+  pageSize
+) {
+  qry = qry(tableMap[entityName].tableName).select(select);
 
-    if(sortBy){
-        sortBy.forEach((fieldName) => {
-            if(fieldName.indexOf('-') === 0){
-                qry = qry.orderBy(tableColumns[fieldName.substr(1)], 'desc');
-            }else{
-                qry = qry.orderBy(tableColumns[fieldName], 'asc');
-            }
-        });
-    }else{
-        qry = qry.orderBy(tableMap[entityName].primaryKeyField, 'asc');
-    }
-    
-    if(isNumber(pageNumber) && isNumber(pageSize)){
-        let offset = (pageNumber - 1) * pageSize;
-        qry = qry.limit(pageSize).offset(offset);
+  qry = applyFilter(qry, modelName, filter);
+
+  if (sortBy) {
+    sortBy.forEach((fieldName) => {
+      if (fieldName.indexOf("-") === 0) {
+        qry = qry.orderBy(tableColumns[fieldName.substr(1)], "desc");
+      } else {
+        qry = qry.orderBy(tableColumns[fieldName], "asc");
+      }
+    });
+  } else {
+    if (tableMap[entityName].attributes.nid) {
+      qry = qry.orderBy("nid", "asc");
+    } else {
+      qry = qry.orderBy(tableMap[entityName].primaryKeyField, "asc");
     }
+  }
+
+  if (isNumber(pageNumber) && isNumber(pageSize)) {
+    let offset = (pageNumber - 1) * pageSize;
+    qry = qry.limit(pageSize).offset(offset);
+  }
 
-    return qry;
+  return qry;
 }
 
-module.exports = buildQuery;
+module.exports = buildQuery;

package/src/datamodel-csv-parser/Utils.js

@@ -1,7 +1,10 @@
 const _ = require('lodash');
 const maxLength = 25;
+
 function shortenName(name, targetLength){
     targetLength = targetLength || maxLength;
+    if (name.length <= targetLength) return name
+
     var words = _.snakeCase(name).split('_');
 
     var newWords = [];

package/src/datamodel-csv-parser/extendTableMap.js

@@ -1,4 +1,5 @@
 const _ = require("lodash");
+const clone = require("../graphql-generator/clone");
 
 module.exports = function extendTableMap(tableMap, opts) {
   opts = opts || {};
@@ -10,6 +11,10 @@ module.exports = function extendTableMap(tableMap, opts) {
     tableMap = tableMapExtender(tableMap, opts);
   }
 
+  if (opts.useUUIDs) {
+    tableMap = convertNumericIdsToUUIDs(tableMap, opts);
+  }
+
   return tableMap;
 };
 
@@ -26,7 +31,7 @@ function addCidFields(tableMap, opts) {
         scale: "",
         nullable: true,
         unique: true,
-        columnName: "cid"
+        columnName: "cid",
       };
     } else {
       throw new Error(
@@ -35,3 +40,40 @@ function addCidFields(tableMap, opts) {
     }
   });
 }
+function convertNumericIdsToUUIDs(tableMap, opts) {
+  _.each(tableMap, (table, tableName) => {
+    let nid;
+    _.each(table.attributes, (attr, attrName) => {
+      if (
+        (attr.isPrimaryKey || attr.isForeignKey) &&
+        attr.dataType === "NUMERIC"
+      ) {
+        if (attr.isPrimaryKey) {
+          nid = clone(attr);
+          nid.isPrimaryKey = false;
+          nid.nullable = true;
+          attr.defaultRawValue = "gen_random_uuid()";
+          delete attr.defaultValue;
+          delete attr.autoIncrement;
+        }
+        attr.dataType = "UUID";
+      }
+    });
+    if (nid) {
+      table.attributes["nid"] = nid;
+      table.attributes["legacy_id"] = {
+        name: "legacy_id",
+        dataType: "NUMERIC",
+        isPrimaryKey: false,
+        isForeignKey: false,
+        size: "",
+        precision: "",
+        scale: "",
+        nullable: true,
+        defaultValue: "",
+        columnName: "legacy_id",
+      };
+    }
+  });
+  return tableMap;
+}

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) => {
@@ -88,6 +99,8 @@ module.exports = function (
         colSpec.unique = attrDef.unique;
         if (attrDef.defaultValue) {
           colSpec.defaultValue = attrDef.defaultValue;
+        } else if (attrDef.defaultRawValue) {
+          colSpec.defaultRawValue = attrDef.defaultRawValue;
         }
         tableSpec.columns.push(colSpec);
 

package/src/graphql-generator/getCleanSchemaCommand.js

@@ -1,13 +1,17 @@
-
-module.exports = function getCleanSchemaCommand(dialect, schema){
-    if(dialect === 'postgres'){
-        return [
-            { cmd: "DROP SCHEMA IF EXISTS ?? CASCADE", bindings: [schema]},
-            { cmd: "CREATE SCHEMA ?? ", bindings: [schema]},
-        ];
-    }else if(dialect === 'oracle'){
-        return [
-            { cmd: `
+module.exports = function getCleanSchemaCommand(dialect, schema) {
+  if (dialect === "postgres") {
+    return [
+      { cmd: "DROP SCHEMA IF EXISTS ?? CASCADE", bindings: [schema] },
+      { cmd: "CREATE SCHEMA ?? ", bindings: [schema] },
+      {
+        cmd: "CREATE EXTENSION IF NOT EXISTS pgcrypto WITH SCHEMA ?? ",
+        bindings: [schema],
+      },
+    ];
+  } else if (dialect === "oracle") {
+    return [
+      {
+        cmd: `
                 BEGIN
                     FOR tableObj in (
                         select 'drop table "' || object_name || '" cascade constraints purge ' str
@@ -30,10 +34,11 @@ module.exports = function getCleanSchemaCommand(dialect, schema){
                         EXECUTE IMMEDIATE ('' || userObj.str);
                     END LOOP;
 
-                END;`,               
-               bindings: [schema, schema]}
-        ];
-    }
+                END;`,
+        bindings: [schema, schema],
+      },
+    ];
+  }
 
-    throw new Error("Unsupported dialect " + dialect);
-}
+  throw new Error("Unsupported dialect " + dialect);
+};

package/src/graphql-generator/knexTypeMap.js

@@ -8,15 +8,15 @@ const typeMap = {
   TIMESTAMP: convertTimestamp,
   INTEGER: convertInteger,
   BOOLEAN: convertBoolean,
-  CLOB: convertVarchar
+  CLOB: convertVarchar,
+  UUID: convertUUID,
 };
 
-
 function convertVarchar(attrDef, attrName, dialect) {
   var size = Number(attrDef.size || 400);
   return {
     type: "string",
-    typeArgs: [attrName, size]
+    typeArgs: [attrName, size],
   };
 }
 
@@ -26,63 +26,70 @@ function convertNumeric(attrDef, attrName, dialect) {
 
     return {
       type: "specificType",
-      typeArgs: [attrName, "NUMERIC"]
+      typeArgs: [attrName, "NUMERIC"],
     };
   }
   if (dialect === "oracle") {
     return {
       type: "specificType",
-      typeArgs: [attrName, "NUMBER"]
+      typeArgs: [attrName, "NUMBER"],
     };
   }
   return {
     type: "decimal",
-    typeArgs: [attrName]
+    typeArgs: [attrName],
   };
 }
 function convertOradoc(attrDef, attrName, dialect) {
   if (dialect === "oracle") {
     return {
       type: "specificType",
-      typeArgs: [attrName, "CLOB"]
+      typeArgs: [attrName, "CLOB"],
     };
   }
   return {
     type: "json",
-    typeArgs: [attrName]
+    typeArgs: [attrName],
   };
 }
 function convertText(attrDef, attrName, dialect) {
   if (dialect === "oracle") {
     return {
       type: "specificType",
-      typeArgs: [attrName, "CLOB"]
+      typeArgs: [attrName, "CLOB"],
     };
   }
   return {
     type: "text",
-    typeArgs: [attrName]
+    typeArgs: [attrName],
   };
 }
 
 function convertTimestamp(attrDef, attrName, dialect) {
   return {
     type: "timestamp",
-    typeArgs: [attrName]
+    typeArgs: [attrName],
   };
 }
 
 function convertInteger(attrDef, attrName, dialect) {
   return {
     type: "integer",
-    typeArgs: [attrName]
+    typeArgs: [attrName],
   };
 }
 
 function convertBoolean(attrDef, attrName, dialect) {
   return {
     type: "boolean",
-    typeArgs: [attrName]
+    typeArgs: [attrName],
+  };
+}
+
+function convertUUID(attrDef, attrName, dialect) {
+  return {
+    type: "varchar",
+    typeArgs: [attrName, 500],
   };
 }
 

package/src/index.js

@@ -1,4 +1,5 @@
 const Promise = require("bluebird");
+const { shortenName } = require("./datamodel-csv-parser/Utils");
 const {
   loadResolvers,
   loadMockResolvers,
@@ -25,6 +26,7 @@ module.exports = (function () {
     truncateAndSeedDatabase,
     knexTools,
     graphqlGenerators,
+    shortenName,
   };
 
   function mockPromise() {

package/src/knex-tools/applySchema.js

@@ -5,6 +5,7 @@ const applySchemaRefsAndConstraints = require("./applySchemaRefsAndConstraints")
 const applySchemaTriggers = require("./applySchemaTriggers");
 const applyViews = require("./applyViews");
 const runInitSql = require("./runInitSql");
+const createExtensions = require("./createExtensions");
 
 async function applySchema(db, schemaSpec, initData, options = {}, appConfig) {
   let {
@@ -43,6 +44,9 @@ async function applySchema(db, schemaSpec, initData, options = {}, appConfig) {
   }
 
   if (!opts.skipTables) {
+    log(`[ORADM-APPLY-SCHEMA] Creating extensions`);
+    await createExtensions(db, schemaSpec, opts);
+
     log(`[ORADM-APPLY-SCHEMA] Creating tables and functions`);
     //clean existing schema and create tables and functions
     await applySchemaTablesAndFunctions(db, schemaSpec, opts, appConfig);

package/src/knex-tools/createExtensions.js

@@ -0,0 +1,23 @@
+const Promise = require("bluebird");
+
+function createExtensions(db, schemaSpec, opts = {}) {
+  const { logDebug = () => {}, commonSchema, moduleSchema } = opts;
+
+  db.logSQL(`Creating extensions`);
+  return Promise.each(schemaSpec.extensions, (cmdDef) => {
+    db.logSQL(cmdDef);
+    if (cmdDef.isCommon) {
+      if (commonSchema) {
+        logDebug(`[ORADM-FUNCTION] Creating common extension`, cmdDef);
+        return db.raw(cmdDef.cmd, cmdDef.bindings);
+      }
+    } else {
+      if (moduleSchema) {
+        logDebug(`[ORADM-FUNCTION] Creating module extension`, cmdDef);
+        return db.raw(cmdDef.cmd, cmdDef.bindings);
+      }
+    }
+  });
+}
+
+module.exports = createExtensions;

package/src/knex-tools/createTables.js

@@ -29,14 +29,16 @@ function createTables(db, tableSpecs, opts = {}) {
 
           logDebug("[ORADM-TABLE] Creating Column " + colSpec.name);
           logDebug(colSpec);
-          logDebug(table[colSpec.type].apply);
+          // logDebug(table[colSpec.type].apply);
           if (colSpec.increments) {
-            col = table.increments(colSpec.name);
+            col = table.increments(colSpec.name, {
+              primaryKey: colSpec.primaryKey,
+            });
           } else {
             col = table[colSpec.type].apply(self, colSpec.typeArgs);
           }
 
-          if (colSpec.primaryKey) {
+          if (colSpec.primaryKey && !colSpec.increments) {
             col = col.primary();
           }
 
@@ -53,6 +55,8 @@ function createTables(db, tableSpecs, opts = {}) {
               }
             }
             col.notNullable().defaultTo(defaultValue);
+          } else if (colSpec.defaultRawValue) {
+            col.notNullable().defaultTo(db.raw(colSpec.defaultRawValue));
           }
         });
         tableSpec.indexes.forEach((indexSpec) => {