Merge branch 'partial-fix-for-58' of github.com:arlaneenalra/loopback-datasource-juggler

lib/dao.js

@@ -870,12 +870,14 @@ DataAccessObject.prototype.updateAttributes = function updateAttributes(data, cb
     } else {
       inst.trigger('save', function (saveDone) {
         inst.trigger('update', function (done) {
+          var typedData = {};
 
           for (var key in data) {
             inst[key] = data[key];
+            typedData[key] = inst.__data[key];
           }
 
-          inst._adapter().updateAttributes(model, getIdValue(inst.constructor, inst), inst.constructor._forDB(data), function (err) {
+          inst._adapter().updateAttributes(model, getIdValue(inst.constructor, inst), inst.constructor._forDB(typedData), function (err) {
             if (!err) {
               // update $was attrs
               for (var key in data) {

test/datatype.test.js

@@ -5,6 +5,25 @@ var db, Model;
 
 describe('datatypes', function () {
 
+  // Used to emulate a custom id type
+  function DummyType(value) {
+    if (!(this instanceof DummyType) &&
+      ( typeof value === 'string' || typeof value === 'object')) {
+
+      return new DummyType(value);
+    }
+
+    if (typeof value === 'string') {
+      this.value = value;
+      return;
+    } else if (typeof value === 'object') {
+      this.value = value.value;
+      return;
+    }
+
+    return value;
+  };
+
   before(function (done) {
     db = getSchema();
     Model = db.define('Model', {
@@ -12,6 +31,7 @@ describe('datatypes', function () {
       date: Date,
       num: Number,
       bool: Boolean,
+      dummy: DummyType,
       list: {type: []},
     });
     db.automigrate(function () {
@@ -63,4 +83,51 @@ describe('datatypes', function () {
 
   });
 
+  it('should respect data types when updating attributes', function (done) {
+    var d = new Date, id;
+
+    Model.create({
+      str: 'hello', date: d, num: '3', bool: 1, dummy: new DummyType('dummy')
+    }, function(err, m) {
+      should.not.exist(err);
+      should.exist(m && m.id);
+
+      // sanity check initial types
+      m.str.should.be.a('string');
+      m.num.should.be.a('number');
+      m.bool.should.be.a('boolean');
+      m.dummy.should.be.an.instanceOf(DummyType);
+      id = m.id;
+      testDataInDB(function () {
+        testUpdate(function() {
+          testDataInDB(done);
+        });
+      });
+    });
+
+    function testUpdate(done) {
+      Model.findById(id, function(err, m) {
+        should.not.exist(err);
+
+        // update using updateAttributes
+        m.updateAttributes({
+          id: id, dummy: 'NotADummy'
+        }, function (err, m) {
+          should.not.exist(err);
+          m.dummy.should.be.an.instanceOf(DummyType);
+          done();
+        });
+      });
+    }
+
+    function testDataInDB(done) {
+
+      // verify that the value stored in the db is still an object
+      db.connector.find(Model.modelName, id, function (err, data) {
+        should.exist(data);
+        data.dummy.should.be.a('object');
+        done();
+      });
+    }
+  });
 });