X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Finitializers%2Fdatabase.ts;h=96145f4897e9c85fb55eca29770b6d84ce864d90;hb=b05551aa8f659dbca705ccfce4945fae34324f13;hp=7a7ba61f4bb448bc27efe7a77388829249646e0a;hpb=b211106695bb82f6c32e53306081b5262c3d109d;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/initializers/database.ts b/server/initializers/database.ts index 7a7ba61f4..96145f489 100644 --- a/server/initializers/database.ts +++ b/server/initializers/database.ts @@ -5,11 +5,15 @@ import { TrackerModel } from '@server/models/server/tracker' import { VideoTrackerModel } from '@server/models/server/video-tracker' import { UserModel } from '@server/models/user/user' import { UserNotificationModel } from '@server/models/user/user-notification' +import { UserRegistrationModel } from '@server/models/user/user-registration' import { UserVideoHistoryModel } from '@server/models/user/user-video-history' +import { VideoChannelSyncModel } from '@server/models/video/video-channel-sync' import { VideoJobInfoModel } from '@server/models/video/video-job-info' +import { VideoLiveSessionModel } from '@server/models/video/video-live-session' +import { VideoSourceModel } from '@server/models/video/video-source' import { LocalVideoViewerModel } from '@server/models/view/local-video-viewer' import { LocalVideoViewerWatchSectionModel } from '@server/models/view/local-video-viewer-watch-section' -import { isTestInstance } from '../helpers/core-utils' +import { isTestOrDevInstance } from '../helpers/core-utils' import { logger } from '../helpers/logger' import { AbuseModel } from '../models/abuse/abuse' import { AbuseMessageModel } from '../models/abuse/abuse-message' @@ -79,13 +83,13 @@ const sequelizeTypescript = new SequelizeTypescript({ pool: { max: poolMax }, - benchmark: isTestInstance(), + benchmark: isTestOrDevInstance(), isolationLevel: Transaction.ISOLATION_LEVELS.SERIALIZABLE, logging: (message: string, benchmark: number) => { if (process.env.NODE_DB_LOG === 'false') return let newMessage = 'Executed SQL request' - if (isTestInstance() === true && benchmark !== undefined) { + if (isTestOrDevInstance() === true && benchmark !== undefined) { newMessage += ' in ' + benchmark + 'ms' } @@ -125,6 +129,7 @@ async function initDatabaseModels (silent: boolean) { VideoChannelModel, VideoShareModel, VideoFileModel, + VideoSourceModel, VideoCaptionModel, VideoBlacklistModel, VideoTagModel, @@ -135,6 +140,7 @@ async function initDatabaseModels (silent: boolean) { VideoRedundancyModel, UserVideoHistoryModel, VideoLiveModel, + VideoLiveSessionModel, AccountBlocklistModel, ServerBlocklistModel, UserNotificationModel, @@ -149,7 +155,9 @@ async function initDatabaseModels (silent: boolean) { VideoTrackerModel, PluginModel, ActorCustomPageModel, - VideoJobInfoModel + VideoJobInfoModel, + VideoChannelSyncModel, + UserRegistrationModel ]) // Check extensions exist in the database