From 03ee902c3d1a8d65a26e4de4ed25c8142b205e64 Mon Sep 17 00:00:00 2001 From: Maurice Date: Tue, 17 Nov 2026 15:15:48 +0100 Subject: [PATCH] fix(db): type the move's value conversion and client for the server's compiler Formats the two files the format gate listed. --- server/src/db/engine/postgres/sqlite-move/copy.ts | 3 ++- server/src/db/engine/postgres/sqlite-move/move.ts | 3 ++- server/src/db/repositories/_shared/reservation-visibility.ts | 2 +- server/tests/unit/db/engine/postgres/null-order.test.ts | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/server/src/db/engine/postgres/sqlite-move/copy.ts b/server/src/db/engine/postgres/sqlite-move/copy.ts index 0497766a5..d454c321d 100644 --- a/server/src/db/engine/postgres/sqlite-move/copy.ts +++ b/server/src/db/engine/postgres/sqlite-move/copy.ts @@ -167,7 +167,8 @@ export async function copyTable( const values: PostgresValue[] = []; spec.columns.forEach((column, index) => { const converted = convertValue(raw[index] as SqliteValue, column.kind); - if (converted.ok) { + // Narrowed by `in`: the server compiles without strictNullChecks, where `ok` does not narrow the union. + if (!('reason' in converted)) { values.push(converted.value); if (column.kind === 'integer' && beyondSafeInteger(converted.value)) result.unsafeIntegers++; return; diff --git a/server/src/db/engine/postgres/sqlite-move/move.ts b/server/src/db/engine/postgres/sqlite-move/move.ts index 2bf752f63..79687cb6b 100644 --- a/server/src/db/engine/postgres/sqlite-move/move.ts +++ b/server/src/db/engine/postgres/sqlite-move/move.ts @@ -25,6 +25,7 @@ import { resolveIdentitySequences, type PluginPlan, } from './plugin-data'; +import type { AbstractSqlConnection } from '@mikro-orm/sql'; import type { Kysely } from 'kysely'; @@ -281,7 +282,7 @@ export async function moveSqliteToPostgres(options: MoveOptions): Promise(); + const db = (options.orm.em.getConnection() as AbstractSqlConnection).getClient(); let source: SqliteSource; try { source = SqliteSource.open(options.sqliteFile); diff --git a/server/src/db/repositories/_shared/reservation-visibility.ts b/server/src/db/repositories/_shared/reservation-visibility.ts index 0e4c4652e..3bcf5e654 100644 --- a/server/src/db/repositories/_shared/reservation-visibility.ts +++ b/server/src/db/repositories/_shared/reservation-visibility.ts @@ -1,6 +1,6 @@ import { coalesceParam } from '../../dialect/sql-functions'; -import { accommodationIdMatches } from './reservation-accommodation'; import type { DB } from '../../kysely/db'; +import { accommodationIdMatches } from './reservation-accommodation'; import type { Platform } from '@mikro-orm/core'; import type { ExpressionBuilder, ExpressionWrapper, ReferenceExpression, SqlBool } from 'kysely'; diff --git a/server/tests/unit/db/engine/postgres/null-order.test.ts b/server/tests/unit/db/engine/postgres/null-order.test.ts index c550b5600..e0d3c2bf5 100644 --- a/server/tests/unit/db/engine/postgres/null-order.test.ts +++ b/server/tests/unit/db/engine/postgres/null-order.test.ts @@ -69,7 +69,9 @@ describe('SQLite NULL order on Postgres', () => { expect(withSqliteNullPosition('"t"."start_date" desc nulls first')).toBe('"t"."start_date" desc nulls first'); const platform = new SqliteNullOrderPlatform(); expect(platform.getOrderByExpression('"name"', 'ASC')).toEqual(['"name" asc nulls first']); - expect(platform.getOrderByExpression('"name"', 'desc', 'nocase')).toEqual(['"name" collate "nocase" desc nulls last']); + expect(platform.getOrderByExpression('"name"', 'desc', 'nocase')).toEqual([ + '"name" collate "nocase" desc nulls last', + ]); expect(platform.getOrderByExpression('"name"', 'asc nulls last')).toEqual(['"name" asc nulls last']); }); });