X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fdatabase.ts;h=14dd8c3790ae5db788f9e004e41699d99b2e61d3;hb=0c9668f77901e7540e2c7045eb0f2974a4842a69;hp=09786a91f7e6a64af63475268e3dcbbf072bc2a6;hpb=a2fb5fb8b1007e3ce82e707917f5d9a37374e99b;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/initializers/database.ts b/server/initializers/database.ts index 09786a91f..14dd8c379 100644 --- a/server/initializers/database.ts +++ b/server/initializers/database.ts @@ -1,16 +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 { 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 { 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' @@ -49,7 +56,6 @@ import { VideoStreamingPlaylistModel } from '../models/video/video-streaming-pla import { VideoTagModel } from '../models/video/video-tag' import { VideoViewModel } from '../models/view/video-view' import { CONFIG } from './config' -import { VideoSourceModel } from '@server/models/video/video-source' require('pg').defaults.parseInt8 = true // Avoid BIGINT to be converted to string @@ -81,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' } @@ -139,6 +145,7 @@ async function initDatabaseModels (silent: boolean) { UserVideoHistoryModel, VideoLiveModel, VideoLiveSessionModel, + VideoLiveReplaySettingModel, AccountBlocklistModel, ServerBlocklistModel, UserNotificationModel, @@ -153,7 +160,12 @@ async function initDatabaseModels (silent: boolean) { VideoTrackerModel, PluginModel, ActorCustomPageModel, - VideoJobInfoModel + VideoJobInfoModel, + VideoChannelSyncModel, + UserRegistrationModel, + RunnerRegistrationTokenModel, + RunnerModel, + RunnerJobModel ]) // Check extensions exist in the database