Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions server/datasource.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { IssueCommentSubscriber } from '@server/subscriber/IssueCommentSubscribe
import { IssueSubscriber } from '@server/subscriber/IssueSubscriber';
import { MediaRequestSubscriber } from '@server/subscriber/MediaRequestSubscriber';
import { MediaSubscriber } from '@server/subscriber/MediaSubscriber';
import { isPgsql } from '@server/utils/dbType';
import fs from 'fs';
import type { TlsOptions } from 'tls';
import type { DataSourceOptions, EntityTarget, Repository } from 'typeorm';
Expand Down Expand Up @@ -170,8 +171,6 @@ const postgresProdConfig: DataSourceOptions = {
subscribers,
};

export const isPgsql = process.env.DB_TYPE === 'postgres';

function getDataSource(): DataSourceOptions {
if (process.env.NODE_ENV === 'test') {
return testConfig;
Expand Down
3 changes: 2 additions & 1 deletion server/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import csurf from '@dr.pogodin/csurf';
import PlexAPI from '@server/api/plexapi';
import dataSource, { getRepository, isPgsql } from '@server/datasource';
import dataSource, { getRepository } from '@server/datasource';
import DiscoverSlider from '@server/entity/DiscoverSlider';
import { Session } from '@server/entity/Session';
import { User } from '@server/entity/User';
Expand Down Expand Up @@ -29,6 +29,7 @@ import { getAppVersion } from '@server/utils/appVersion';
import createCustomProxyAgent, {
setForceIpv4First,
} from '@server/utils/customProxyAgent';
import { isPgsql } from '@server/utils/dbType';
import { initializeDnsCache } from '@server/utils/dnsCache';
import restartFlag from '@server/utils/restartFlag';
import '@server/utils/userAgent';
Expand Down
2 changes: 1 addition & 1 deletion server/utils/DbColumnHelper.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { isPgsql } from '@server/datasource';
import { isPgsql } from '@server/utils/dbType';
import type { ColumnOptions, ColumnType } from 'typeorm';
import { Column } from 'typeorm';
const pgTypeMapping: { [key: string]: ColumnType } = {
Expand Down
2 changes: 2 additions & 0 deletions server/utils/dbType.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// Must stay import-free, entity decorators read this during datasource evaluation
export const isPgsql = process.env.DB_TYPE === 'postgres';
Loading