From 6aeba8a4e592dca4ea4b1089fe1f768e672f9654 Mon Sep 17 00:00:00 2001
From: Harminder Virk <virk.officials@gmail.com>
Date: Sat, 17 Oct 2015 16:26:32 +0530
Subject: [PATCH] Added support for multiple associate as per issue #4

Lucid now supports multiple associate and dissociate under single write operation
---
 src/Orm/Proxy/Model/index.js                  |  16 +-
 src/Orm/Proxy/Model/relation.js               |  24 +-
 src/Orm/Proxy/Static/index.js                 |  78 ++-
 src/Orm/Proxy/Static/proxy.js                 |   4 +-
 test/implementation/storage/blog.sqlite3      | Bin 4096 -> 4096 bytes
 .../blueprints/model-relations-blueprint.js   |  27 +-
 test/unit/model-relations.spec.js             | 620 +++++++++++-------
 test/unit/storage/test.sqlite3                | Bin 12288 -> 13312 bytes
 8 files changed, 465 insertions(+), 304 deletions(-)

diff --git a/src/Orm/Proxy/Model/index.js b/src/Orm/Proxy/Model/index.js
index 54c7bd90..8cdb7fe7 100644
--- a/src/Orm/Proxy/Model/index.js
+++ b/src/Orm/Proxy/Model/index.js
@@ -43,7 +43,7 @@ class Model {
     this.attributes = attributes ? helper.mutateRow(this, attributes) : {}
 
     /**
-     * here we create an isolated connection to 
+     * here we create an isolated connection to
      * the database, one per model instance.
      */
     this.connection = this.constructor.database.table(this.constructor.table)
@@ -104,7 +104,7 @@ class Model {
    */
   update () {
     /**
-     * one can only update existing model. Here we make 
+     * one can only update existing model. Here we make
      * sure this model is initiated after db fetch.
      */
     if (!helper.isFetched(this)) {
@@ -124,7 +124,7 @@ class Model {
    */
   delete () {
     /**
-     * one can only delete existing model. Here we make 
+     * one can only delete existing model. Here we make
      * sure this model is initiated after db fetch.
      */
     if (!helper.isFetched(this)) {
@@ -144,7 +144,7 @@ class Model {
     const self = this
 
     /**
-     * one can only delete existing model. Here we make 
+     * one can only delete existing model. Here we make
      * sure this model is initiated after db fetch.
      */
     if (!helper.isFetched(this)) {
@@ -302,7 +302,7 @@ class Model {
 
     /**
      * relation scopes are nested queries on relationship models, they are
-     * not required by model instance, but required when fetching 
+     * not required by model instance, but required when fetching
      * relationships using with method.
      * @type {Object}
      */
@@ -379,7 +379,7 @@ class Model {
 
     /**
      * relation scopes are nested queries on relationship models, they are
-     * not required by model instance, but required when fetching 
+     * not required by model instance, but required when fetching
      * relationships using with method.
      * @type {Object}
      */
@@ -448,7 +448,7 @@ class Model {
 
     /**
      * relation scopes are nested queries on relationship models, they are
-     * not required by model instance, but required when fetching 
+     * not required by model instance, but required when fetching
      * relationships using with method.
      * @type {Object}
      */
@@ -538,7 +538,7 @@ class Model {
 
     /**
      * relation scopes are nested queries on relationship models, they are
-     * not required by model instance, but required when fetching 
+     * not required by model instance, but required when fetching
      * relationships using with method.
      * @type {Object}
      */
diff --git a/src/Orm/Proxy/Model/relation.js b/src/Orm/Proxy/Model/relation.js
index 3477ecb1..c451b8d7 100644
--- a/src/Orm/Proxy/Model/relation.js
+++ b/src/Orm/Proxy/Model/relation.js
@@ -29,7 +29,7 @@ relation.associate = function (target,model) {
   if(target._associationModel._activeRelation.relation !== 'belongsTo'){
     throw new Error(`Unable to call associate on ${target._associationModel._activeRelation.relation}`)
   }
-  target._associationModel._associationAttributes = model.attributes
+  target._associationModel._associationAttributes.push({attributes:model.attributes,targetPrimaryKey:target._associationModel._activeRelation.targetPrimaryKey,relationPrimaryKey:target._associationModel._activeRelation.relationPrimaryKey})
   target.new()
 }
 
@@ -54,7 +54,7 @@ relation.dissociate = function (target){
   if(target._associationModel._activeRelation.relation !== 'belongsTo'){
     throw new Error(`Unable to call dissociate on ${target._associationModel._activeRelation.relation}`)
   }
-  target._associationModel._associationAttributes = {dissociate:true}
+  target._associationModel._associationAttributes.push({attributes:{dissociate:true},targetPrimaryKey:target._associationModel._activeRelation.targetPrimaryKey,relationPrimaryKey:target._associationModel._activeRelation.relationPrimaryKey})
   target.new()
 }
 
@@ -62,7 +62,7 @@ relation.dissociate = function (target){
  * @function attach
  * @description this method is only belongsToMany specific and will
  * attach primary values from 2 models into a pivot table.
- * @note this method does not touch host/relational model 
+ * @note this method does not touch host/relational model
  * tables. It only make neccessary entries inside
  * pivot table
  * @param  {Object} target        [description]
@@ -74,10 +74,10 @@ relation.attach = function (target, relationValue, extraFields) {
 
   /**
    * getting relationship meta data to be used while persisting
-   * values inside pivot table. 
+   * values inside pivot table.
    */
   const getPersistanceFields = relation.getFieldsForAD(target)
-  const pivotTable = getPersistanceFields.pivotTable 
+  const pivotTable = getPersistanceFields.pivotTable
   const pivotPrimaryKey = getPersistanceFields.pivotPrimaryKey
   const pivotOtherKey = getPersistanceFields.pivotOtherKey
   const targetPrimaryKey = getPersistanceFields.targetPrimaryKey
@@ -107,7 +107,7 @@ relation.attach = function (target, relationValue, extraFields) {
  * @function detach
  * @description this method is only belongsToMany specific and will
  * remove primary values of 2 models from pivot table.
- * @note this method does not touch host/relational model 
+ * @note this method does not touch host/relational model
  * tables. It only remove rows from pivot table.
  * @param  {Object} target        [description]
  * @param  {Number} relationValue [description]
@@ -117,10 +117,10 @@ relation.detach = function (target, relationValue) {
 
   /**
    * getting relationship meta data to be used while removing
-   * values inside pivot table. 
+   * values inside pivot table.
    */
   const getPersistanceFields = relation.getFieldsForAD(target)
-  const pivotTable = getPersistanceFields.pivotTable 
+  const pivotTable = getPersistanceFields.pivotTable
   const pivotPrimaryKey = getPersistanceFields.pivotPrimaryKey
   const pivotOtherKey = getPersistanceFields.pivotOtherKey
   const targetPrimaryKey = getPersistanceFields.targetPrimaryKey
@@ -153,7 +153,7 @@ relation.detach = function (target, relationValue) {
 
 /**
  * @description think of it as a real helper method to get values
- * required to attach belongsToMany models values inside a 
+ * required to attach belongsToMany models values inside a
  * pivot table.
  * @method getPersistanceFields
  * @param  {Object}             target [description]
@@ -267,8 +267,8 @@ relation.resolveHasMany = function (values, relationDefination) {
 
 /**
  * @function resolveBelongsToMany
- * @description setting up model with initial query params for 
- * belongsToMany. It returns query builder which can be 
+ * @description setting up model with initial query params for
+ * belongsToMany. It returns query builder which can be
  * chained further.
  * @param  {Object}             values             [description]
  * @param  {Object}             relationDefination [description]
@@ -337,7 +337,7 @@ relation.resolveBelongsToMany = function (values, relationDefination) {
   ]
 
   /**
-   * we set the pivot table here. This will be used by fetch 
+   * we set the pivot table here. This will be used by fetch
    * method to fetch extra pivot columns defined by user.
    * @type {String}
    */
diff --git a/src/Orm/Proxy/Static/index.js b/src/Orm/Proxy/Static/index.js
index 12647849..5b4fecaf 100644
--- a/src/Orm/Proxy/Static/index.js
+++ b/src/Orm/Proxy/Static/index.js
@@ -22,8 +22,8 @@ class StaticProxy {
     Model.activeConnection = Database.table(Model.table)
 
     /**
-     * here we store active relation as an object which 
-     * has useful information like 
+     * here we store active relation as an object which
+     * has useful information like
      * relational model
      * foreign key
      * other key
@@ -34,7 +34,7 @@ class StaticProxy {
     Model._activeRelation = {}
 
     /**
-     * here we store relation keys to be fetched when fetching 
+     * here we store relation keys to be fetched when fetching
      * host/target model. In short these are keys sent with
      * `with` method
      * @type {Array}
@@ -42,7 +42,7 @@ class StaticProxy {
     Model._relations = []
 
     /**
-     * here we store scope methods, which should be executed on 
+     * here we store scope methods, which should be executed on
      * relational query builder. We simply store these
      * and invoke them when running relational model
      * queries.
@@ -80,18 +80,20 @@ class StaticProxy {
     Model._pivotTable = null
 
     /**
-     * association model to set association attributes on this is required for 
+     * association model to set association attributes on this is required for
      * belongsTo method.
      * @type {Object}
      */
     Model._associationModel = {}
 
     /**
-     * association attributes to read foreign key value from while saving a 
-     * relation.
+     * association attributes to read foreign key value from while saving a
+     * relation. There can be multiple associationAttributes if
+     * associate of dissociate has been called multiple
+     * times.
      * @type {Object}
      */
-    Model._associationAttributes = {}
+    Model._associationAttributes = []
 
     /**
      * pivotAttributes are required to save belongsToMany relationship
@@ -107,29 +109,29 @@ class StaticProxy {
      */
     Model.create = function (values, isMutated, connection) {
 
+      const self = this
       /**
        * here we look for an active relation and if that relation is
-       * belongsTo then we grab associationAttributes set by 
+       * belongsTo then we grab associationAttributes set by
        * associate method and grab the value of foreign
        * key under relation
        */
-      if(this._activeRelation.relation === 'belongsTo' && Object.keys(this._associationAttributes).length > 0){
-        const targetPrimaryKey = this._activeRelation.targetPrimaryKey
-        const relationPrimaryKey = this._activeRelation.relationPrimaryKey
-        this._foreignKey[targetPrimaryKey] = this._associationAttributes[relationPrimaryKey]
+      if(this._associationAttributes.length > 0){
+        this._associationAttributes.forEach(function (item) {
+          self._foreignKey[item.targetPrimaryKey] = item.attributes[item.relationPrimaryKey]
+        })
       }
-      
+
       /**
        * here we set foreign key and it's value to be inserted
        * if create method is invoked via relational model.
       */
       if(this._foreignKey && Object.keys(this._foreignKey).length > 0){
-        const key = Object.keys(this._foreignKey)[0];
-        values[key] = this._foreignKey[key]
+        Object.keys(this._foreignKey).forEach(function (index) {
+          values[index] = self._foreignKey[index]
+        })
       }
-
       return query.create(this, values, isMutated, connection)
-
     }
 
     /**
@@ -139,38 +141,34 @@ class StaticProxy {
      */
     Model.update = function (values, isMutated, connection) {
 
+      const self = this
+
       /**
        * here we look for an active relation and if that relation is
-       * belongsTo then we grab associationAttributes set by 
+       * belongsTo then we grab associationAttributes set by
        * associate method and grab the value of foreign
        * key under relation
        */
-      if(this._activeRelation.relation === 'belongsTo' && Object.keys(this._associationAttributes).length > 0){
-
-        /**
-         * otherwise set foriegn key value to the value of primary key
-         * from relational model
-         */
-        const targetPrimaryKey = this._activeRelation.targetPrimaryKey
-        const relationPrimaryKey = this._activeRelation.relationPrimaryKey
-
-        /**
-         * if dissociate has been called, set foreign key value to null
-         */
-        if(this._associationAttributes.dissociate){
-          this._foreignKey[targetPrimaryKey] = null
-        }else{
-          this._foreignKey[targetPrimaryKey] = this._associationAttributes[relationPrimaryKey]
-        }
+
+      if(this._associationAttributes.length > 0){
+        this._associationAttributes.forEach(function (item) {
+          if(item.attributes.dissociate){
+            self._foreignKey[item.targetPrimaryKey] = null
+          }
+          else{
+            self._foreignKey[item.targetPrimaryKey] = item.attributes[item.relationPrimaryKey]
+          }
+        })
       }
-      
+
       /**
        * here we set foreign key and it's value to be inserted
        * if create method is invoked via relational model.
       */
       if(this._foreignKey && Object.keys(this._foreignKey).length > 0){
-        const key = Object.keys(this._foreignKey)[0];
-        values[key] = this._foreignKey[key]
+        Object.keys(this._foreignKey).forEach(function (index) {
+          values[index] = self._foreignKey[index]
+        })
       }
 
       return query.update(this, values, isMutated, connection)
@@ -216,7 +214,7 @@ class StaticProxy {
       this._withPivot = []
       this._pivotTable = null
       this._associationModel = {}
-      this._associationAttributes = {}
+      this._associationAttributes = []
       this._pivotAttributes = {}
       this.activeConnection = this.database.table(this.table)
 
diff --git a/src/Orm/Proxy/Static/proxy.js b/src/Orm/Proxy/Static/proxy.js
index ece5c6ef..14d4c256 100644
--- a/src/Orm/Proxy/Static/proxy.js
+++ b/src/Orm/Proxy/Static/proxy.js
@@ -169,7 +169,7 @@ proxy.get = function (target, name) {
   }
 
   /**
-   * attaching belongsToMany relationships on pivot tables. 
+   * attaching belongsToMany relationships on pivot tables.
    * this method read relation defination and make a
    * raw query using `database` property from model
    * constructor
@@ -182,7 +182,7 @@ proxy.get = function (target, name) {
 
 
   /**
-   * removing belongsToMany relationships on pivot tables. 
+   * removing belongsToMany relationships on pivot tables.
    * this method read relation defination and make a
    * raw query using `database` property from model
    * constructor
diff --git a/test/implementation/storage/blog.sqlite3 b/test/implementation/storage/blog.sqlite3
index 8b9ceefadfabb5b319572e65270fdf4cef367cc9..e42b75e23524c9c0ac4764457e456ee2cd6f14cd 100644
GIT binary patch
delta 67
zcmZorXi%6SCB$-^fq{Vqh?yXmamhp-BPN#P8xy9nbCnj%bzuwuk()R^unPbgu3)Yw
HnDhkz35F7i

delta 67
zcmZorXi%6SCB$6Bz`(!)#7q#(Xfjd9h>5vqW5P6cF8zSLXBh)P<R*>}>;gc>IWYGU
Hn7j%A<UbO;

diff --git a/test/unit/blueprints/model-relations-blueprint.js b/test/unit/blueprints/model-relations-blueprint.js
index ba1d03ac..6d1739be 100644
--- a/test/unit/blueprints/model-relations-blueprint.js
+++ b/test/unit/blueprints/model-relations-blueprint.js
@@ -12,7 +12,8 @@ blueprint.tearDown = function(knex) {
     knex.schema.dropTable('books'),
     knex.schema.dropTable('author_book'),
     knex.schema.dropTable('articles'),
-    knex.schema.dropTable('countries')
+    knex.schema.dropTable('countries'),
+    knex.schema.dropTable('agencies')
   ])
 }
 
@@ -33,11 +34,20 @@ blueprint.setup = function(knex) {
 
       table.increments()
       table.integer('user_id').references('id').inTable('users').onDelete('CASCADE')
+      table.integer('agency_id').references('id').inTable('agencies').onDelete('CASCADE')
       table.string('phone_number')
       table.boolean('is_mobile').defaultsTo(0)
       table.timestamps()
       table.timestamp('deleted_at')
 
+    }),
+    knex.schema.createTable('agencies', function (table) {
+
+      table.increments()
+      table.string('agency_name')
+      table.timestamps()
+      table.timestamp('deleted_at')
+
     }),
     knex.schema.createTable('authors', function (table) {
 
@@ -82,8 +92,8 @@ blueprint.setup = function(knex) {
       table.timestamps()
       table.timestamp('deleted_at')
 
-    })    
-  ])  
+    })
+  ])
 }
 
 blueprint.seed = function(knex){
@@ -173,6 +183,12 @@ blueprint.seed = function(knex){
     }
   ]
 
+  const agencies = [
+    {
+      agency_name: 'VodaFone',
+    }
+  ]
+
 
   return Q.all([
     knex.table('users').insert(users),
@@ -181,6 +197,7 @@ blueprint.seed = function(knex){
     knex.table('books').insert(books),
     knex.table('author_book').insert(author_book),
     knex.table('countries').insert(countries),
-    knex.table('articles').insert(articles)
+    knex.table('articles').insert(articles),
+    knex.table('agencies').insert(agencies)
   ])
-}
\ No newline at end of file
+}
diff --git a/test/unit/model-relations.spec.js b/test/unit/model-relations.spec.js
index 9b3738c5..6bc21b54 100644
--- a/test/unit/model-relations.spec.js
+++ b/test/unit/model-relations.spec.js
@@ -6,9 +6,9 @@
 |--------------------------------------------------------------------------
 |
 | Through these tests we are testing following expectations.
-| 
+|
 | 1. should be able to use hasOne, belongsTo, hasMany, belongsToMany
-|    relationship keywords. 
+|    relationship keywords.
 | 2. should be define query methods while defining relations. These
 |    query methods will be ignored by insert/update/delete queries.
 | 3. should be able to define pivot columns to be pulled for
@@ -57,7 +57,7 @@ let Config = {
 }
 
 /**
- * setting up a new instance of Database provider , require by 
+ * setting up a new instance of Database provider , require by
  * Lucid to make queries.
  * @type {Database}
  */
@@ -101,7 +101,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
@@ -115,16 +115,16 @@ describe('Model Relations', function () {
         })
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
 
           /**
-           * defining hasOne relationship on 
+           * defining hasOne relationship on
            * phoneModel via phone key
            * @method phone
-           * @return {Object} 
+           * @return {Object}
            */
           phone(){
             return this.hasOne('App/Model/Phone')
@@ -133,7 +133,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -141,7 +141,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const user = yield User.with('phone').fetch()
@@ -158,7 +158,7 @@ describe('Model Relations', function () {
         }).catch(done)
 
       })
-      
+
       it('should be able to define query chain while defining relation', function (done) {
 
         /**
@@ -170,7 +170,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
@@ -184,16 +184,16 @@ describe('Model Relations', function () {
         })
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
 
           /**
-           * defining hasOne relationship on 
+           * defining hasOne relationship on
            * phoneModel via phone key
            * @method phone
-           * @return {Object} 
+           * @return {Object}
            */
           phone(){
             return this.hasOne('App/Model/Phone').where('is_mobile',0)
@@ -202,7 +202,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -210,7 +210,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const user = yield User.with('phone').fetch()
@@ -223,10 +223,10 @@ describe('Model Relations', function () {
 
         }).then(function () {
           done()
-        }).catch(done)      
+        }).catch(done)
 
       })
-    
+
       it('should be able to run queries on relational models', function (done) {
 
         /**
@@ -238,7 +238,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
@@ -252,16 +252,16 @@ describe('Model Relations', function () {
         })
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
 
           /**
-           * defining hasOne relationship on 
+           * defining hasOne relationship on
            * phoneModel via phone key
            * @method phone
-           * @return {Object} 
+           * @return {Object}
            */
           phone(){
             return this.hasOne('App/Model/Phone')
@@ -270,7 +270,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -278,7 +278,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const user = yield User.with('phone')
@@ -295,7 +295,7 @@ describe('Model Relations', function () {
 
         }).then(function () {
           done()
-        }).catch(done)      
+        }).catch(done)
 
       })
 
@@ -310,7 +310,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
@@ -324,16 +324,16 @@ describe('Model Relations', function () {
         })
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
 
           /**
-           * defining hasOne relationship on 
+           * defining hasOne relationship on
            * phoneModel via phone key
            * @method phone
-           * @return {Object} 
+           * @return {Object}
            */
           phone(){
             return this.hasOne('App/Model/Phone')
@@ -342,7 +342,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -362,7 +362,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Article.database = db; Article = Article.extend()
@@ -370,7 +370,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const articles = yield Article.with('author.phone').fetch()
@@ -401,7 +401,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
@@ -415,16 +415,16 @@ describe('Model Relations', function () {
         })
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
 
           /**
-           * defining hasOne relationship on 
+           * defining hasOne relationship on
            * phoneModel via phone key
            * @method phone
-           * @return {Object} 
+           * @return {Object}
            */
           phone(){
             return this.hasOne('App/Model/Phone')
@@ -433,7 +433,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -453,7 +453,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Article.database = db; Article = Article.extend()
@@ -473,7 +473,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Country.database = db; Country = Country.extend()
@@ -482,7 +482,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const countries = yield Country.with('articles.author.phone').fetch()
@@ -511,7 +511,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
@@ -525,16 +525,16 @@ describe('Model Relations', function () {
         })
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
 
           /**
-           * defining hasOne relationship on 
+           * defining hasOne relationship on
            * phoneModel via phone key
            * @method phone
-           * @return {Object} 
+           * @return {Object}
            */
           phone(){
             return this.hasOne('App/Model/Phone').where('is_mobile',1)
@@ -543,7 +543,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -563,7 +563,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Article.database = db; Article = Article.extend()
@@ -583,7 +583,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Country.database = db; Country = Country.extend()
@@ -592,7 +592,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const countries = yield Country.with('articles.author.phone').fetch()
@@ -623,7 +623,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
@@ -637,16 +637,16 @@ describe('Model Relations', function () {
         })
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
 
           /**
-           * defining hasOne relationship on 
+           * defining hasOne relationship on
            * phoneModel via phone key
            * @method phone
-           * @return {Object} 
+           * @return {Object}
            */
           phone(){
             return this.hasOne('App/Model/Phone')
@@ -655,7 +655,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -675,7 +675,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Article.database = db; Article = Article.extend()
@@ -695,7 +695,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Country.database = db; Country = Country.extend()
@@ -704,7 +704,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const countries = yield Country
@@ -746,7 +746,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
@@ -760,16 +760,16 @@ describe('Model Relations', function () {
         })
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
 
           /**
-           * defining hasOne relationship on 
+           * defining hasOne relationship on
            * phoneModel via phone key
            * @method phone
-           * @return {Object} 
+           * @return {Object}
            */
           phone(){
             return this.hasOne('App/Model/Phone')
@@ -778,7 +778,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -786,7 +786,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const user = yield User.find(1)
@@ -801,7 +801,7 @@ describe('Model Relations', function () {
 
         }).then(function () {
           done()
-        }).catch(done)      
+        }).catch(done)
 
       })
 
@@ -817,7 +817,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
@@ -831,16 +831,16 @@ describe('Model Relations', function () {
         })
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
 
           /**
-           * defining hasOne relationship on 
+           * defining hasOne relationship on
            * phoneModel via phone key
            * @method phone
-           * @return {Object} 
+           * @return {Object}
            */
           phone(){
             return this.hasOne('App/Model/Phone').where('is_mobile',0)
@@ -849,7 +849,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -857,7 +857,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const user = yield User.find(1)
@@ -870,7 +870,7 @@ describe('Model Relations', function () {
 
         }).then(function () {
           done()
-        }).catch(done)      
+        }).catch(done)
 
       })
 
@@ -886,7 +886,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
@@ -900,16 +900,16 @@ describe('Model Relations', function () {
         })
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
 
           /**
-           * defining hasOne relationship on 
+           * defining hasOne relationship on
            * phoneModel via phone key
            * @method phone
-           * @return {Object} 
+           * @return {Object}
            */
           phone(){
             return this.hasOne('App/Model/Phone')
@@ -918,7 +918,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -926,7 +926,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const user = yield User.find(1)
@@ -939,10 +939,10 @@ describe('Model Relations', function () {
 
         }).then(function () {
           done()
-        }).catch(done)      
+        }).catch(done)
 
       })
-      
+
 
       it('should be able to fetch nested model using model instance', function (done) {
 
@@ -955,7 +955,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
@@ -969,16 +969,16 @@ describe('Model Relations', function () {
         })
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
 
           /**
-           * defining hasOne relationship on 
+           * defining hasOne relationship on
            * phoneModel via phone key
            * @method phone
-           * @return {Object} 
+           * @return {Object}
            */
           phone(){
             return this.hasOne('App/Model/Phone')
@@ -987,7 +987,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -1011,7 +1011,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Article.database = db; Article = Article.extend()
@@ -1019,7 +1019,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const article = yield Article.find(1)
@@ -1035,7 +1035,7 @@ describe('Model Relations', function () {
 
         }).then(function () {
           done()
-        }).catch(done)      
+        }).catch(done)
 
       })
 
@@ -1056,20 +1056,20 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -1086,7 +1086,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const phone = yield Phone.with('user').fetch()
@@ -1117,20 +1117,20 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -1147,7 +1147,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const phone = yield Phone.with('user').fetch()
@@ -1178,20 +1178,20 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -1208,7 +1208,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const phone = yield Phone.with('user').scope('user', function (builder) {
@@ -1240,20 +1240,20 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -1270,7 +1270,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const phone = yield Phone.find(1)
@@ -1302,20 +1302,20 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -1332,7 +1332,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const phone = yield Phone.find(1)
@@ -1365,20 +1365,20 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -1395,7 +1395,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const phone = yield Phone.find(1)
@@ -1429,7 +1429,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
@@ -1443,16 +1443,16 @@ describe('Model Relations', function () {
         })
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
 
           /**
-           * defining hasOne relationship on 
+           * defining hasOne relationship on
            * phoneModel via phone key
            * @method phone
-           * @return {Object} 
+           * @return {Object}
            */
           phone(){
             return this.hasMany('App/Model/Phone')
@@ -1461,7 +1461,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -1469,7 +1469,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const user = yield User.with('phone').fetch()
@@ -1498,7 +1498,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
@@ -1512,16 +1512,16 @@ describe('Model Relations', function () {
         })
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
 
           /**
-           * defining hasOne relationship on 
+           * defining hasOne relationship on
            * phoneModel via phone key
            * @method phone
-           * @return {Object} 
+           * @return {Object}
            */
           phone(){
             return this.hasMany('App/Model/Phone').whereNotIn('is_mobile',[0,1])
@@ -1530,7 +1530,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -1538,7 +1538,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const user = yield User.with('phone').fetch()
@@ -1566,7 +1566,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
@@ -1580,16 +1580,16 @@ describe('Model Relations', function () {
         })
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
 
           /**
-           * defining hasOne relationship on 
+           * defining hasOne relationship on
            * phoneModel via phone key
            * @method phone
-           * @return {Object} 
+           * @return {Object}
            */
           phone(){
             return this.hasMany('App/Model/Phone')
@@ -1598,7 +1598,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -1606,7 +1606,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const user = yield User.with('phone').scope('phone', function (builder) {
@@ -1636,7 +1636,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
@@ -1650,16 +1650,16 @@ describe('Model Relations', function () {
         })
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
 
           /**
-           * defining hasOne relationship on 
+           * defining hasOne relationship on
            * phoneModel via phone key
            * @method phone
-           * @return {Object} 
+           * @return {Object}
            */
           phone(){
             return this.hasMany('App/Model/Phone')
@@ -1668,7 +1668,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -1676,7 +1676,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const user = yield User.find(1)
@@ -1705,7 +1705,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
@@ -1719,16 +1719,16 @@ describe('Model Relations', function () {
         })
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
 
           /**
-           * defining hasOne relationship on 
+           * defining hasOne relationship on
            * phoneModel via phone key
            * @method phone
-           * @return {Object} 
+           * @return {Object}
            */
           phone(){
             return this.hasMany('App/Model/Phone').whereNotIn('is_mobile',[0,1])
@@ -1737,7 +1737,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -1745,7 +1745,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const user = yield User.find(1)
@@ -1774,7 +1774,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
@@ -1788,16 +1788,16 @@ describe('Model Relations', function () {
         })
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
 
           /**
-           * defining hasOne relationship on 
+           * defining hasOne relationship on
            * phoneModel via phone key
            * @method phone
-           * @return {Object} 
+           * @return {Object}
            */
           phone(){
             return this.hasMany('App/Model/Phone')
@@ -1806,7 +1806,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -1814,7 +1814,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const user = yield User.find(1)
@@ -1844,7 +1844,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
@@ -1858,16 +1858,16 @@ describe('Model Relations', function () {
         })
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
 
           /**
-           * defining hasOne relationship on 
+           * defining hasOne relationship on
            * phoneModel via phone key
            * @method phone
-           * @return {Object} 
+           * @return {Object}
            */
           phone(){
             return this.hasMany('App/Model/Phone')
@@ -1876,7 +1876,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -1884,7 +1884,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const user = yield User.find(1)
@@ -1917,7 +1917,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Book.database = db; Book = Book.extend()
@@ -1942,7 +1942,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Author.database = db; Author = Author.extend()
@@ -1951,7 +1951,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const author = yield Author.with('books').fetch()
@@ -1979,7 +1979,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Book.database = db; Book = Book.extend()
@@ -2004,7 +2004,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Author.database = db; Author = Author.extend()
@@ -2013,7 +2013,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const author = yield Author.with('books').fetch()
@@ -2042,7 +2042,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Book.database = db; Book = Book.extend()
@@ -2067,7 +2067,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Author.database = db; Author = Author.extend()
@@ -2076,7 +2076,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const author = yield Author.with('books').scope('books', function (builder) {
@@ -2108,7 +2108,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Book.database = db; Book = Book.extend()
@@ -2133,7 +2133,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Author.database = db; Author = Author.extend()
@@ -2142,7 +2142,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const author = yield Author.with('books').fetch()
@@ -2170,7 +2170,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Book.database = db; Book = Book.extend()
@@ -2195,7 +2195,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Author.database = db; Author = Author.extend()
@@ -2204,7 +2204,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const author = yield Author.find(1)
@@ -2235,7 +2235,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Book.database = db; Book = Book.extend()
@@ -2260,7 +2260,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Author.database = db; Author = Author.extend()
@@ -2269,7 +2269,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const author = yield Author.find(1)
@@ -2300,7 +2300,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Book.database = db; Book = Book.extend()
@@ -2325,7 +2325,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Author.database = db; Author = Author.extend()
@@ -2334,7 +2334,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const author = yield Author.find(1)
@@ -2365,7 +2365,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Book.database = db; Book = Book.extend()
@@ -2390,7 +2390,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Author.database = db; Author = Author.extend()
@@ -2399,7 +2399,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const author = yield Author.find(1)
@@ -2427,7 +2427,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Book.database = db; Book = Book.extend()
@@ -2452,7 +2452,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Author.database = db; Author = Author.extend()
@@ -2461,7 +2461,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const author = yield Author.find(1)
@@ -2494,7 +2494,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Book.database = db; Book = Book.extend()
@@ -2511,7 +2511,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Author.database = db; Author = Author.extend()
@@ -2527,7 +2527,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const book = yield Book.find(1)
@@ -2562,7 +2562,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
@@ -2576,16 +2576,16 @@ describe('Model Relations', function () {
         })
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
 
           /**
-           * defining hasOne relationship on 
+           * defining hasOne relationship on
            * phoneModel via phone key
            * @method phone
-           * @return {Object} 
+           * @return {Object}
            */
           phone(){
             return this.hasOne('App/Model/Phone')
@@ -2594,7 +2594,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -2602,7 +2602,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const user = yield User.with('phone').fetch()
@@ -2632,7 +2632,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
@@ -2646,16 +2646,16 @@ describe('Model Relations', function () {
         })
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
 
           /**
-           * defining hasOne relationship on 
+           * defining hasOne relationship on
            * phoneModel via phone key
            * @method phone
-           * @return {Object} 
+           * @return {Object}
            */
           phone(){
             return this.hasOne('App/Model/Phone')
@@ -2664,7 +2664,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -2672,7 +2672,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const user = yield User.with('phone').fetch()
@@ -2705,7 +2705,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
@@ -2719,16 +2719,16 @@ describe('Model Relations', function () {
         })
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
 
           /**
-           * defining hasOne relationship on 
+           * defining hasOne relationship on
            * phoneModel via phone key
            * @method phone
-           * @return {Object} 
+           * @return {Object}
            */
           phone(){
             return this.hasOne('App/Model/Phone')
@@ -2737,7 +2737,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -2745,7 +2745,7 @@ describe('Model Relations', function () {
         co (function *() {
 
           /**
-           * fetching all users and their associated 
+           * fetching all users and their associated
            * phones
            */
           const user = yield User.with('phone').fetch()
@@ -2763,7 +2763,7 @@ describe('Model Relations', function () {
       })
     })
   })
-  
+
   context('Inserts', function () {
 
     context('hasOne', function () {
@@ -2778,7 +2778,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
@@ -2792,16 +2792,16 @@ describe('Model Relations', function () {
         })
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
 
           /**
-           * defining hasOne relationship on 
+           * defining hasOne relationship on
            * phoneModel via phone key
            * @method phone
-           * @return {Object} 
+           * @return {Object}
            */
           phone(){
             return this.hasOne('App/Model/Phone')
@@ -2809,7 +2809,7 @@ describe('Model Relations', function () {
 
         }
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -2828,7 +2828,7 @@ describe('Model Relations', function () {
 
       })
 
-      
+
 
       it('should throw an error when trying to associate on hasOne method', function (done) {
 
@@ -2840,7 +2840,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
@@ -2854,16 +2854,16 @@ describe('Model Relations', function () {
         })
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
 
           /**
-           * defining hasOne relationship on 
+           * defining hasOne relationship on
            * phoneModel via phone key
            * @method phone
-           * @return {Object} 
+           * @return {Object}
            */
           phone(){
             return this.hasOne('App/Model/Phone')
@@ -2871,7 +2871,7 @@ describe('Model Relations', function () {
 
         }
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -2911,19 +2911,19 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
         }
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -2970,19 +2970,19 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
         }
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -3029,19 +3029,19 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
         }
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -3088,19 +3088,19 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Phone.database = db; Phone = Phone.extend()
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class User extends Model{
         }
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         User.database = db; User = User.extend()
@@ -3132,9 +3132,155 @@ describe('Model Relations', function () {
 
       })
 
+      it('should be able to insert multiple related model under belongsTo relation', function (done) {
+
+        /**
+         * declaring phone model by
+         * extending base model
+         */
+        class Phone extends Model{
+          user () {
+            return this.belongsTo('App/Model/User')
+          }
+
+          agencies () {
+            return this.belongsTo('App/Model/Agency')
+          }
+
+        }
+
+        /**
+         * setting up model database, and
+         * extending its static object
+         */
+        Phone.database = db; Phone = Phone.extend()
+
+        /**
+         * defining User model by extending
+         * based model
+         */
+        class User extends Model{
+        }
+        /**
+         * setting up model database, and
+         * extending its static object
+         */
+        User.database = db; User = User.extend()
+
+        class Agency extends Model{
+        }
+
+        Agency.database = db; Agency = Agency.extend()
+
+        /**
+         * binding model to the ioc container to be used
+         * by relationship methods
+         */
+        Ioc.bind('App/Model/User', function() {
+          return User
+        })
+
+        Ioc.bind('App/Model/Agency', function() {
+          return Agency
+        })
+
+
+        co(function *() {
+
+          const phone = new Phone({'phone_number': '0898889190'})
+          const user = yield User.find(1);
+          const agency = yield Agency.find(1);
+          phone.user().associate(user)
+          phone.agencies().associate(agency)
+
+          yield phone.create();
+
+          const savedPhone = yield Phone.where('phone_number','0898889190').first().fetch()
+          expect(savedPhone.get('user_id')).to.equal(1)
+          expect(savedPhone.get('agency_id')).to.equal(1)
+
+        }).then(function () {
+          done()
+        }).catch(done)
+
+      })
+
+
+      it('should be able to call dissociate and associate together under single update', function (done) {
+
+        /**
+         * declaring phone model by
+         * extending base model
+         */
+        class Phone extends Model{
+          user () {
+            return this.belongsTo('App/Model/User')
+          }
+
+          agencies () {
+            return this.belongsTo('App/Model/Agency')
+          }
+
+        }
+
+        /**
+         * setting up model database, and
+         * extending its static object
+         */
+        Phone.database = db; Phone = Phone.extend()
+
+        /**
+         * defining User model by extending
+         * based model
+         */
+        class User extends Model{
+        }
+        /**
+         * setting up model database, and
+         * extending its static object
+         */
+        User.database = db; User = User.extend()
+
+        class Agency extends Model{
+        }
+
+        Agency.database = db; Agency = Agency.extend()
+
+        /**
+         * binding model to the ioc container to be used
+         * by relationship methods
+         */
+        Ioc.bind('App/Model/User', function() {
+          return User
+        })
+
+        Ioc.bind('App/Model/Agency', function() {
+          return Agency
+        })
+
+
+        co(function *() {
+
+          const phone = yield Phone.find(4)
+          const user = yield User.find(2)
+
+          phone.user().associate(user)
+          phone.agencies().dissociate()
+
+          yield phone.update();
+
+          const savedPhone = yield Phone.where('phone_number',phone.attributes.phone_number).first().fetch()
+          expect(savedPhone.get('user_id')).to.equal(2)
+          expect(savedPhone.get('agency_id')).to.equal(null)
+
+        }).then(function () {
+          done()
+        }).catch(done)
+
+      })
 
     })
-    
+
     context('belongsToMany', function () {
 
       it('should be able to insert related model under belongsToMany relation', function (done) {
@@ -3147,7 +3293,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Book.database = db; Book = Book.extend()
@@ -3162,7 +3308,7 @@ describe('Model Relations', function () {
 
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class Author extends Model{
@@ -3171,7 +3317,7 @@ describe('Model Relations', function () {
           }
         }
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Author.database = db; Author = Author.extend()
@@ -3205,7 +3351,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Book.database = db; Book = Book.extend()
@@ -3220,7 +3366,7 @@ describe('Model Relations', function () {
 
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class Author extends Model{
@@ -3229,7 +3375,7 @@ describe('Model Relations', function () {
           }
         }
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Author.database = db; Author = Author.extend()
@@ -3264,7 +3410,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Book.database = db; Book = Book.extend()
@@ -3279,7 +3425,7 @@ describe('Model Relations', function () {
 
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class Author extends Model{
@@ -3288,7 +3434,7 @@ describe('Model Relations', function () {
           }
         }
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Author.database = db; Author = Author.extend()
@@ -3324,7 +3470,7 @@ describe('Model Relations', function () {
         }
 
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Book.database = db; Book = Book.extend()
@@ -3339,7 +3485,7 @@ describe('Model Relations', function () {
 
 
         /**
-         * defining User model by extending 
+         * defining User model by extending
          * based model
          */
         class Author extends Model{
@@ -3348,7 +3494,7 @@ describe('Model Relations', function () {
           }
         }
         /**
-         * setting up model database, and 
+         * setting up model database, and
          * extending its static object
          */
         Author.database = db; Author = Author.extend()
diff --git a/test/unit/storage/test.sqlite3 b/test/unit/storage/test.sqlite3
index afb55c6f768673f832c6aa29accc4d2aaf0e7829..17c2b5c5a9eeb758b5568260b0a0424cc69f3179 100644
GIT binary patch
delta 769
zcmZuvy>HV{5Pu(b9LEVFq~wDp#WjUcDHXO$N-P9YfPz#i`k{&mDL9GSSV^7YB$Ys@
zDMex?dIL-yV1XqdnFR*^0~RE9%D~crGQh&Z^J{^Eu=P9p&iDJB@9wSNT(3Pma!7m(
z0Ekc^3JCzN(aY&c8XfyA`C*9r0Qb=risSF#HPN_By*Kta;5p%boD&kM6nr4G&2qz9
zsWly|wQKo{^OMDeNqM1oVR}+lSg`kHqS9$uZpp4HvhB33CCkmpin(MtmD~RW8KLBK
zmdlo_$g8GXshRFcJ)a+?47*iYZkFwarO4%GvtgNzT(uU>PNOYn)hsy=Wio~Y?%vg)
zKwe}rP$KU#&%G^l0*;1gLm~xF5v1__Fhzhupzs@}GXR_y4L`x;y<kKh;eEHKaa|mh
zf;c0x|F*3b&AvgNNz;(`zDe6y@2qV0!$<&!A^qam^?D)<_q<ixt;Zvn03Oc(yp2EL
zTX+V)qN3+;SLQ?j!Eli00WwrgH#Ai@3^+^mvdmtQ@t+J$A3vR+I8)fm7-AV`X~ki2
zSL44D*`vG&M3EIy3r3+(Ff>DD++#)dC=MW2#2*s+T||vR$^+zUEEa%x2jCqqI`Rqk
zW;yu)41f$xzTT{wm+1juM+U6{v_=iR$iZ|f5E6xryCON2R$$nhPv3!TC;fmRBsRJs
zV!||xc$-6u@F_RI<shT8UHED~e(lMB-@hkBXLk+ZzePMQ`4Wfd+~!zIbL8z{(s!qr
OJ4HSY9{2c>AJR`?UaoQg

delta 519
zcmZvZJxc>Y5QcYlHo3dp1vNo)34UWVg_7L)dA+4Y5Ni>OU<g=Pq!3Y)A0WyWT4|w(
zSVYMcL5uhcY;0_`vC&p53un*Z7qa^-%*@Wb?7Q15+e^EtnC3CYEP@je#&BV8)U_!)
z_GCsW1z2NP<Bzb2Z|q7sVs`JkC=YEz4y0VHZW*$Y>ITa{Of3Uc{6{_vX@mL{AtFp@
z1dV1oVG>GC_#M_M$~(<7Pw;E`j@UtAY1kvr%sCMLtNDz%Z2m@ATw|R;jjP2{DPch?
zDi_yET~TZ>fn|m-c#mb=rzr*8>O-BufF24l?zrO<lT*_(o(K7CzIhOw7rjDfMsUH)
zIj-mA+*bW4s2`D7KMU&r_MgYO5>OBQ7Rbdw4W*oXjkg_(ZsCieON@|eBbeHd%@JFL
z^&qUvhmo|&HyQ1WTC&|vh7Db-Zs;;=4}$5>+v@-kd7G?-!&>5};|0jTXRC5lq1;tY
T|8<*_CG-5(cNM@FnRoL8_9AMI