moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some DB startup issues for new installs

This commit is contained in:
Bryan Ashby 2017-02-12 19:49:56 -07:00
parent 5ab47232fc
commit e95aba0582
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/database.js
View File

@ -54,16 +54,16 @@ function getISOTimestampString(ts) {
} }
function initializeDatabases(cb) { function initializeDatabases(cb) {
async.each( [ 'system', 'user', 'message', 'file' ], (dbName, next) => { async.eachSeries( [ 'system', 'user', 'message', 'file' ], (dbName, next) => {
dbs[dbName] = new sqlite3.Database(getDatabasePath(dbName), err => { dbs[dbName] = new sqlite3.Database(getDatabasePath(dbName), err => {
if(err) { if(err) {
return cb(err); return cb(err);
} }
dbs[dbName].serialize( () => { dbs[dbName].serialize( () => {
DB_INIT_TABLE[dbName](); DB_INIT_TABLE[dbName]( () => {
return next(null);
return next(null); });
}); });
}); });
}, err => { }, err => {
@ -72,7 +72,7 @@ function initializeDatabases(cb) {
} }
const DB_INIT_TABLE = { const DB_INIT_TABLE = {
system : () => { system : (cb) => {
dbs.system.run('PRAGMA foreign_keys = ON;'); dbs.system.run('PRAGMA foreign_keys = ON;');
// Various stat/event logging - see stat_log.js // Various stat/event logging - see stat_log.js
@ -105,9 +105,11 @@ const DB_INIT_TABLE = {
UNIQUE(timestamp, user_id, log_name) UNIQUE(timestamp, user_id, log_name)
);` );`
); );
return cb(null);
}, },
user : () => { user : (cb) => {
dbs.user.run('PRAGMA foreign_keys = ON;'); dbs.user.run('PRAGMA foreign_keys = ON;');
dbs.user.run( dbs.user.run(
@ -145,9 +147,11 @@ const DB_INIT_TABLE = {
timestamp DATETIME NOT NULL timestamp DATETIME NOT NULL
);` );`
); );
return cb(null);
}, },
message : () => { message : (cb) => {
dbs.message.run('PRAGMA foreign_keys = ON;'); dbs.message.run('PRAGMA foreign_keys = ON;');
dbs.message.run( dbs.message.run(
@ -251,9 +255,11 @@ const DB_INIT_TABLE = {
UNIQUE(scan_toss, area_tag) UNIQUE(scan_toss, area_tag)
);` );`
); );
return cb(null);
}, },
file : () => { file : (cb) => {
dbs.file.run('PRAGMA foreign_keys = ON;'); dbs.file.run('PRAGMA foreign_keys = ON;');
dbs.file.run( dbs.file.run(
@ -352,5 +358,7 @@ const DB_INIT_TABLE = {
expire_timestamp DATETIME NOT NULL expire_timestamp DATETIME NOT NULL
);` );`
); );
return cb(null);
} }
}; };