Add way to set root password by environment.

[github/Chocobozzz/PeerTube.git] / server / initializers / database.ts

diff --git a/server/initializers/database.ts b/server/initializers/database.ts
index d1744d21ffba180a6b01afc7787b8ae5b35eeec4..142063a99a3c43b14a2be29fc55e9f3dea1e16e1 100644 (file)
--- a/server/initializers/database.ts
+++ b/server/initializers/database.ts
@@ -86,6 +86,7 @@ async function initDatabaseModels (silent: boolean) {
     AccountVideoRateModel,
     UserModel,
     VideoAbuseModel,
+    VideoModel,
     VideoChangeOwnershipModel,
     VideoChannelModel,
     VideoShareModel,
@@ -93,7 +94,6 @@ async function initDatabaseModels (silent: boolean) {
     VideoCaptionModel,
     VideoBlacklistModel,
     VideoTagModel,
-    VideoModel,
     VideoCommentModel,
     ScheduleVideoUpdateModel,
     VideoImportModel,
@@ -140,15 +140,15 @@ async function checkPostgresExtensions () {
 }
 
 async function checkPostgresExtension (extension: string) {
-  const query = `SELECT true AS enabled FROM pg_available_extensions WHERE name = '${extension}' AND installed_version IS NOT NULL;`
+  const query = `SELECT 1 FROM pg_available_extensions WHERE name = '${extension}' AND installed_version IS NOT NULL;`
   const options = {
     type: QueryTypes.SELECT as QueryTypes.SELECT,
     raw: true
   }
 
-  const res = await sequelizeTypescript.query<{ enabled: boolean }>(query, options)
+  const res = await sequelizeTypescript.query<object>(query, options)
 
-  if (!res || res.length === 0 || res[ 0 ][ 'enabled' ] !== true) {
+  if (!res || res.length === 0) {
     // Try to create the extension ourselves
     try {
       await sequelizeTypescript.query(`CREATE EXTENSION ${extension};`, { raw: true })