To ensure that configurtion can be pulled identically from config fil…

…es, the ENV, and

command-line arguments, the db module no longer relies on pulling config objects
with config-store (which only works for file-based config).

app/lib/db.js

@@ -3,6 +3,20 @@ const fs = require('fs');
 const streamsql = require('streamsql');
 const config = require('./config');
 
-module.exports = function getDB (key) {
-  return streamsql.connect(config(key));
+function getDbConfig (prefix) {
+  prefix += '_';
+  return {
+    driver:     config(prefix+'DRIVER', 'mysql'),
+    host:       config(prefix+'HOST', 'localhost'),
+    user:       config(prefix+'USER'),
+    password:   config(prefix+'PASSWORD'),
+    database:   config(prefix+'DATABASE')
+  }
+}
+
+function getDb (prefix) {
+  return streamsql.connect(getDbConfig(prefix));
 };
+
+module.exports.getDb = getDb;
+module.exports.getDbConfig = getDbConfig;

app/models/badge.js

@@ -1,7 +1,7 @@
-var getDB = require('../lib/db');
+var getDb = require('../lib/db').getDb;
 
 module.exports = function getBadgeModel (key) {
-  var db = getDB(key);
+  var db = getDb(key);
   try {
     return db.table('badge');
   }

bin/db-migrate

@@ -9,7 +9,7 @@ var migrate = require('db-migrate');
 var log = require('db-migrate/lib/log');
 var mysql = require('mysql');
 var migrations = require('../lib/migrations');
-var config = require('../app/lib/config');
+var db = require('../app/lib/db');
 
 process.on('uncaughtException', function(err) {
   log.error(err.stack);
@@ -76,7 +76,7 @@ function run() {
       break;
     case 'up':
     case 'down':
-      argv.config = config('DATABASE');
+      argv.config = db.getDbConfig('DATABASE');
       if(verbose) {
         log.info("Using settings:", argv.config);
       }

test/index.js

@@ -1,8 +1,9 @@
 var async = require('async');
 var migrations = require('../lib/migrations');
 var config = require('../app/lib/config');
-var connection = require('../app/lib/db')("TEST_DATABASE");
-const DB_CONFIG = config("TEST_DATABASE");
+var db = require('../app/lib/db');
+var connection = db.getDb("TEST_DATABASE");
+const DB_CONFIG = db.getDbConfig("TEST_DATABASE");
 
 exports.up = function up(options) {
   options = options || {};