fix(belongsToMany): pick value of define key over primaryKeyValue

fix #246
adonisjs · Dec 14, 2017 · 7116c2b · 7116c2b
1 parent bfe5de4
commit 7116c2b
Show file tree

Hide file tree

Showing 3 changed files with 84 additions and 2 deletions.
diff --git a/src/Lucid/Relations/BelongsToMany.js b/src/Lucid/Relations/BelongsToMany.js
@@ -840,7 +840,7 @@ class BelongsToMany extends BaseRelation {
     /**
      * Attach the pivot rows
      */
-    const pivotRows = await this.attach(relatedInstance.primaryKeyValue, pivotCallback)
+    const pivotRows = await this.attach(relatedInstance[this.relatedPrimaryKey], pivotCallback)
 
     /**
      * Set saved pivot row as a relationship

diff --git a/test/unit/helpers/index.js b/test/unit/helpers/index.js
@@ -170,6 +170,24 @@ module.exports = {
         table.boolean('has_blocked')
         table.timestamps()
         table.timestamp('deleted_at').nullable()
+      }),
+      db.schema.createTable('party_users', function (table) {
+        table.increments('id')
+        table.integer('party_id')
+        table.string('username')
+        table.timestamps()
+      }),
+      db.schema.createTable('teams', function (table) {
+        table.increments('id')
+        table.integer('party_id')
+        table.string('name')
+        table.timestamps()
+      }),
+      db.schema.createTable('team_user', function (table) {
+        table.increments('id')
+        table.integer('team_party_id')
+        table.integer('user_party_id')
+        table.timestamps()
       })
     ])
   },
@@ -189,7 +207,10 @@ module.exports = {
       db.schema.dropTable('categories'),
       db.schema.dropTable('sections'),
       db.schema.dropTable('post_section'),
-      db.schema.dropTable('followers')
+      db.schema.dropTable('followers'),
+      db.schema.dropTable('party_users'),
+      db.schema.dropTable('teams'),
+      db.schema.dropTable('team_user')
     ])
   },
 

diff --git a/test/unit/lucid-belongs-to-many.spec.js b/test/unit/lucid-belongs-to-many.spec.js
@@ -43,6 +43,9 @@ test.group('Relations | Belongs To Many', (group) => {
     await ioc.use('Adonis/Src/Database').table('posts').truncate()
     await ioc.use('Adonis/Src/Database').table('post_user').truncate()
     await ioc.use('Adonis/Src/Database').table('followers').truncate()
+    await ioc.use('Adonis/Src/Database').table('team_user').truncate()
+    await ioc.use('Adonis/Src/Database').table('party_users').truncate()
+    await ioc.use('Adonis/Src/Database').table('teams').truncate()
   })
 
   group.after(async () => {
@@ -2028,4 +2031,62 @@ test.group('Relations | Belongs To Many', (group) => {
     const userPosts = user.posts()
     assert.equal(userPosts.$pivotTable, 'post_users')
   })
+
+  test('attach model via different primary key', async (assert) => {
+    class Team extends Model {
+    }
+
+    class User extends Model {
+      static get table () {
+        return 'party_users'
+      }
+
+      teams () {
+        return this.belongsToMany(Team, 'user_party_id', 'team_party_id', 'party_id', 'party_id')
+      }
+    }
+
+    User._bootIfNotBooted()
+    Team._bootIfNotBooted()
+
+    const user = new User()
+    user.username = 'virk'
+    user.party_id = 20
+    await user.save()
+
+    await user.teams().attach(10)
+    const pivotValues = await ioc.use('Database').table('team_user')
+    assert.lengthOf(pivotValues, 1)
+    assert.equal(pivotValues[0].user_party_id, 20)
+    assert.equal(pivotValues[0].team_party_id, 10)
+  })
+
+  test('create and attach model via different primary key', async (assert) => {
+    class Team extends Model {
+    }
+
+    class User extends Model {
+      static get table () {
+        return 'party_users'
+      }
+
+      teams () {
+        return this.belongsToMany(Team, 'user_party_id', 'team_party_id', 'party_id', 'party_id')
+      }
+    }
+
+    User._bootIfNotBooted()
+    Team._bootIfNotBooted()
+
+    const user = new User()
+    user.username = 'virk'
+    user.party_id = 20
+    await user.save()
+
+    await user.teams().create({ name: 'draculas', party_id: 10 })
+    const pivotValues = await ioc.use('Database').table('team_user')
+    assert.lengthOf(pivotValues, 1)
+    assert.equal(pivotValues[0].user_party_id, 20)
+    assert.equal(pivotValues[0].team_party_id, 10)
+  })
 })