X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Finitializers%2Fdatabase.ts;h=91286241bd475ff3603ed59f4f54798708e61eaa;hb=9452d4fd3321148fb80b64a67bd9983fee6c208e;hp=0e690f6ae9fc5721971a00056b9790acb9660323;hpb=0305db28c98fd6cf43a3c50ba92c76215e99d512;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/initializers/database.ts b/server/initializers/database.ts index 0e690f6ae..91286241b 100644 --- a/server/initializers/database.ts +++ b/server/initializers/database.ts @@ -1,11 +1,17 @@ import { QueryTypes, Transaction } from 'sequelize' import { Sequelize as SequelizeTypescript } from 'sequelize-typescript' +import { ActorCustomPageModel } from '@server/models/account/actor-custom-page' 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 { UserVideoHistoryModel } from '@server/models/user/user-video-history' -import { isTestInstance } from '../helpers/core-utils' +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 { isTestOrDevInstance } from '../helpers/core-utils' import { logger } from '../helpers/logger' import { AbuseModel } from '../models/abuse/abuse' import { AbuseMessageModel } from '../models/abuse/abuse-message' @@ -42,10 +48,8 @@ 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' -import { ActorCustomPageModel } from '@server/models/account/actor-custom-page' -import { VideoJobInfoModel } from '@server/models/video/video-job-info' require('pg').defaults.parseInt8 = true // Avoid BIGINT to be converted to string @@ -77,13 +81,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' } @@ -123,6 +127,7 @@ async function initDatabaseModels (silent: boolean) { VideoChannelModel, VideoShareModel, VideoFileModel, + VideoSourceModel, VideoCaptionModel, VideoBlacklistModel, VideoTagModel, @@ -133,6 +138,7 @@ async function initDatabaseModels (silent: boolean) { VideoRedundancyModel, UserVideoHistoryModel, VideoLiveModel, + VideoLiveSessionModel, AccountBlocklistModel, ServerBlocklistModel, UserNotificationModel, @@ -140,6 +146,8 @@ async function initDatabaseModels (silent: boolean) { VideoStreamingPlaylistModel, VideoPlaylistModel, VideoPlaylistElementModel, + LocalVideoViewerModel, + LocalVideoViewerWatchSectionModel, ThumbnailModel, TrackerModel, VideoTrackerModel,