X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fdatabase.ts;h=14dd8c3790ae5db788f9e004e41699d99b2e61d3;hb=ce1b5ba78c35cfd4df123cab49aef1d14ca0f9b7;hp=75a13ec8b0a69268e1ea457a267a79f431b83fc8;hpb=5b1a6d45b5d6e50102e1c7c8c845401b76b11b4d;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/initializers/database.ts b/server/initializers/database.ts index 75a13ec8b..14dd8c379 100644 --- a/server/initializers/database.ts +++ b/server/initializers/database.ts @@ -1,11 +1,23 @@ import { QueryTypes, Transaction } from 'sequelize' import { Sequelize as SequelizeTypescript } from 'sequelize-typescript' +import { ActorCustomPageModel } from '@server/models/account/actor-custom-page' +import { RunnerModel } from '@server/models/runner/runner' +import { RunnerJobModel } from '@server/models/runner/runner-job' +import { RunnerRegistrationTokenModel } from '@server/models/runner/runner-registration-token' 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 { isTestInstance } from '../helpers/core-utils' +import { VideoChannelSyncModel } from '@server/models/video/video-channel-sync' +import { VideoJobInfoModel } from '@server/models/video/video-job-info' +import { VideoLiveReplaySettingModel } from '@server/models/video/video-live-replay-setting' +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 { isTestOrDevInstance } from '../helpers/core-utils' import { logger } from '../helpers/logger' import { AbuseModel } from '../models/abuse/abuse' import { AbuseMessageModel } from '../models/abuse/abuse-message' @@ -42,7 +54,7 @@ import { VideoPlaylistElementModel } from '../models/video/video-playlist-elemen import { VideoShareModel } from '../models/video/video-share' import { VideoStreamingPlaylistModel } from '../models/video/video-streaming-playlist' import { VideoTagModel } from '../models/video/video-tag' -import { VideoViewModel } from '../models/video/video-view' +import { VideoViewModel } from '../models/view/video-view' import { CONFIG } from './config' require('pg').defaults.parseInt8 = true // Avoid BIGINT to be converted to string @@ -75,13 +87,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' } @@ -121,6 +133,7 @@ async function initDatabaseModels (silent: boolean) { VideoChannelModel, VideoShareModel, VideoFileModel, + VideoSourceModel, VideoCaptionModel, VideoBlacklistModel, VideoTagModel, @@ -131,6 +144,8 @@ async function initDatabaseModels (silent: boolean) { VideoRedundancyModel, UserVideoHistoryModel, VideoLiveModel, + VideoLiveSessionModel, + VideoLiveReplaySettingModel, AccountBlocklistModel, ServerBlocklistModel, UserNotificationModel, @@ -138,10 +153,19 @@ async function initDatabaseModels (silent: boolean) { VideoStreamingPlaylistModel, VideoPlaylistModel, VideoPlaylistElementModel, + LocalVideoViewerModel, + LocalVideoViewerWatchSectionModel, ThumbnailModel, TrackerModel, VideoTrackerModel, - PluginModel + PluginModel, + ActorCustomPageModel, + VideoJobInfoModel, + VideoChannelSyncModel, + UserRegistrationModel, + RunnerRegistrationTokenModel, + RunnerModel, + RunnerJobModel ]) // Check extensions exist in the database