fix: don't call overloaded versions of find functions internally (#13951

)

dev/release-v6.ts

@@ -35,16 +35,23 @@ const RELEASING_COLUMN_ID = 17444349;
     process.exit(1);
   }
 
-  const github = new Octokit({
-    auth: token
-  });
+  const github = new Octokit({ auth: token });
   const commits = await getCommitsFromProject(github);
 
-  await Promise.all(commits.map(commit => mergeCommit(github, commit)));
+  await processCommitsInSeries(github, commits);
 })();
 
 // Helpers
 
+async function processCommitsInSeries(github: Octokit, commits: CardCommit[]) {
+  let commit: CardCommit | undefined = commits.shift();
+
+  while (commit) {
+    await mergeCommit(github, commit);
+    commit = commits.shift();
+  }
+}
+
 async function getCommitsFromProject(github: Octokit): Promise<CardCommit[]> {
   const cards = await github.rest.projects.listCards({
     column_id: TO_BE_RELEASED_COLUMN_ID
@@ -110,15 +117,19 @@ function mergeCommitTeaser(commit: PullRequest) {
 }
 
 async function moveCard(github: Octokit, card: Card, to: number) {
+  let result = 'skipped';
+
   if (process.env.DRY_RUN === 'false') {
-    const a = await github.rest.projects.moveCard({
+    const response = await github.rest.projects.moveCard({
       card_id: card.id,
       position: 'bottom',
       column_id: to
     });
 
-    console.log(a);
+    result = response.status === 201 ? 'success' : 'error';
   }
+
+  console.info('- Card moved to column:', result);
 }
 
 async function gitMerge(sha: string) {

lib/model.js

@@ -1916,7 +1916,7 @@ class Model {
     }
 
     // Bypass a possible overloaded findOne
-    return await this.findOne(options);
+    return await Model.findOne.call(this, options);
   }
 
   /**
@@ -1950,9 +1950,9 @@ class Model {
     }
 
     // Bypass a possible overloaded findAll.
-    return await this.findAll(_.defaults(options, {
-      plain: true
-    }));
+    return await Model.findAll.call(this, (_.defaults(options, {
+      plain: true,
+    })));
   }
 
   /**

test/unit/model/find-by-pk.test.js

@@ -0,0 +1,42 @@
+'use strict';
+
+const chai = require('chai');
+
+const expect = chai.expect;
+const Support = require('../support');
+
+const Sequelize = Support.Sequelize;
+const Op = Sequelize.Op;
+const current = Support.sequelize;
+const sinon = require('sinon');
+const DataTypes = require('../../../lib/data-types');
+
+describe(Support.getTestDialectTeaser('Model'), () => {
+  describe('method findByPk', () => {
+    beforeEach(function () {
+      this.stub = sinon.stub(Sequelize.Model, 'findAll').resolves();
+    });
+    afterEach(() => {
+      sinon.restore();
+    });
+
+    it('should call internal findOne() method if findOne() is overridden', async () => {
+      const Model = current.define('model', {
+        unique1: {
+          type: DataTypes.INTEGER,
+          unique: 'unique',
+        },
+        unique2: {
+          type: DataTypes.INTEGER,
+          unique: 'unique',
+        },
+      });
+      Model.findOne = sinon.stub();
+      sinon.spy(Sequelize.Model, 'findOne');
+
+      await Model.findByPk(1);
+      Model.findOne.should.not.have.been.called;
+      Sequelize.Model.findOne.should.have.been.called;
+    });
+  });
+});

test/unit/model/findone.test.js → test/unit/model/find-one.test.js

@@ -105,5 +105,22 @@ describe(Support.getTestDialectTeaser('Model'), () => {
       await Model.findOne({ where: { unique1: 42 } });
       expect(this.stub.getCall(0).args[0]).to.be.an('object').to.have.property('limit');
     });
+    it('should call internal findAll() method if findOne() is overridden', async () => {
+      const Model = current.define('model', {
+        unique1: {
+          type: DataTypes.INTEGER,
+          unique: 'unique',
+        },
+        unique2: {
+          type: DataTypes.INTEGER,
+          unique: 'unique',
+        },
+      });
+      Model.findAll = sinon.stub();
+
+      await Model.findOne();
+      Model.findAll.should.not.have.been.called;
+      Sequelize.Model.findAll.should.have.been.called;
+    });
   });
 });