Skip to content

Commit fe92e22

Browse files
committed
Bump expired skipIf postpones to 2026-06-20 and fix oxlint no-useless-undefined
Today (2026-05-20) is the postpone date in five integration-test files for the "Query error wrapping" / "Mappers: deep nullification" / "Same table name joined between schemas" gates, so vitest started running them and they fail because sync drivers (better-sqlite3, sqljs, postgres.js, mssql/tedious, cockroach pg) still return raw driver errors instead of DrizzleQueryError. Per the repo's skipIf convention (drizzle-orm/.claude/skills/tests), bump the dates to one month forward rather than fix in-band: integration-tests/tests/{sqlite/sqlite-common, pg/common-cache, pg/common-pt2, cockroach/common, mssql/mssql}.ts, plus the @ts-ignore searchable-marker comment in pg/common-pt2.ts. Also rewrite the no-useless-undefined violations in drizzle-kit/tests/sdk/regressions/no-stdout.test.ts (process.exit mock implementation): `() => undefined` to `() => {}` so the gate that ran lint on the last green CI build (post-merge) passes. Behavior is identical; the spy still swallows the exit call.
1 parent fef9ccf commit fe92e22

6 files changed

Lines changed: 10 additions & 10 deletions

File tree

drizzle-kit/tests/sdk/regressions/no-stdout.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ describe('SDK does not invoke process.stdout.write or process.exit', () => {
3939
stdoutCalls.push(args);
4040
return true;
4141
}) as unknown as typeof process.stdout.write);
42-
const exitSpy = vi.spyOn(process, 'exit').mockImplementation((() => undefined) as never);
42+
const exitSpy = vi.spyOn(process, 'exit').mockImplementation(((() => {}) as unknown) as never);
4343

4444
const { dir, schemaPath } = setupFixture('generate-no-stdout');
4545
try {
@@ -70,7 +70,7 @@ describe('SDK does not invoke process.stdout.write or process.exit', () => {
7070
stdoutCalls.push(args);
7171
return true;
7272
}) as unknown as typeof process.stdout.write);
73-
const exitSpy = vi.spyOn(process, 'exit').mockImplementation((() => undefined) as never);
73+
const exitSpy = vi.spyOn(process, 'exit').mockImplementation(((() => {}) as unknown) as never);
7474

7575
try {
7676
// Use a missing schema path — push surfaces a schema_files_not_found_error envelope from

integration-tests/tests/cockroach/common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7612,7 +7612,7 @@ export function tests() {
76127612
});
76137613
});
76147614

7615-
test.skipIf(Date.now() < +new Date('2026-05-20'))('Query error wrapping', async ({ cockroach: { db } }) => {
7615+
test.skipIf(Date.now() < +new Date('2026-06-20'))('Query error wrapping', async ({ cockroach: { db } }) => {
76167616
await expect(db.insert(users2Table).values([{ id: 1, name: 'First' }, { id: 1, name: 'Second' }]))
76177617
.rejects.toBeInstanceOf(DrizzleQueryError);
76187618
});

integration-tests/tests/mssql/mssql.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4971,7 +4971,7 @@ test('issue 5527. real() returns unprecise float64 values', async ({ db }) => {
49714971
expect(res).toStrictEqual({ id: 1, age: 0.01 });
49724972
});
49734973

4974-
test.skipIf(Date.now() < +new Date('2026-05-20'))('Query error wrapping', async ({ db }) => {
4974+
test.skipIf(Date.now() < +new Date('2026-06-20'))('Query error wrapping', async ({ db }) => {
49754975
await expect(db.insert(users2Table).values([{ id: 1, name: 'First' }, { id: 1, name: 'Second' }]))
49764976
.rejects.toBeInstanceOf(DrizzleQueryError);
49774977
});

integration-tests/tests/pg/common-cache.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ export function tests(test: Test) {
331331

332332
// Test itself passes, but breaks 'insert via db.execute w/ query builder' tests later on
333333
// need to revisit test cleanup
334-
test.skipIf(Date.now() < +new Date('2026-05-20'))('Query error wrapping', async ({ db, push }) => {
334+
test.skipIf(Date.now() < +new Date('2026-06-20'))('Query error wrapping', async ({ db, push }) => {
335335
const table = pgTable('somethingelse_error_wrap_slowpath', (t) => ({
336336
id: t.integer().primaryKey(),
337337
name: t.text().notNull(),

integration-tests/tests/pg/common-pt2.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6442,7 +6442,7 @@ export function tests(test: Test) {
64426442
.rejects.toBeInstanceOf(DrizzleQueryError);
64436443
});
64446444

6445-
test.skipIf(Date.now() < +new Date('2026-05-20')).concurrent(
6445+
test.skipIf(Date.now() < +new Date('2026-06-20')).concurrent(
64466446
'Mappers: deep nullification',
64476447
async ({ db, push }) => {
64486448
const users = pgTable('mappers_users_dn', (t) => ({
@@ -6541,7 +6541,7 @@ export function tests(test: Test) {
65416541
},
65426542
);
65436543

6544-
test.skipIf(Date.now() < +new Date('2026-05-20')).concurrent(
6544+
test.skipIf(Date.now() < +new Date('2026-06-20')).concurrent(
65456545
'Jit mappers: deep nullification',
65466546
async ({ createDB, push }) => {
65476547
const users = pgTable('mappers_users_jdn', (t) => ({
@@ -6641,7 +6641,7 @@ export function tests(test: Test) {
66416641
},
66426642
);
66436643

6644-
test.skipIf(Date.now() < +new Date('2026-05-20')).concurrent(
6644+
test.skipIf(Date.now() < +new Date('2026-06-20')).concurrent(
66456645
'Same table name joined between schemas',
66466646
async ({ db }) => {
66476647
const users1 = pgTable('users_cs_join_1', (t) => ({
@@ -6671,7 +6671,7 @@ export function tests(test: Test) {
66716671
u2: users2,
66726672
}).from(users1).leftJoin(users2, eq(users1.id, users2.id));
66736673

6674-
// @ts-ignore skipIf(Date.now() < +new Date('2026-05-20')) - just to make it searchable
6674+
// @ts-ignore skipIf(Date.now() < +new Date('2026-06-20')) - just to make it searchable
66756675
expectTypeOf(res).toEqualTypeOf<{
66766676
u1: {
66776677
id: number;

integration-tests/tests/sqlite/sqlite-common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6034,7 +6034,7 @@ export function tests(test: Test, exclude: string[] = []) {
60346034
});
60356035

60366036
// Sync drivers don't wrap errors - TODO
6037-
test.skipIf(Date.now() < +new Date('2026-05-20'))('Query error wrapping', async ({ db }) => {
6037+
test.skipIf(Date.now() < +new Date('2026-06-20'))('Query error wrapping', async ({ db }) => {
60386038
await expect(async () =>
60396039
await db.insert(usersTable).values([{ id: 1, name: 'First' }, { id: 1, name: 'Second' }]).run()
60406040
)

0 commit comments

Comments
 (0)