fix: revert c3f93cc only one relation between same objects"

Author: gjuchault

lib/model/saveAll.belongsToMany.js

@@ -1,4 +1,5 @@
 const debug = require('debug')('requelize:model:saveAll')
+const generateJoinId = require('./util/generateJoinId')
 
 function baseSaveAll (Model, inst, requelize, key, join, RelModel, subTree, subInst_) {
   debug(`saving belongsToMany ${Model._name}:${key} -> ${RelModel._name}`)
@@ -7,7 +8,9 @@ function baseSaveAll (Model, inst, requelize, key, join, RelModel, subTree, subI
   return subInst
     .then(subInst => subInst.saveAll(subTree))
     .then((subInst) => {
+      const joinId = generateJoinId(Model, RelModel, inst, subInst)
       const joinRel = new join.JoinModel({
+        id: joinId,
         [Model._name]: inst[Model._options.primaryKey],
         [RelModel._name]: subInst[RelModel._options.primaryKey]
       })
@@ -30,6 +33,7 @@ function saveThrough (Model, inst, requelize, key, join, RelModel, subTree, subI
 
   return subInst.document.saveAll(subTree)
     .then(() => {
+      joinRel.id = generateJoinId(Model, RelModel, inst, subInst.document)
       joinRel._data[Model._name] = inst[Model._options.primaryKey]
       joinRel._data[RelModel._name] = subInst.document[RelModel._options.primaryKey]
 

lib/model/util/generateJoinId.js

@@ -0,0 +1,22 @@
+const debug = require('debug')('requelize:model:util')
+
+/**
+ * Return join id based on two model instances
+ * @internal
+ * @param  {Class} ModelA First model
+ * @param  {Class} ModelB Second model
+ * @param  {Model} instA  First instance. Must be instance of ModelA (first argument)
+ * @param  {Model} instB  Second instance. Must be instance of ModelB (second argument)
+ * @return {string} Genreated id
+ */
+module.exports = (ModelA, ModelB, instA, instB) => {
+  const idA = instA[ModelA._options.primaryKey]
+  const idB = instB[ModelB._options.primaryKey]
+
+  debug(`generating join id between ${ModelA._name} and ${ModelB._name}`)
+
+  return [ModelA._name, ModelB._name]
+    .sort((n1, n2) => n1.toLowerCase().localeCompare(n2.toLowerCase()))
+    .map((name, index) => (index === 0) ? idA : idB)
+    .join('_')
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "requelize",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "RethinkDB ORM",
   "main": "index.js",
   "repository": "https://github.com/buckless/requelize.git",