Add database.create

This basically splits out initialize and create database part.
server.js will call create database but not apptask.

src/database.js

@@ -6,6 +6,7 @@
 // dependancy between database and the *db.js files
 exports = module.exports = {
     initialize: initialize,
+    create: create,
     removePrivates: removePrivates,
     newTransaction: newTransaction,
     rollback: rollback,
@@ -22,29 +23,41 @@ var userdb = require('./userdb.js'),
     mkdirp = require('mkdirp'),
     path = require('path'),
     debug = require('debug')('box:database'),
-    DatabaseError = require('./databaseerror');
+    DatabaseError = require('./databaseerror'),
+    assert = require('assert');
 
 var connectionPool = [ ],
     databaseFileName = null;
 
-var NOOP_CALLBACK = function (error) { if (error) console.error(error); }
+var NOOP_CALLBACK = function (error) { if (error) console.error(error); assert(!error); }
 
 function initialize(config, callback) {
+    databaseFileName = config.configRoot + '/config.sqlite.db';
+
+    var db = new sqlite3.Database(databaseFileName);
+
+    userdb.init(db);
+    tokendb.init(db);
+    clientdb.init(db);
+    authcodedb.init(db);
+    appdb.init(db);
+
+    return callback(null);
+}
+
+function create(config, callback) {
     var schema = fs.readFileSync(path.join(__dirname, 'schema.sql')).toString('utf8');
 
     databaseFileName = config.configRoot + '/config.sqlite.db';
 
     var db = new sqlite3.Database(databaseFileName);
+
     debug('Database created at ' + databaseFileName);
 
     db.exec(schema, function (err) {
         if (err) return callback(err);
 
-        userdb.init(db);
-        tokendb.init(db);
         clientdb.init(db);
-        authcodedb.init(db);
-        appdb.init(db);
 
         // TODO this should happen somewhere else..no clue where - Johannes
         clientdb.del('cid-webadmin', function () {
@@ -64,13 +77,13 @@ function newTransaction() {
 }
 
 function rollback(conn, callback) {
-    conn.run('ROLLBACK', callback);
     connectionPool.push(conn);
+    conn.run('ROLLBACK', callback);
 }
 
 function commit(conn, callback) {
-    conn.run('COMMIT', callback);
     connectionPool.push(conn);
+    conn.run('COMMIT', callback);
 }
 
 function removePrivates(obj) {

src/server.js

@@ -274,6 +274,7 @@ Server.prototype._initialize2 = function (callback) {
     mkdirp.sync(config.appDataRoot);
 
     async.series([
+        database.create.bind(null, config),
         database.initialize.bind(null, config),
         function initializeRoutes(callback) {
             routes.volume.initialize(config);

src/test/database-test.js

@@ -34,9 +34,12 @@ describe('database', function () {
     before(function (done) {
         mkdirp.sync(CONFIG.configRoot);
 
-        database.initialize(CONFIG, function (error) {
+        database.create(CONFIG, function (error) {
             expect(error).to.be(null);
-            done();
+            database.initialize(CONFIG, function (error) {
+                expect(error).to.be(null);
+                done();
+            });
         });
     });
 

src/test/user-test.js

@@ -52,7 +52,10 @@ function setup(done) {
     mkdirp.sync(CONFIG.configRoot);
     mkdirp.sync(CONFIG.mountRoot);
 
-    database.initialize(CONFIG, done);
+    database.create(CONFIG, function (error) {
+        expect(error).to.be(null);
+        database.initialize(CONFIG, done);
+    });
 }
 
 function cleanup(done) {

src/test/volume-test.js

@@ -41,16 +41,18 @@ function setup(done) {
     mkdirp.sync(CONFIG.configRoot);
     mkdirp.sync(CONFIG.mountRoot);
 
-    database.initialize(CONFIG, function (error) {
-        if (error) return done(error);
+    database.create(CONFIG, function (error) {
+        database.initialize(CONFIG, function (error) {
+            if (error) return done(error);
 
-        User.create(USERNAME, PASSWORD, EMAIL, IS_ADMIN, function (error, result) {
-            expect(error).to.not.be.ok();
-            expect(result).to.be.ok();
+            User.create(USERNAME, PASSWORD, EMAIL, IS_ADMIN, function (error, result) {
+                expect(error).to.not.be.ok();
+                expect(result).to.be.ok();
 
-            USER = result;
+                USER = result;
 
-            done();
+                done();
+            });
         });
     });
 }