public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

settings keys in DB converted to camel case

Browse source 
callback-based settings model replaced by async-based settings model
This commit is contained in:
Tomas Bures 2017-12-30 17:27:24 +01:00
parent 6c5c47ac2e
commit d8ee364a4b
22 changed files with 123 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

32
lib/dbcheck.js
View file

@ -10,7 +10,8 @@ let log = require('npmlog');
let fs = require('fs');
let pathlib = require('path');
let Handlebars = require('handlebars');
let meta = require('../meta.json');
const highestLegacySchemaVersion = 29;
let mysqlConfig = {
multipleStatements: true
@ -66,14 +67,27 @@ function getSchemaVersion(callback) {
if (err) {
return callback(err);
}
connection.query('SELECT `value` FROM `settings` WHERE `key`=?', ['db_schema_version'], (err, rows) => {
connection.release();
if (err) {
return callback(err);
}
let dbSchemaVersion = rows && rows[0] && Number(rows[0].value) || 0;
callback(null, dbSchemaVersion);
connection.query('SHOW TABLES LIKE "knex_migrations"', (err, rows) => {
if (rows) {
connection.release();
if (err) {
return callback(err);
}
callback(null, highestLegacySchemaVersion);
} else {
connection.query('SELECT `value` FROM `settings` WHERE `key`=?', ['db_schema_version'], (err, rows) => {
connection.release();
if (err) {
return callback(err);
}
let dbSchemaVersion = rows && rows[0] && Number(rows[0].value) || 0;
callback(null, dbSchemaVersion);
});
}
});
});
}
@ -142,7 +156,7 @@ function runUpdates(callback, runCount) {
return callback(err);
}
if (schemaVersion >= meta.schemaVersion) {
if (schemaVersion >= highestLegacySchemaVersion) {
// nothing to do here, already updated
return callback(null, false);
}