diff --git a/packages/drivers/driver-mongodb/src/mongodb-filter-boolean-identity.test.ts b/packages/drivers/driver-mongodb/src/mongodb-filter-boolean-identity.test.ts index b8ce49db12..01926b653e 100644 --- a/packages/drivers/driver-mongodb/src/mongodb-filter-boolean-identity.test.ts +++ b/packages/drivers/driver-mongodb/src/mongodb-filter-boolean-identity.test.ts @@ -346,7 +346,7 @@ describe.skipIf(!sharedMongod)('[#5239] a real mongod returns the identity row s }); const ids = async (where: unknown): Promise => { - const rows = await driver.find('deal', { object: 'deal', where } as never); + const rows = await driver.find('deal', { where } as never); return (rows as Record[]).map((r) => String(r.id)).sort(); }; diff --git a/packages/drivers/driver-mongodb/src/mongodb-filter-logic-conformance.test.ts b/packages/drivers/driver-mongodb/src/mongodb-filter-logic-conformance.test.ts index 841d7b9c6e..53683b3740 100644 --- a/packages/drivers/driver-mongodb/src/mongodb-filter-logic-conformance.test.ts +++ b/packages/drivers/driver-mongodb/src/mongodb-filter-logic-conformance.test.ts @@ -69,7 +69,7 @@ describe.skipIf(!sharedMongod)('driver-mongodb — filter logic conformance', () for (const c of FILTER_LOGIC_CASES) { it(c.name, async () => { - const rows = await driver.find('conformance', { object: 'conformance', where: c.filter } as any); + const rows = await driver.find('conformance', { where: c.filter }); const got = (rows as any[]) .map((r) => String(r.id)) .sort((x, y) => x.localeCompare(y)); @@ -82,7 +82,7 @@ describe.skipIf(!sharedMongod)('driver-mongodb — filter logic conformance', () * failed cannot read as a case that correctly excluded everything. */ it('the fixture really is all four rows', async () => { - const rows = await driver.find('conformance', { object: 'conformance' } as any); + const rows = await driver.find('conformance', {}); expect((rows as any[]).map((r) => String(r.id)).sort()).toEqual(['1', '2', '3', '4']); }); }); diff --git a/packages/drivers/driver-mongodb/src/mongodb-findone-options.test.ts b/packages/drivers/driver-mongodb/src/mongodb-findone-options.test.ts index 73f84aa112..61e0e947a3 100644 --- a/packages/drivers/driver-mongodb/src/mongodb-findone-options.test.ts +++ b/packages/drivers/driver-mongodb/src/mongodb-findone-options.test.ts @@ -114,7 +114,7 @@ describe('MongoDBDriver.findOne hands Mongo the whole query (#4419)', () => { for (const c of FINDONE_CASES) { it(`emits the right options — ${c.name}`, async () => { - await driver.findOne('account', { object: 'account', ...c.query } as any); + await driver.findOne('account', { ...c.query } as any); const { options } = lastFindOne(); // `undefined` here is a real assertion, not an absent one: it is the @@ -133,7 +133,7 @@ describe('MongoDBDriver.findOne hands Mongo the whole query (#4419)', () => { } it('translates the predicate, as it always did', async () => { - await driver.findOne('account', { object: 'account', where: { id: 'a' }, limit: 1 } as any); + await driver.findOne('account', { where: { id: 'a' }, limit: 1 }); expect(lastFindOne().filter).toMatchObject({ id: 'a' }); }); @@ -141,7 +141,7 @@ describe('MongoDBDriver.findOne hands Mongo the whole query (#4419)', () => { const session = { id: 'sess-1' } as any; await driver.findOne( 'account', - { object: 'account', where: { id: 'a' }, limit: 1 } as any, + { where: { id: 'a' }, limit: 1 }, { transaction: session } as any, ); expect(lastFindOne().options.session).toBe(session); @@ -151,7 +151,7 @@ describe('MongoDBDriver.findOne hands Mongo the whole query (#4419)', () => { for (const c of FINDONE_CASES) { it(`selects the right row — ${c.name}`, async () => { - const row = await driver.findOne('account', { object: 'account', ...c.query } as any); + const row = await driver.findOne('account', { ...c.query } as any); expect(row === null ? null : String((row as any).id)).toBe(c.expectId); if (c.expectKeys && row) expect(new Set(Object.keys(row))).toEqual(new Set(c.expectKeys)); }); @@ -160,12 +160,12 @@ describe('MongoDBDriver.findOne hands Mongo the whole query (#4419)', () => { // ── find() is unchanged: the carve-out is findOne-only ────────────── it('an unordered PAGED find still gets a deterministic order imposed', async () => { - await driver.find('account', { object: 'account', limit: 2, offset: 0 } as any); + await driver.find('account', { limit: 2, offset: 0 }); expect(seen.find.at(-1)!.options.sort).toEqual({ id: 1 }); }); it('an unordered, unpaged find still gets none — that rule is unchanged', async () => { - await driver.find('account', { object: 'account' } as any); + await driver.find('account', {}); expect(seen.find.at(-1)!.options.sort).toBeUndefined(); }); }); diff --git a/packages/drivers/driver-mongodb/src/mongodb-findone-query.test.ts b/packages/drivers/driver-mongodb/src/mongodb-findone-query.test.ts index c0f9c3ab15..f784e56f8d 100644 --- a/packages/drivers/driver-mongodb/src/mongodb-findone-query.test.ts +++ b/packages/drivers/driver-mongodb/src/mongodb-findone-query.test.ts @@ -58,7 +58,7 @@ describe.skipIf(!sharedMongod)('driver-mongodb — findOne executes the whole qu for (const c of FINDONE_CASES) { it(c.name, async () => { - const row = await driver.findOne('account', { object: 'account', ...c.query } as any); + const row = await driver.findOne('account', { ...c.query } as any); expect(row === null ? null : String((row as any).id)).toBe(c.expectId); if (c.expectKeys && row) expect(new Set(Object.keys(row))).toEqual(new Set(c.expectKeys)); }); @@ -67,7 +67,7 @@ describe.skipIf(!sharedMongod)('driver-mongodb — findOne executes the whole qu it('find() is unchanged — a paged walk is still a partition of the rows', async () => { const seen: string[] = []; for (let offset = 0; offset < FINDONE_ROWS.length; offset += 2) { - const page = await driver.find('account', { object: 'account', limit: 2, offset } as any); + const page = await driver.find('account', { limit: 2, offset }); seen.push(...page.map((r) => String(r.id))); } expect(seen).toHaveLength(FINDONE_ROWS.length); diff --git a/packages/drivers/driver-sql/src/sql-driver-temporal-conformance.test.ts b/packages/drivers/driver-sql/src/sql-driver-temporal-conformance.test.ts index a7b7ce9072..790c9fcee2 100644 --- a/packages/drivers/driver-sql/src/sql-driver-temporal-conformance.test.ts +++ b/packages/drivers/driver-sql/src/sql-driver-temporal-conformance.test.ts @@ -115,7 +115,7 @@ const timeShape = (name: string) => ({ /** Row ids a filter reaches, sorted — the one thing every cell must agree on. */ async function matchedIds(driver: SqlDriver, table: string, where: unknown): Promise { - const rows = await driver.find(table, { object: table, where } as any); + const rows = await driver.find(table, { where } as any); return (rows as any[]).map((r) => r.id).sort(); } diff --git a/scripts/query-options-erasure-baseline.json b/scripts/query-options-erasure-baseline.json index 755a18cf46..89be7743ab 100644 --- a/scripts/query-options-erasure-baseline.json +++ b/scripts/query-options-erasure-baseline.json @@ -50,6 +50,6 @@ "packages/services/service-settings/src/settings-service.ts": 2 }, "testSurface": { - "sites": 249 + "sites": 242 } }