waterline-schema - npm Package Compare versions

Comparing version 0.1.10 to 0.1.11

lib/waterline-schema/foreignKeys.js

@@ -60,3 +60,4 @@
       references: modelName,
-      on: primaryKey.attributes.columnName || primaryKey.name
+      on: primaryKey.attributes.columnName || primaryKey.name,
+      onKey: primaryKey.name
     };
@@ -63,0 +64,0 @@

lib/waterline-schema/joinTables.js

@@ -323,2 +323,3 @@
     on: primaryKey.name,
+    onKey: primaryKey.name,
     via: viaName,
@@ -444,3 +445,4 @@ groupKey: column_one.collection
       references: joined.table.identity,
-      on: joined.table.attributes[collection + '_' + attribute].columnName
+      on: joined.table.attributes[collection + '_' + attribute].columnName,
+      onKey: joined.table.attributes[collection + '_' + attribute].columnName
     };
@@ -447,0 +449,0 @@ }

lib/waterline-schema/references.js

@@ -64,3 +64,4 @@
       attributes[attribute].references = attributes[attribute].through;
-      attributes[attribute].on = reference;
+      attributes[attribute].on = reference.reference;
+      attributes[attribute].onKey = reference.keyName;
       delete attributes[attribute].through;
@@ -76,3 +77,4 @@
     attributes[attribute].references = attributes[attribute].collection.toLowerCase();
-    attributes[attribute].on = reference;
+    attributes[attribute].on = reference.reference;
+    attributes[attribute].onKey = reference.keyName;
   }
@@ -101,2 +103,3 @@
   var matchingAttributes = [];
+  var obj = {};
 
@@ -142,3 +145,4 @@ for(var attr in attributes) {
     reference = via.columnName || viaName;
-    return reference;
+    obj = { reference: reference, keyName: viaName };
+    return obj;
   }
@@ -148,4 +152,5 @@
   reference = attributes[matchingAttributes[0]].columnName || matchingAttributes[0];
-  return reference;
+  obj = { reference: reference, keyName: matchingAttributes[0] };
+  return obj;
 
 };

package.json

 {
   "name": "waterline-schema",
   "description": "The core schema builder used in the Waterline ORM.",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "contributors": [
@@ -6,0 +6,0 @@ {

No alert changes

Improved metrics

Total package byte prevSize

52693

increased by0.74%

Lines of code

1416

increased by0.57%

No dependency changes