X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fdatabase.ts;h=852db68a019407352135f2024ec129e62347d22d;hb=0b4204f9832d2616e87959b6b547958b5c8677fb;hp=705dec6da402300c68ad30fab14c3f632a728718;hpb=0c2388548a7432d1a22fbdeb142114383cb5c7e5;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/initializers/database.ts b/server/initializers/database.ts
index 705dec6da..852db68a0 100644
--- a/server/initializers/database.ts
+++ b/server/initializers/database.ts
@@ -1,68 +1,52 @@
-import * as fs from 'fs'
-import { join } from 'path'
-import * as Sequelize from 'sequelize'
-import { each } from 'async'
+import { Sequelize as SequelizeTypescript } from 'sequelize-typescript'
+import { isTestInstance } from '../helpers/core-utils'
+import { logger } from '../helpers/logger'
 
+import { AccountModel } from '../models/account/account'
+import { AccountVideoRateModel } from '../models/account/account-video-rate'
+import { UserModel } from '../models/account/user'
+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'
+import { TagModel } from '../models/video/tag'
+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'
-// Do not use barrel, we need to load database first
-import { logger } from '../helpers/logger'
-import { isTestInstance } from '../helpers/core-utils'
-import {
-  ApplicationModel,
-  AuthorModel,
-  JobModel,
-  OAuthClientModel,
-  OAuthTokenModel,
-  PodModel,
-  RequestModel,
-  RequestToPodModel,
-  RequestVideoEventModel,
-  RequestVideoQaduModel,
-  TagModel,
-  UserModel,
-  UserVideoRateModel,
-  VideoAbuseModel,
-  BlacklistedVideoModel,
-  VideoTagModel,
-  VideoModel
-} from '../models'
+
+require('pg').defaults.parseInt8 = true // Avoid BIGINT to be converted to string
 
 const dbname = CONFIG.DATABASE.DBNAME
 const username = CONFIG.DATABASE.USERNAME
 const password = CONFIG.DATABASE.PASSWORD
+const host = CONFIG.DATABASE.HOSTNAME
+const port = CONFIG.DATABASE.PORT
 
-const database: {
-  sequelize?: Sequelize.Sequelize,
-  init?: (silent: any, callback: any) => void,
-
-  Application?: ApplicationModel,
-  Author?: AuthorModel,
-  Job?: JobModel,
-  OAuthClient?: OAuthClientModel,
-  OAuthToken?: OAuthTokenModel,
-  Pod?: PodModel,
-  RequestToPod?: RequestToPodModel,
-  RequestVideoEvent?: RequestVideoEventModel,
-  RequestVideoQadu?: RequestVideoQaduModel,
-  Request?: RequestModel,
-  Tag?: TagModel,
-  UserVideoRate?: UserVideoRateModel,
-  User?: UserModel,
-  VideoAbuse?: VideoAbuseModel,
-  BlacklistedVideo?: BlacklistedVideoModel,
-  VideoTag?: VideoTagModel,
-  Video?: VideoModel
-} = {}
-
-const sequelize = new Sequelize(dbname, username, password, {
+const sequelizeTypescript = new SequelizeTypescript({
+  database: dbname,
   dialect: 'postgres',
-  host: CONFIG.DATABASE.HOSTNAME,
-  port: CONFIG.DATABASE.PORT,
+  host,
+  port,
+  username,
+  password,
   benchmark: isTestInstance(),
+  isolationLevel: SequelizeTypescript.Transaction.ISOLATION_LEVELS.SERIALIZABLE,
+  operatorsAliases: false,
+  logging: (message: string, benchmark: number) => {
+    if (process.env.NODE_DB_LOG === 'false') return
 
-  logging: function (message: string, benchmark: number) {
     let newMessage = message
-    if (benchmark !== undefined) {
+    if (isTestInstance() === true && benchmark !== undefined) {
       newMessage += ' | ' + benchmark + 'ms'
     }
 
@@ -70,83 +54,38 @@ const sequelize = new Sequelize(dbname, username, password, {
   }
 })
 
-database.sequelize = sequelize
-
-database.init = function (silent: boolean, callback: (err: Error) => void) {
-  const modelDirectory = join(__dirname, '..', 'models')
-
-  getModelFiles(modelDirectory, function (err, filePaths) {
-    if (err) throw err
-
-    filePaths.forEach(function (filePath) {
-      const model = sequelize.import(filePath)
-
-      database[model['name']] = model
-    })
-
-    Object.keys(database).forEach(function (modelName) {
-      if ('associate' in database[modelName]) {
-        database[modelName].associate(database)
-      }
-    })
-
-    if (!silent) logger.info('Database %s is ready.', dbname)
-
-    return callback(null)
-  })
+async function initDatabaseModels (silent: boolean) {
+  sequelizeTypescript.addModels([
+    ApplicationModel,
+    ActorModel,
+    ActorFollowModel,
+    AvatarModel,
+    AccountModel,
+    JobModel,
+    OAuthClientModel,
+    OAuthTokenModel,
+    ServerModel,
+    TagModel,
+    AccountVideoRateModel,
+    UserModel,
+    VideoAbuseModel,
+    VideoChannelModel,
+    VideoShareModel,
+    VideoFileModel,
+    VideoBlacklistModel,
+    VideoTagModel,
+    VideoModel,
+    VideoCommentModel
+  ])
+
+  if (!silent) logger.info('Database %s is ready.', dbname)
+
+  return
 }
 
 // ---------------------------------------------------------------------------
 
 export {
-  database
-}
-
-// ---------------------------------------------------------------------------
-
-function getModelFiles (modelDirectory: string, callback: (err: Error, filePaths: string[]) => void) {
-  fs.readdir(modelDirectory, function (err, files) {
-    if (err) throw err
-
-    const directories = files.filter(function (directory) {
-      // Find directories
-      if (
-        directory.endsWith('.js.map') ||
-        directory === 'index.js' || directory === 'index.ts' ||
-        directory === 'utils.js' || directory === 'utils.ts'
-      ) return false
-
-      return true
-    })
-
-    let modelFilePaths: string[] = []
-
-    // For each directory we read it and append model in the modelFilePaths array
-    each(directories, function (directory: string, eachCallback: ErrorCallback<Error>) {
-      const modelDirectoryPath = join(modelDirectory, directory)
-
-      fs.readdir(modelDirectoryPath, function (err, files) {
-        if (err) return eachCallback(err)
-
-        const filteredFiles = files.filter(file => {
-          if (
-            file === 'index.js' || file === 'index.ts' ||
-            file === 'utils.js' || file === 'utils.ts' ||
-            file.endsWith('-interface.js') || file.endsWith('-interface.ts') ||
-            file.endsWith('.js.map')
-          ) return false
-
-          return true
-        }).map(file => {
-          return join(modelDirectoryPath, file)
-        })
-
-        modelFilePaths = modelFilePaths.concat(filteredFiles)
-
-        return eachCallback(null)
-      })
-    }, function (err: Error) {
-      return callback(err, modelFilePaths)
-    })
-  })
+  initDatabaseModels,
+  sequelizeTypescript
 }