From 3b12c982427d831e4a4ced0222d7549e7ab495d0 Mon Sep 17 00:00:00 2001 From: dr-carrot Date: Sun, 18 Aug 2024 20:32:54 -0400 Subject: [PATCH] chore: revverted ts commit --- server/entity/Media.ts | 5 ++--- server/utils/DbColumnHelper.ts | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/entity/Media.ts b/server/entity/Media.ts index 3b25635e5..72bbc4303 100644 --- a/server/entity/Media.ts +++ b/server/entity/Media.ts @@ -9,7 +9,6 @@ import type { DownloadingItem } from '@server/lib/downloadtracker'; import downloadTracker from '@server/lib/downloadtracker'; import { getSettings } from '@server/lib/settings'; import logger from '@server/logger'; -import { DbAwareColumn } from '@server/utils/DbColumnHelper'; import { getHostname } from '@server/utils/getHostname'; import { AfterLoad, @@ -123,10 +122,10 @@ class Media { @UpdateDateColumn() public updatedAt: Date; - @DbAwareColumn({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' }) + @Column({ type: 'timestamp without time zone', default: () => 'now()' }) public lastSeasonChange: Date; - @DbAwareColumn({ type: 'datetime', nullable: true }) + @Column({ type: 'timestamp without time zone', default: () => 'now()' }) public mediaAddedAt: Date; @Column({ nullable: true, type: 'int' }) diff --git a/server/utils/DbColumnHelper.ts b/server/utils/DbColumnHelper.ts index 1c030b92d..14fe21e9a 100644 --- a/server/utils/DbColumnHelper.ts +++ b/server/utils/DbColumnHelper.ts @@ -1,8 +1,9 @@ import { isPgsql } from '@server/datasource'; import type { ColumnOptions, ColumnType } from 'typeorm'; import { Column } from 'typeorm'; +// TODO cleanup this file const pgTypeMapping: { [key: string]: ColumnType } = { - datetime: 'timestamp with time zone', + datetime: 'timestamp without time zone', }; export function resolveDbType(pgType: ColumnType): ColumnType {