bookshelf · Aug 30, 2015 · Aug 30, 2015 · Aug 30, 2015 · Aug 30, 2015 · Aug 30, 2015
Showing with 83 additions and 67 deletions.

+20 −13 lib/base/model.js

+57 −51 lib/model.js

+6 −3 lib/sync.js
diff --git a/lib/base/model.js b/lib/base/model.js
@@ -38,7 +38,7 @@ ModelBase.prototype.initialize = function () {};
 
 /**
  * @name ModelBase#tableName
- * @member {string} 
+ * @member {string}
  * @description
  *
  * A required property for any database usage, The
@@ -142,7 +142,7 @@ ModelBase.prototype.set = function (key, val, options) {
  *
  * var modelA = new bookshelf.Model();
  * modelA.isNew(); // true
- * 
+ *
  * var modelB = new bookshelf.Model({id: 1});
  * modelB.isNew(); // false
  */
@@ -185,7 +185,14 @@ ModelBase.prototype.serialize = function (options) {
   var relations = this.relations;
   for (var key in relations) {
     var relation = relations[key];
-    attrs[key] = relation.toJSON ? relation.toJSON(options) : relation;
+    // Zube addition so relations that are not present are null instead of {}
+    if (relation.toJSON) {
+      var relationAttrs = relation.toJSON(options);
+      if (_.isEmpty(relationAttrs) && !_.isArray(relationAttrs)) relationAttrs = null;
+      attrs[key] = relationAttrs;
+    } else {
+      attrs[key] = relation;
+    }
   }
   if (options && options.omitPivot) return attrs;
   if (this.pivot) {
@@ -430,7 +437,7 @@ ModelBase.prototype.timestamp = function (options) {
  * Model#destroy destroy}. If an attribute is passed, returns true only if that
  * specific attribute has changed.
  *
- * @param {string=} attribute 
+ * @param {string=} attribute
  * @returns {bool}
  * `true` if any attribute has changed. Or, if `attribute` was specified, true
  * if it has changed.
@@ -534,32 +541,32 @@ _.each(modelMethods, function (method) {
  *     var checkit  = require('checkit');
  *     var Promise  = require('bluebird');
  *     var bcrypt   = Promise.promisifyAll(require('bcrypt'));
- *     
+ *
  *     var Customer = bookshelf.Model.extend({
- *     
+ *
  *       initialize: function() {
  *         this.on('saving', this.validateSave);
  *       },
- *     
+ *
  *       validateSave: function() {
  *         return checkit(rules).run(this.attributes);
  *       },
- *     
+ *
  *       account: function() {
  *         return this.belongsTo(Account);
  *       },
- *     
+ *
  *     }, {
- *     
+ *
  *       login: Promise.method(function(email, password) {
  *         if (!email || !password) throw new Error('Email and password are both required');
  *         return new this({email: email.toLowerCase().trim()}).fetch({require: true}).tap(function(customer) {
  *           return bcrypt.compareAsync(customer.get('password'), password);
  *         });
  *       })
- *     
+ *
  *     });
- *     
+ *
  *     Customer.login(email, password)
  *       .then(function(customer) {
  *         res.json(customer.omit('password'));
@@ -593,4 +600,4 @@ _.each(modelMethods, function (method) {
  */
 ModelBase.extend = require('../extend');
 
-module.exports = ModelBase;
+module.exports = ModelBase;