oradm-to-gql 34.2.0-rc → 35.0.0

package/package.json

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

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

@@ -125,6 +125,7 @@ module.exports = function convertRowsToTableMap(
         refAssociation.name = pluralize.plural(refAssociation.name);
       }
 
+      // TODO: we could also obtain this info more reliably from the ODM XML file.
       if (_.endsWith(fkRelation.Relation_Name, "_cascade")) {
         tabAttr.referenceShouldCascade = true;
       }
@@ -133,6 +134,14 @@ module.exports = function convertRowsToTableMap(
         tabAttr.referenceShouldRestrict = true;
       }
 
+      if (_.endsWith(fkRelation.Relation_Name, "_noaction")) {
+        tabAttr.referenceShouldNoAction = true;
+      }
+
+      if (_.endsWith(fkRelation.Relation_Name, "_setdefault")) {
+        tabAttr.referenceShouldSetDefault = true;
+      }
+
       refModel.associations.push(refAssociation);
       tableMap[refDef.entityName] = refModel;
     }

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

@@ -0,0 +1,20 @@
+const { each } = require("lodash");
+
+function defaultBooleans(tableMap) {
+  each(tableMap, (tableDef) => {
+    if (tableDef.type !== "view") {
+      each(tableDef.attributes, (attrDef, attrName) => {
+        if (attrDef.dataType === "Boolean") {
+          attrDef.nullable = false;
+          if (!attrDef.defaultValue) {
+            attrDef.defaultValue = false;
+          }
+        }
+      });
+    }
+  });
+
+  return tableMap;
+}
+
+module.exports = { defaultBooleans };

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

@@ -7,6 +7,7 @@ const addTimestampColumns = require("./addTimestampColumns");
 const { addIndexes } = require("./addIndexes");
 const { processViews } = require("./views");
 const { mergeCommonTableMap } = require("./mergeCommonTableMap");
+const { defaultBooleans } = require("./defaultBooleans");
 
 module.exports = function parseDatamodelCSV(
   csvPath,
@@ -46,6 +47,7 @@ module.exports = function parseDatamodelCSV(
   }
 
   tableMap = addIndexes(tableMap, opts);
+  tableMap = defaultBooleans(tableMap, opts);
   tableMap = applyNamingRules(tableMap, opts);
   tableMap = processViews(tableMap, opts);
   tableMap = populateRelationshipAttributes(tableMap, opts);

package/src/graphql-generator/generateKnexSchemaSpec.js

@@ -134,10 +134,13 @@ module.exports = function (
           if (attrName == "code") relSpec.onUpdate = "CASCADE";
           if (!attrDef.nullable || attrDef.referenceShouldCascade === true)
             relSpec.onDelete = "CASCADE";
-          if (attrDef.referenceShouldRestrict === true) {
+          if (attrDef.referenceShouldNoAction === true)
+              relSpec.onDelete = "NO ACTION";
+          if (attrDef.referenceShouldRestrict === true)
             relSpec.onDelete = "RESTRICT";
-            console.log("DEBUG:relSpec:", relSpec)
-          }
+          if (attrDef.referenceShouldSetDefault === true)
+            relSpec.onDelete = "SET DEFAULT";
+
           knexSpec.relationships.push(relSpec);
         }
 

package/src/knex-tools/createTables.js

@@ -45,10 +45,17 @@ function createTables(db, tableSpecs, opts = {}) {
           if (colSpec.unique) {
             table.unique(colSpec.name);
           }
-          if (colSpec.defaultValue) {
+          if (colSpec.type === "boolean") {
+            colSpec.defaultValue = colSpec.defaultValue || false;
+          }
+          if (colSpec.defaultValue || colSpec.defaultValue === false) {
             let defaultValue = colSpec.defaultValue;
             if (colSpec.type === "boolean") {
-              if (defaultValue === "false" || defaultValue === "0") {
+              if (
+                defaultValue === "false" ||
+                defaultValue === "0" ||
+                defaultValue === false
+              ) {
                 defaultValue = false;
               } else {
                 defaultValue = true;