fix(upsert): set isNewRecord to false when upserting (#12447) (#12485)

lib/dialects/mariadb/query.js

@@ -96,7 +96,7 @@ class Query extends AbstractQuery {
       return data.affectedRows;
       return data.affectedRows;
     }
     }
     if (this.isUpsertQuery()) {
     if (this.isUpsertQuery()) {
-      return [null, data.affectedRows === 1];
+      return [result, data.affectedRows === 1];
     }
     }
     if (this.isInsertQuery(data)) {
     if (this.isInsertQuery(data)) {
       this.handleInsertQuery(data);
       this.handleInsertQuery(data);

lib/model.js

@@ -2469,6 +2469,9 @@ class Model {
     }
     }
     const result = await this.queryInterface.upsert(this.getTableName(options), insertValues, updateValues, instance.where(), options);
     const result = await this.queryInterface.upsert(this.getTableName(options), insertValues, updateValues, instance.where(), options);
 
 
+    const [record] = result;
+    record.isNewRecord = false;
+
     if (options.hooks) {
     if (options.hooks) {
       await this.runHooks('afterUpsert', result, options);
       await this.runHooks('afterUpsert', result, options);
       return result;
       return result;

test/integration/instance.test.js

@@ -85,6 +85,12 @@ describe(Support.getTestDialectTeaser('Instance'), () => {
       expect(user.isNewRecord).to.not.be.ok;
       expect(user.isNewRecord).to.not.be.ok;
     });
     });
 
 
+    it('returns false for upserted objects', async function() {
+      // adding id here so MSSQL doesn't fail. It needs a primary key to upsert
+      const [user] = await this.User.upsert({ id: 2, username: 'user' });
+      expect(user.isNewRecord).to.not.be.ok;
+    });
+
     it('returns false for objects found by find method', async function() {
     it('returns false for objects found by find method', async function() {
       await this.User.create({ username: 'user' });
       await this.User.create({ username: 'user' });
       const user = await this.User.create({ username: 'user' });
       const user = await this.User.create({ username: 'user' });

test/unit/model/upsert.test.js

@@ -43,7 +43,7 @@ describe(Support.getTestDialectTeaser('Model'), () => {
 
 
       beforeEach(function() {
       beforeEach(function() {
         this.query = sinon.stub(current, 'query').resolves();
         this.query = sinon.stub(current, 'query').resolves();
-        this.stub = sinon.stub(current.getQueryInterface(), 'upsert').resolves([true, undefined]);
+        this.stub = sinon.stub(current.getQueryInterface(), 'upsert').resolves([this.User.build(), true]);
       });
       });
 
 
       afterEach(function() {
       afterEach(function() {