aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/initializers/database.js
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2016-12-25 09:44:57 +0100
committerChocobozzz <florian.bigard@gmail.com>2016-12-25 09:44:57 +0100
commitb769007f733769d3afe2d29a3eb23e2e7693f301 (patch)
tree3816d542e907f298d08338129e0f6b9ca0df8fbb /server/initializers/database.js
parentdd6019932efd6ae3b790bf024bc0cd74162e4517 (diff)
downloadPeerTube-b769007f733769d3afe2d29a3eb23e2e7693f301.tar.gz
PeerTube-b769007f733769d3afe2d29a3eb23e2e7693f301.tar.zst
PeerTube-b769007f733769d3afe2d29a3eb23e2e7693f301.zip
Update migrations code
Diffstat (limited to 'server/initializers/database.js')
-rw-r--r--server/initializers/database.js65
1 files changed, 42 insertions, 23 deletions
diff --git a/server/initializers/database.js b/server/initializers/database.js
index 9642231b9..f8f68adeb 100644
--- a/server/initializers/database.js
+++ b/server/initializers/database.js
@@ -10,7 +10,11 @@ const utils = require('../helpers/utils')
10 10
11const database = {} 11const database = {}
12 12
13const sequelize = new Sequelize(constants.CONFIG.DATABASE.DBNAME, 'peertube', 'peertube', { 13const dbname = constants.CONFIG.DATABASE.DBNAME
14const username = constants.CONFIG.DATABASE.USERNAME
15const password = constants.CONFIG.DATABASE.PASSWORD
16
17const sequelize = new Sequelize(dbname, username, password, {
14 dialect: 'postgres', 18 dialect: 'postgres',
15 host: constants.CONFIG.DATABASE.HOSTNAME, 19 host: constants.CONFIG.DATABASE.HOSTNAME,
16 port: constants.CONFIG.DATABASE.PORT, 20 port: constants.CONFIG.DATABASE.PORT,
@@ -26,33 +30,48 @@ const sequelize = new Sequelize(constants.CONFIG.DATABASE.DBNAME, 'peertube', 'p
26 } 30 }
27}) 31})
28 32
29const modelDirectory = path.join(__dirname, '..', 'models') 33database.sequelize = sequelize
30fs.readdir(modelDirectory, function (err, files) { 34database.Sequelize = Sequelize
31 if (err) throw err 35database.init = init
32 36
33 files.filter(function (file) { 37// ---------------------------------------------------------------------------
34 if (file === 'utils.js') return false
35 38
36 return true 39module.exports = database
37 })
38 .forEach(function (file) {
39 const model = sequelize.import(path.join(modelDirectory, file))
40 40
41 database[model.name] = model 41// ---------------------------------------------------------------------------
42 })
43 42
44 Object.keys(database).forEach(function (modelName) { 43function init (silent, callback) {
45 if ('associate' in database[modelName]) { 44 if (!callback) {
46 database[modelName].associate(database) 45 callback = silent
47 } 46 silent = false
48 }) 47 }
49 48
50 logger.info('Database is ready.') 49 if (!callback) callback = function () {}
51})
52 50
53database.sequelize = sequelize 51 const modelDirectory = path.join(__dirname, '..', 'models')
54database.Sequelize = Sequelize 52 fs.readdir(modelDirectory, function (err, files) {
53 if (err) throw err
55 54
56// --------------------------------------------------------------------------- 55 files.filter(function (file) {
56 // For all models but not utils.js
57 if (file === 'utils.js') return false
57 58
58module.exports = database 59 return true
60 })
61 .forEach(function (file) {
62 const model = sequelize.import(path.join(modelDirectory, file))
63
64 database[model.name] = model
65 })
66
67 Object.keys(database).forEach(function (modelName) {
68 if ('associate' in database[modelName]) {
69 database[modelName].associate(database)
70 }
71 })
72
73 if (!silent) logger.info('Database is ready.')
74
75 return callback(null)
76 })
77}