Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-07 14:35:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

install db dependencies in upgrade script

Browse Source
This commit is contained in:
barisusakli
2014-07-23 13:30:12 -04:00
parent d565de60d0
commit 5c57ed5ea0
2 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/install.js
View File

@@ -206,6 +206,16 @@ function completeConfigSetup(err, config, next) {
} }
function setupDatabase(server_conf, next) { function setupDatabase(server_conf, next) {
install.installDbDependencies(server_conf, function(err) {
if (err) {
return next(err);
}
require('./database').init(next);
});
}
install.installDbDependencies = function(server_conf, next) {
var npm = require('npm'), var npm = require('npm'),
packages = []; packages = [];
@@ -221,15 +231,9 @@ function setupDatabase(server_conf, next) {
packages = packages.concat(DATABASES[server_conf.secondary_database].dependencies); packages = packages.concat(DATABASES[server_conf.secondary_database].dependencies);
} }
npm.commands.install(packages, function(err) { npm.commands.install(packages, next);
if (err) {
return next(err);
}
require('./database').init(next);
}); });
}); };
}
function setupDefaultConfigs(next) { function setupDefaultConfigs(next) {
winston.info('Populating database with default configs, if not already set...'); winston.info('Populating database with default configs, if not already set...');

22
src/upgrade.js
View File

@@ -19,7 +19,7 @@ var db = require('./database'),
schemaDate, thisSchemaDate, schemaDate, thisSchemaDate,
// IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema // IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema
latestSchema = Date.UTC(2014, 5, 17); latestSchema = Date.UTC(2014, 6, 23);
Upgrade.check = function(callback) { Upgrade.check = function(callback) {
db.get('schemaDate', function(err, value) { db.get('schemaDate', function(err, value) {
@@ -861,6 +861,26 @@ Upgrade.upgrade = function(callback) {
winston.info('[2014/6/17] Category post count upgrade - skipped'); winston.info('[2014/6/17] Category post count upgrade - skipped');
next(); next();
} }
},
function(next) {
thisSchemaDate = Date.UTC(2014, 6, 23);
if (schemaDate < thisSchemaDate) {
winston.info('[2014/7/23] Upgrading db dependencies...');
var install = require('./install');
var config = require('../config.json');
install.installDbDependencies(config, function(err) {
if (err) {
winston.error('[2014/7/23] Error encountered while upgrading db dependencies');
return next(err);
}
winston.error('[2014/7/23] Upgraded db dependencies');
Upgrade.update(thisSchemaDate, next);
});
} else {
winston.info('[2014/7/23] Upgrading db dependencies - skipped');
next();
}
} }
// Add new schema updates here // Add new schema updates here
// IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema IN LINE 22!!! // IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema IN LINE 22!!!