X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fdatabase.ts;h=78bc8101c772d769f361c2c601f022c1d46f0b0a;hb=6b6168606bc86430f6b7821c9d5f1c80d0425ebf;hp=0b3f695f744331e3e96866dea80fcf58c7e9b395;hpb=50d6de9c286abcb34ff4234d56d9cbb803db7665;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/initializers/database.ts b/server/initializers/database.ts index 0b3f695f7..78bc8101c 100644 --- a/server/initializers/database.ts +++ b/server/initializers/database.ts @@ -9,7 +9,6 @@ import { ActorModel } from '../models/activitypub/actor' import { ActorFollowModel } from '../models/activitypub/actor-follow' import { ApplicationModel } from '../models/application/application' import { AvatarModel } from '../models/avatar/avatar' -import { JobModel } from '../models/job/job' import { OAuthClientModel } from '../models/oauth/oauth-client' import { OAuthTokenModel } from '../models/oauth/oauth-token' import { ServerModel } from '../models/server/server' @@ -18,10 +17,15 @@ import { VideoModel } from '../models/video/video' import { VideoAbuseModel } from '../models/video/video-abuse' import { VideoBlacklistModel } from '../models/video/video-blacklist' import { VideoChannelModel } from '../models/video/video-channel' +import { VideoCommentModel } from '../models/video/video-comment' import { VideoFileModel } from '../models/video/video-file' import { VideoShareModel } from '../models/video/video-share' import { VideoTagModel } from '../models/video/video-tag' import { CONFIG } from './constants' +import { ScheduleVideoUpdateModel } from '../models/video/schedule-video-update' +import { VideoCaptionModel } from '../models/video/video-caption' +import { VideoImportModel } from '../models/video/video-import' +import { VideoViewModel } from '../models/video/video-views' require('pg').defaults.parseInt8 = true // Avoid BIGINT to be converted to string @@ -30,6 +34,7 @@ const username = CONFIG.DATABASE.USERNAME const password = CONFIG.DATABASE.PASSWORD const host = CONFIG.DATABASE.HOSTNAME const port = CONFIG.DATABASE.PORT +const poolMax = CONFIG.DATABASE.POOL.MAX const sequelizeTypescript = new SequelizeTypescript({ database: dbname, @@ -38,6 +43,9 @@ const sequelizeTypescript = new SequelizeTypescript({ port, username, password, + pool: { + max: poolMax + }, benchmark: isTestInstance(), isolationLevel: SequelizeTypescript.Transaction.ISOLATION_LEVELS.SERIALIZABLE, operatorsAliases: false, @@ -60,7 +68,6 @@ async function initDatabaseModels (silent: boolean) { ActorFollowModel, AvatarModel, AccountModel, - JobModel, OAuthClientModel, OAuthTokenModel, ServerModel, @@ -71,11 +78,22 @@ async function initDatabaseModels (silent: boolean) { VideoChannelModel, VideoShareModel, VideoFileModel, + VideoCaptionModel, VideoBlacklistModel, VideoTagModel, - VideoModel + VideoModel, + VideoCommentModel, + ScheduleVideoUpdateModel, + VideoImportModel, + VideoViewModel ]) + // Check extensions exist in the database + await checkPostgresExtensions() + + // Create custom PostgreSQL functions + await createFunctions() + if (!silent) logger.info('Database %s is ready.', dbname) return @@ -87,3 +105,39 @@ export { initDatabaseModels, sequelizeTypescript } + +// --------------------------------------------------------------------------- + +async function checkPostgresExtensions () { + const extensions = [ + 'pg_trgm', + 'unaccent' + ] + + for (const extension of extensions) { + const query = `SELECT true AS enabled FROM pg_available_extensions WHERE name = '${extension}' AND installed_version IS NOT NULL;` + const [ res ] = await sequelizeTypescript.query(query, { raw: true }) + + if (!res || res.length === 0 || res[ 0 ][ 'enabled' ] !== true) { + // Try to create the extension ourself + try { + await sequelizeTypescript.query(`CREATE EXTENSION ${extension};`, { raw: true }) + + } catch { + const errorMessage = `You need to enable ${extension} extension in PostgreSQL. ` + + `You can do so by running 'CREATE EXTENSION ${extension};' as a PostgreSQL super user in ${CONFIG.DATABASE.DBNAME} database.` + throw new Error(errorMessage) + } + } + } +} + +async function createFunctions () { + const query = `CREATE OR REPLACE FUNCTION immutable_unaccent(text) + RETURNS text AS +$func$ +SELECT public.unaccent('public.unaccent', $1::text) +$func$ LANGUAGE sql IMMUTABLE;` + + return sequelizeTypescript.query(query, { raw: true }) +}