Merge pull request #1094 from strongloop/newInstance_loade_updateAttributes

Add 'isNewInstance' for updateAttributes

Author: Amir-61

lib/dao.js

@@ -3090,6 +3090,7 @@ function(data, options, cb) {
                 data: context.data,
                 hookState: hookState,
                 options: options,
+                isNewInstance: false,
               };
               Model.notifyObserversOf('loaded', ctx, function(err) {
                 if (err) return cb(err);

test/memory.test.js

@@ -901,6 +901,7 @@ describe('Unoptimized connector', function() {
   // disable optimized methods
   ds.connector.updateOrCreate = false;
   ds.connector.findOrCreate = false;
+  ds.connector.upsertWithWhere = false;
 
   require('./persistence-hooks.suite')(ds, should, {
     replaceOrCreateReportsNewInstance: true,

test/persistence-hooks.suite.js

@@ -1360,6 +1360,7 @@ module.exports = function(dataSource, should, connectorCapabilities) {
 
           ctxRecorder.records.should.eql(aCtxForModel(TestModel, {
             data: {name: 'changed'},
+            isNewInstance: false,
           }));
 
           done();
@@ -2039,25 +2040,13 @@ module.exports = function(dataSource, should, connectorCapabilities) {
           {id: existingInstance.id, name: 'updated name'},
           function(err, instance) {
             if (err) return done(err);
-
-            if (dataSource.connector.updateOrCreate) {
-              ctxRecorder.records.should.eql(aCtxForModel(TestModel, {
-                data: {
-                  id: existingInstance.id,
-                  name: 'updated name',
-                },
-                isNewInstance: false,
-              }));
-            } else {
-              ctxRecorder.records.should.eql(
-                aCtxForModel(TestModel, {
-                  data: {
-                    id: existingInstance.id,
-                    name: 'updated name',
-                  },
-                })
-              );
-            }
+            ctxRecorder.records.should.eql(aCtxForModel(TestModel, {
+              data: {
+                id: existingInstance.id,
+                name: 'updated name',
+              },
+              isNewInstance: false,
+            }));
             done();
           });
       });
@@ -3267,13 +3256,8 @@ module.exports = function(dataSource, should, connectorCapabilities) {
                 id: existingInstance.id,
                 name: 'updated name',
               },
+              isNewInstance: false,
             });
-            // For non-atomic implementation of upsertWithWhere on update, it calls
-            // updateAttributes. loaded hook of updateAttributes does not provide
-            // isNewInstance.
-            if (dataSource.connector.upsertWithWhere) {
-              expectedContext.isNewInstance = false;
-            }
             ctxRecorder.records.should.eql(aCtxForModel(TestModel, expectedContext));
             done();
           });