oradm-to-gql 32.0.0 → 32.1.3

package/package.json

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

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

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

package/src/index.js

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

package/src/knex-tools/createRelationships.js

@@ -4,7 +4,7 @@ function createRelationships(db, relationships, opts = {}) {
   const { logDebug = () => {}, commonSchema, moduleSchema } = opts;
 
   db.logSQL(`Creating relationships`);
-  return Promise.each(relationships, (rel) => {
+  return Promise.each(relationships, async (rel) => {
     logDebug(
       "[ORADM-FK] Creating FK for field " + rel.tableName + "." + rel.columnName
     );
@@ -27,6 +27,12 @@ function createRelationships(db, relationships, opts = {}) {
       return;
     }
     logDebug("[ORADM-FK]", rel);
+
+    // For cross module foreign keys they may be duplicated so drop if they exist
+    await db.raw(
+      `ALTER TABLE "${rel.schema}"."${rel.tableName}" DROP CONSTRAINT IF EXISTS "${rel.fkName}"`
+    );
+
     let qb = db.schema
       .withSchema(rel.schema)
       .table(rel.tableName, function (table) {