-import { join } from 'path'
-import { flattenDepth } from 'lodash'
-require('pg').defaults.parseInt8 = true // Avoid BIGINT to be converted to string
-import * as Sequelize from 'sequelize'
+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, readdirPromise } from '../helpers/core-utils'
-import { VideoModel } from './../models/video/video-interface'
-import { VideoTagModel } from './../models/video/video-tag-interface'
-import { BlacklistedVideoModel } from './../models/video/video-blacklist-interface'
-import { VideoFileModel } from './../models/video/video-file-interface'
-import { VideoAbuseModel } from './../models/video/video-abuse-interface'
-import { VideoChannelModel } from './../models/video/video-channel-interface'
-import { UserModel } from '../models/account/user-interface'
-import { AccountVideoRateModel } from '../models/account/account-video-rate-interface'
-import { AccountFollowModel } from '../models/account/account-follow-interface'
-import { TagModel } from './../models/video/tag-interface'
-import { ServerModel } from '../models/server/server-interface'
-import { OAuthTokenModel } from './../models/oauth/oauth-token-interface'
-import { OAuthClientModel } from './../models/oauth/oauth-client-interface'
-import { JobModel } from './../models/job/job-interface'
-import { AccountModel } from './../models/account/account-interface'
-import { ApplicationModel } from './../models/application/application-interface'
+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: boolean) => Promise<void>,
-
- Application?: ApplicationModel,
- Account?: AccountModel,
- Job?: JobModel,
- OAuthClient?: OAuthClientModel,
- OAuthToken?: OAuthTokenModel,
- Server?: ServerModel,
- Tag?: TagModel,
- AccountVideoRate?: AccountVideoRateModel,
- AccountFollow?: AccountFollowModel,
- User?: UserModel,
- VideoAbuse?: VideoAbuseModel,
- VideoChannel?: VideoChannelModel,
- VideoFile?: VideoFileModel,
- 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: Sequelize.Transaction.ISOLATION_LEVELS.SERIALIZABLE,
+ isolationLevel: SequelizeTypescript.Transaction.ISOLATION_LEVELS.SERIALIZABLE,
operatorsAliases: false,
-
logging: (message: string, benchmark: number) => {
+ if (process.env.NODE_DB_LOG === 'false') return
+
let newMessage = message
if (isTestInstance() === true && benchmark !== undefined) {
newMessage += ' | ' + benchmark + 'ms'
}
})
-database.sequelize = sequelize
-
-database.init = async (silent: boolean) => {
- const modelDirectory = join(__dirname, '..', 'models')
-
- const filePaths = await getModelFiles(modelDirectory)
-
- for (const filePath of filePaths) {
- try {
- const model = sequelize.import(filePath)
-
- database[model['name']] = model
- } catch (err) {
- logger.error('Cannot import database model %s.', filePath, err)
- process.exit(0)
- }
- }
-
- for (const modelName of Object.keys(database)) {
- if ('associate' in database[modelName]) {
- database[modelName].associate(database)
- }
- }
+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)
// ---------------------------------------------------------------------------
export {
- database
-}
-
-// ---------------------------------------------------------------------------
-
-async function getModelFiles (modelDirectory: string) {
- const files = await readdirPromise(modelDirectory)
- const directories = files.filter(directory => {
- // Find directories
- if (
- directory.endsWith('.js.map') ||
- directory === 'index.js' || directory === 'index.ts' ||
- directory === 'utils.js' || directory === 'utils.ts'
- ) return false
-
- return true
- })
-
- const tasks: Promise<any>[] = []
-
- // For each directory we read it and append model in the modelFilePaths array
- for (const directory of directories) {
- const modelDirectoryPath = join(modelDirectory, directory)
-
- const promise = readdirPromise(modelDirectoryPath)
- .then(files => {
- 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 => join(modelDirectoryPath, file))
-
- return filteredFiles
- })
-
- tasks.push(promise)
- }
-
- const filteredFilesArray: string[][] = await Promise.all(tasks)
- return flattenDepth<string>(filteredFilesArray, 1)
+ initDatabaseModels,
+ sequelizeTypescript
}
projects / github / Chocobozzz / PeerTube.git / blobdiff