Merge pull request #1424 from jsforce/cd/fix-query-missing-batch

fix: ensure query stops after reaching max records
jsforce · May 20, 2024 · b8eab0f · b8eab0f
2 parents 52aeb9a + 11fb447
commit b8eab0f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/src/query.ts b/src/query.ts
@@ -674,6 +674,7 @@ export class Query<
  this._finished ||
  data.done ||
  !autoFetch ||
+ this.records.length === maxFetch ||
  // this is what the response looks like when there are no results
  (data.records.length === 0 && data.done === undefined);
 

diff --git a/test/connection-session.test.ts b/test/connection-session.test.ts
@@ -29,7 +29,7 @@ describe('login', () => {
  assert.ok(typeof userInfo.url === 'string');
  });
 
- it('should not allow a lightning URL as instance URL', async () => {
+ it('should not allow a lightning URL as instance URL', () => {
  // .lightning
  try {
  conn = new Connection({

diff --git a/test/query.test.ts b/test/query.test.ts
@@ -75,6 +75,19 @@ describe('big tables and autoFetch', () => {
  assert.ok(records.length === totalRecordCount);
  });
 
+ it('should return the first batch with autoFetch and maxFetch set to 2000', async () => {
+ let requestQty = 0
+
+ const result = await conn.query(bigTableQuery, { autoFetch: true, maxFetch: 2000}).on('fetch', () => {
+ requestQty++
+ })
+
+ expect(result.records.length).toBe(2000);
+ expect(result.nextRecordsUrl).toBeTruthy();
+ expect(result.done).toBe(false);
+ expect(requestQty).toBe(1);
+ });
+
  /**
  *
  */