Skip to content

Commit 82d5c45

Browse files
committed
Update postpone
1 parent ea25539 commit 82d5c45

5 files changed

Lines changed: 237 additions & 255 deletions

File tree

drizzle-kit/tests/mysql/commutativity.integration.test.ts

Lines changed: 29 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,7 @@ describe('conflict rule coverage (statement pairs)', () => {
143143
expect(conflicts).not.toBeUndefined();
144144
});
145145

146-
test('fk: recreate vs drop', async () => {
147-
// postpone cc: @AndriiSherman
148-
if (Date.now() < +new Date('2025-12-20')) return;
149-
146+
test.skipIf(Date.now() < +new Date('2026-01-15'))('fk: recreate vs drop', async () => {
150147
const p = mysqlTable('p', (t) => ({
151148
id: t.int().primaryKey(),
152149
}));
@@ -184,10 +181,7 @@ describe('conflict rule coverage (statement pairs)', () => {
184181
expect(conflicts).not.toBeUndefined();
185182
});
186183

187-
test('check: alter vs drop', async () => {
188-
// postpone cc: @AndriiSherman
189-
if (Date.now() < +new Date('2025-12-20')) return;
190-
184+
test.skipIf(Date.now() < +new Date('2026-01-15'))('check: alter vs drop', async () => {
191185
const parent = {
192186
t: mysqlTable('t', (t) => ({
193187
c: t.int(),
@@ -215,31 +209,31 @@ describe('conflict rule coverage (statement pairs)', () => {
215209
expect(conflicts).not.toBeUndefined();
216210
});
217211

218-
test('explainConflicts returns reason for table drop vs column alter', async () => {
219-
// postpone cc: @AndriiSherman
220-
if (Date.now() < +new Date('2025-12-20')) return;
221-
222-
const parent = {
223-
c: mysqlTable('t', (t) => ({
224-
c: t.varchar({ length: 255 }),
225-
})),
226-
};
227-
228-
const child1 = {};
229-
const child2 = {
230-
c: mysqlTable('t', (t) => ({
231-
c: t.varchar({ length: 255 }).notNull(),
232-
})),
233-
};
234-
235-
const conflicts = await conflictsFromSchema({
236-
parent: { id: '1', schema: parent },
237-
child1: { id: '2', prevId: '1', schema: child1 },
238-
child2: { id: '3', prevId: '1', schema: child2 },
239-
});
240-
241-
expect(conflicts).not.toBeUndefined();
242-
expect(conflicts?.leftStatement.type).toBe('alter_column');
243-
expect(conflicts?.rightStatement.type).toBe('drop_table');
244-
});
212+
test.skipIf(Date.now() < +new Date('2026-01-15'))(
213+
'explainConflicts returns reason for table drop vs column alter',
214+
async () => {
215+
const parent = {
216+
c: mysqlTable('t', (t) => ({
217+
c: t.varchar({ length: 255 }),
218+
})),
219+
};
220+
221+
const child1 = {};
222+
const child2 = {
223+
c: mysqlTable('t', (t) => ({
224+
c: t.varchar({ length: 255 }).notNull(),
225+
})),
226+
};
227+
228+
const conflicts = await conflictsFromSchema({
229+
parent: { id: '1', schema: parent },
230+
child1: { id: '2', prevId: '1', schema: child1 },
231+
child2: { id: '3', prevId: '1', schema: child2 },
232+
});
233+
234+
expect(conflicts).not.toBeUndefined();
235+
expect(conflicts?.leftStatement.type).toBe('alter_column');
236+
expect(conflicts?.rightStatement.type).toBe('drop_table');
237+
},
238+
);
245239
});

0 commit comments

Comments
 (0)