mythix-orm-sql-base 1.4.2 → 1.4.3

package/lib/sql-connection-base.js

@@ -126,12 +126,29 @@ class SQLConnectionBase extends ConnectionBase {
     if (!result)
       return {};
 
-    let rows = result.rows;
+    let {
+      rows,
+      columns,
+    } = result;
     if (Nife.isEmpty(rows))
       return {};
 
+    const generateIDForModelFields = (data) => {
+      let keys  = Object.keys(data || {}).sort();
+      let parts = [];
+
+      for (let i = 0, il = keys.length; i < il; i++) {
+        let key   = keys[i];
+        let value = data[key];
+
+        parts.push(`${key}:${value}`);
+      }
+
+      return (!parts.length) ? null : parts.join(',');
+    };
+
     let context         = queryEngine._getRawQueryContext();
-    let fields          = this.findAllFieldsFromFieldProjectionMap(result.columns);
+    let fields          = this.findAllFieldsFromFieldProjectionMap(columns);
     let rootModelName   = context.rootModelName;
     let modelData       = {};
     let alreadyVisited  = {};
@@ -200,20 +217,22 @@ class SQLConnectionBase extends ConnectionBase {
         if (!models)
           models = modelData[modelName] = [];
 
-        if (pkFieldName) {
-          let id = model[pkFieldName];
+        let id = model[pkFieldName];
+        if (id == null)
+          id = generateIDForModelFields(model);
 
-          if (id != null) {
-            let idKey = `${modelName}:${pkFieldName}:${id}`;
+        if (id != null) {
+          let idKey = `${modelName}:${pkFieldName}:${id}`;
 
-            if (alreadyVisited[idKey] != null) {
-              index = alreadyVisited[idKey];
-            } else {
-              index = alreadyVisited[idKey] = models.length;
-              models.push(model);
-            }
+          if (alreadyVisited[idKey] != null) {
+            index = alreadyVisited[idKey];
+            model = models[index];
+          } else {
+            index = alreadyVisited[idKey] = models.length;
+            models.push(model);
           }
         } else {
+          index = models.length;
           models.push(model);
           continue;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm-sql-base",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "SQL base support for Mythix ORM",
   "main": "lib/index.js",
   "type": "commonjs",