mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-20 11:06:06 +00:00
fix(db): type the integer flag and the owner literal for the server's compiler
The server compiles without strictNullChecks, where a narrowed value returned as is keeps its full type, and two literal arms of one UNION column must share a type.
This commit is contained in:
@@ -800,12 +800,12 @@ export class TripsRepository extends TrekRepository<Trips> {
|
||||
const owner = this.kysely<TravellerUsernameKyselyDB>()
|
||||
.selectFrom('trips as t')
|
||||
.innerJoin('users as u', 'u.id', 't.user_id')
|
||||
.select((eb) => ['u.username as username', eb.lit(1).as('is_owner')])
|
||||
.select((eb) => ['u.username as username', eb.lit(1).$castTo<number>().as('is_owner')])
|
||||
.where('t.id', '=', trip_id);
|
||||
const member = this.kysely<TravellerUsernameKyselyDB>()
|
||||
.selectFrom('trip_members as m')
|
||||
.innerJoin('users as u', 'u.id', 'm.user_id')
|
||||
.select((eb) => ['u.username as username', eb.lit(0).as('is_owner')])
|
||||
.select((eb) => ['u.username as username', eb.lit(0).$castTo<number>().as('is_owner')])
|
||||
.where('m.trip_id', '=', trip_id);
|
||||
const rows = await owner.unionAll(member).orderBy('is_owner', 'desc').execute();
|
||||
return rows as TravellerUsernameRow[];
|
||||
|
||||
@@ -18,13 +18,17 @@ type FlagColumn = number | null | undefined;
|
||||
*/
|
||||
export class IntegerFlagType extends Type<FlagValue, FlagColumn> {
|
||||
override convertToDatabaseValue(value: FlagValue): FlagColumn {
|
||||
if (value === null || value === undefined) return value;
|
||||
// Spelled out: the server compiles without strictNullChecks, where returning the narrowed `value` keeps its full type.
|
||||
if (value === null) return null;
|
||||
if (value === undefined) return undefined;
|
||||
return value ? 1 : 0;
|
||||
}
|
||||
|
||||
/** 0/1 from either driver (Postgres's `bigint` reads as a number); a boolean from a value set in JS passes through. */
|
||||
override convertToJSValue(value: FlagColumn | boolean): FlagValue {
|
||||
if (value === null || value === undefined) return value;
|
||||
// Spelled out: the server compiles without strictNullChecks, where returning the narrowed `value` keeps its full type.
|
||||
if (value === null) return null;
|
||||
if (value === undefined) return undefined;
|
||||
return Boolean(Number(value));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user