oradm-to-gql 33.3.0 → 34.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oradm-to-gql",
-  "version": "33.3.0",
+  "version": "34.0.0",
   "description": "Oracle Data Modeler CSV Export to Apollo GraphQL Endpoint Generator",
   "main": "index.js",
   "scripts": {
@@ -31,14 +31,14 @@
     "nunjucks": "^3.0.1",
     "pluralize": "^5.0.0",
     "sql-formatter": "^1.2.2",
-    "tg-knex-query-resolver": "^2.5.0",
     "uuid": "^3.3.2"
   },
   "peerDependencies": {
     "graphql": "^0.10.3",
     "graphql-server-express": "^0.8.5",
     "graphql-tools": "^1.0.0",
-    "knex": "^0.13.0"
+    "knex": "^0.13.0",
+    "tg-knex-query-resolver": "^4.0.0"
   },
   "repository": "https://github.com/TeselaGen/oradm-to-gql",
   "devDependencies": {
@@ -54,6 +54,7 @@
     "knex": "^0.95.11",
     "pg": "^6.4.0",
     "require-from-string": "^1.2.1",
-    "tg-client-query-builder": "^2.2.0"
+    "tg-client-query-builder": "^2.2.0",
+    "tg-knex-query-resolver": "^4.0.0"
   }
 }

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

@@ -3,7 +3,7 @@ const graphqlFields = require('graphql-fields');
 
 
 function getResultsCursor(tableName, primaryKeyField, filter, sort, pageNumber, pageSize, info, dataLib, opts) {
-    sort = sort || [primaryKeyField];
+    sort = sort || ["nid"];
     pageNumber = pageNumber || 1;
     pageSize = pageSize || 100;
 

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

@@ -3,7 +3,6 @@ const maxLength = 25;
 
 function shortenName(name, targetLength){
     targetLength = targetLength || maxLength;
-    if (name.length <= targetLength) return name
 
     var words = _.snakeCase(name).split('_');
 

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

@@ -1,6 +1,21 @@
 const _ = require("lodash");
 const clone = require("../graphql-generator/clone");
 
+const nidTemplate = {
+  name: "nid",
+  dataType: "NUMERIC",
+  isPrimaryKey: false,
+  isForeignKey: false,
+  isReadOnly: true,
+  size: "",
+  precision: "",
+  scale: "",
+  nullable: true,
+  defaultValue: "",
+  autoIncrement: true,
+  columnName: "nid",
+};
+
 module.exports = function extendTableMap(tableMap, opts) {
   opts = opts || {};
   var tableMapExtender = opts.extendTableMap;
@@ -42,16 +57,14 @@ function addCidFields(tableMap, opts) {
 }
 function convertNumericIdsToUUIDs(tableMap, opts) {
   _.each(tableMap, (table, tableName) => {
-    let nid;
+    let hasNumericId = false;
     _.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;
+          hasNumericId = true;
           attr.defaultRawValue = "gen_random_uuid()";
           delete attr.defaultValue;
           delete attr.autoIncrement;
@@ -59,20 +72,22 @@ function convertNumericIdsToUUIDs(tableMap, opts) {
         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",
-      };
+    if (table.attributes) {
+      table.attributes["nid"] = clone(nidTemplate);
+      if (hasNumericId) {
+        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/convertTableToTypeDef.js

@@ -31,6 +31,10 @@ module.exports = function convertTableToTypeDef(
       isKey: attrDef.isPrimaryKey,
     };
 
+    if (attrDef.isReadOnly) {
+      typeAttrs[attrName].isReadOnly = true;
+    }
+
     if (attrDef.isForeignKey || attrDef.isRelatedKey) {
       typeAttrs[attrName].required = false;
 

package/src/index.js

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

package/src/knex-tools/createTables.js

@@ -71,7 +71,7 @@ function createTables(db, tableSpecs, opts = {}) {
               .map((c) => `"${c}"`)
               .join(", ")}) WHERE ${indexSpec.columns
               .map((c) => `"${c}" IS NOT NULL `)
-              .join(" OR ")}`;
+              .join(" AND ")}`;
             rawCommands.push(sparseIndexCmd);
             // console.log(`Adding sparse index cmd: `, sparseIndexCmd);
           } else {