From 51914ca64caba2a80d429e8f432df6ab2c395f89 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 6 Oct 2026 20:14:51 +0000 Subject: [PATCH 1/2] feat: add getAddMinutesExpression database-agnostic helper MySQL: column + INTERVAL n MINUTE. SQLite: datetime(column, '+n minutes'). Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Po2GocBhFneXD2k9z1f6Ld --- utils/entity/__tests__/column-types.util.spec.ts | 16 +++++++++++++++- utils/entity/column-types.util.ts | 16 ++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/utils/entity/__tests__/column-types.util.spec.ts b/utils/entity/__tests__/column-types.util.spec.ts index 7809d93..e083238 100644 --- a/utils/entity/__tests__/column-types.util.spec.ts +++ b/utils/entity/__tests__/column-types.util.spec.ts @@ -11,7 +11,7 @@ jest.mock('typeorm', () => { }; }); -import { LongJsonColumn } from '../column-types.util'; +import { LongJsonColumn, getAddMinutesExpression } from '../column-types.util'; describe('LongJsonColumn', () => { beforeEach(() => { @@ -49,3 +49,17 @@ describe('LongJsonColumn', () => { expect(options.transformer).toBe(customTransformer); }); }); + +describe('getAddMinutesExpression', () => { + it('uses datetime() modifiers on SQLite (test environment)', () => { + expect(getAddMinutesExpression('t.created_at', 15)).toBe("datetime(t.created_at, '+15 minutes')"); + }); + + it('uses INTERVAL arithmetic on MySQL', () => { + jest.isolateModules(() => { + jest.doMock('@shared/config/database.config', () => ({ databaseConfig: { type: 'mysql' } })); + const { getAddMinutesExpression: mysqlAddMinutes } = require('../column-types.util'); + expect(mysqlAddMinutes('t.created_at', 15)).toBe('t.created_at + INTERVAL 15 MINUTE'); + }); + }); +}); diff --git a/utils/entity/column-types.util.ts b/utils/entity/column-types.util.ts index ad4bea4..6ff65c4 100644 --- a/utils/entity/column-types.util.ts +++ b/utils/entity/column-types.util.ts @@ -198,6 +198,22 @@ export function getGroupConcatExpression(column: string, separator: string = ', } } +/** + * Database-agnostic "datetime plus minutes" expression + * MySQL: column + INTERVAL 15 MINUTE + * SQLite: datetime(column, '+15 minutes') + */ +export function getAddMinutesExpression(column: string, minutes: number): string { + const dbType = getDatabaseType(); + + if (dbType === DatabaseType.MYSQL) { + return `${column} + INTERVAL ${minutes} MINUTE`; + } else { + // SQLite + return `datetime(${column}, '+${minutes} minutes')`; + } +} + /** * Database-agnostic CONCAT function * MySQL: CONCAT(col1, '_', col2) From 47442d0e551b379b264c1d63db8e08f7e6292558 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 6 Oct 2026 20:18:43 +0000 Subject: [PATCH 2/2] fix: keep milliseconds and support negative minutes in getAddMinutesExpression on SQLite datetime() truncates fractional seconds, and '+-15 minutes' is invalid. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Po2GocBhFneXD2k9z1f6Ld --- utils/entity/__tests__/column-types.util.spec.ts | 8 ++++++-- utils/entity/column-types.util.ts | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/utils/entity/__tests__/column-types.util.spec.ts b/utils/entity/__tests__/column-types.util.spec.ts index e083238..66da1c1 100644 --- a/utils/entity/__tests__/column-types.util.spec.ts +++ b/utils/entity/__tests__/column-types.util.spec.ts @@ -51,8 +51,12 @@ describe('LongJsonColumn', () => { }); describe('getAddMinutesExpression', () => { - it('uses datetime() modifiers on SQLite (test environment)', () => { - expect(getAddMinutesExpression('t.created_at', 15)).toBe("datetime(t.created_at, '+15 minutes')"); + it('uses strftime() modifiers on SQLite (test environment), keeping milliseconds', () => { + expect(getAddMinutesExpression('t.created_at', 15)).toBe("strftime('%Y-%m-%d %H:%M:%f', t.created_at, '+15 minutes')"); + }); + + it('subtracts minutes on SQLite for negative values', () => { + expect(getAddMinutesExpression('t.created_at', -15)).toBe("strftime('%Y-%m-%d %H:%M:%f', t.created_at, '-15 minutes')"); }); it('uses INTERVAL arithmetic on MySQL', () => { diff --git a/utils/entity/column-types.util.ts b/utils/entity/column-types.util.ts index 6ff65c4..7cff3cb 100644 --- a/utils/entity/column-types.util.ts +++ b/utils/entity/column-types.util.ts @@ -201,7 +201,7 @@ export function getGroupConcatExpression(column: string, separator: string = ', /** * Database-agnostic "datetime plus minutes" expression * MySQL: column + INTERVAL 15 MINUTE - * SQLite: datetime(column, '+15 minutes') + * SQLite: strftime('%Y-%m-%d %H:%M:%f', column, '+15 minutes') (keeps milliseconds, unlike datetime()) */ export function getAddMinutesExpression(column: string, minutes: number): string { const dbType = getDatabaseType(); @@ -210,7 +210,8 @@ export function getAddMinutesExpression(column: string, minutes: number): string return `${column} + INTERVAL ${minutes} MINUTE`; } else { // SQLite - return `datetime(${column}, '+${minutes} minutes')`; + const sign = minutes >= 0 ? '+' : ''; + return `strftime('%Y-%m-%d %H:%M:%f', ${column}, '${sign}${minutes} minutes')`; } }