From bf41cf988ddb13e30b9d2f1bffed14f028b49122 Mon Sep 17 00:00:00 2001 From: D050513 Date: Tue, 28 Apr 2026 20:18:48 +0200 Subject: [PATCH 1/3] chore: cleanup re count --- db-service/lib/search.js | 2 +- test/compliance/SELECT.test.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/db-service/lib/search.js b/db-service/lib/search.js index 67cd29635..61149b01c 100644 --- a/db-service/lib/search.js +++ b/db-service/lib/search.js @@ -166,7 +166,7 @@ const computeColumnsToBeSearched = (cqn, entity = { __searchableColumns: [] }) = if ( cqn.SELECT.columns.length === 1 && column.func === 'count' && - (column.as === '_counted_' || column.as === '$count') + column.as === '$count' ) { return } diff --git a/test/compliance/SELECT.test.js b/test/compliance/SELECT.test.js index f9c881734..ed4a0d895 100644 --- a/test/compliance/SELECT.test.js +++ b/test/compliance/SELECT.test.js @@ -1132,9 +1132,9 @@ describe('SELECT', () => { const query = SELECT.from('complex.associations.Authors') query.SELECT.count = true const result = await query - assert.strictEqual(result.$count, 1) + assert.strictEqual(Number(result.$count), 1) const renamed = result.map(row => ({ key: row.ID, fullName: row.name })) - assert.strictEqual(renamed.$count, 1) + assert.strictEqual(Number(renamed.$count), 1) }) }) From 26416885ec5c55a38d1349579de4bd19c53c1b78 Mon Sep 17 00:00:00 2001 From: D050513 Date: Tue, 28 Apr 2026 20:33:32 +0200 Subject: [PATCH 2/3] res.data['@odata.count'] == 1 Co-authored-by: Copilot --- test/scenarios/sflight/lean-draft.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/scenarios/sflight/lean-draft.test.js b/test/scenarios/sflight/lean-draft.test.js index 821323781..a7ec2acc3 100644 --- a/test/scenarios/sflight/lean-draft.test.js +++ b/test/scenarios/sflight/lean-draft.test.js @@ -125,7 +125,7 @@ describe('draft tests', () => { { auth: { username: 'user1', password: 'user1' } }, ) expect(res.status).to.be.eq(200) - expect(res.data['@odata.count']).to.be.eq(1) + expect(res.data['@odata.count'] == 1).to.be.eq(true) firstRow = res.data.value[0] expect(firstRow.IsActiveEntity).to.be.eq(true) expect(firstRow.HasActiveEntity).to.be.eq(false) From b8c483564b5a4d440a86bc23164f405f15ce914b Mon Sep 17 00:00:00 2001 From: sjvans <30337871+sjvans@users.noreply.github.com> Date: Tue, 30 Jun 2026 14:03:12 +0200 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: Daniel Hutzel --- test/compliance/SELECT.test.js | 4 ++-- test/scenarios/sflight/lean-draft.test.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/compliance/SELECT.test.js b/test/compliance/SELECT.test.js index ed4a0d895..f2c50f8e5 100644 --- a/test/compliance/SELECT.test.js +++ b/test/compliance/SELECT.test.js @@ -1132,9 +1132,9 @@ describe('SELECT', () => { const query = SELECT.from('complex.associations.Authors') query.SELECT.count = true const result = await query - assert.strictEqual(Number(result.$count), 1) + assert.equal(result.$count, 1) const renamed = result.map(row => ({ key: row.ID, fullName: row.name })) - assert.strictEqual(Number(renamed.$count), 1) + assert.equal(renamed.$count, 1) }) }) diff --git a/test/scenarios/sflight/lean-draft.test.js b/test/scenarios/sflight/lean-draft.test.js index a7ec2acc3..340e2fe99 100644 --- a/test/scenarios/sflight/lean-draft.test.js +++ b/test/scenarios/sflight/lean-draft.test.js @@ -125,7 +125,7 @@ describe('draft tests', () => { { auth: { username: 'user1', password: 'user1' } }, ) expect(res.status).to.be.eq(200) - expect(res.data['@odata.count'] == 1).to.be.eq(true) + expect(res.data['@odata.count']).eqls(1) firstRow = res.data.value[0] expect(firstRow.IsActiveEntity).to.be.eq(true) expect(firstRow.HasActiveEntity).to.be.eq(false)