Merge pull request #27 from swarthy/connectionString

Support connection string in store config

Author: jaumard

lib/transformer.js

@@ -35,14 +35,28 @@ module.exports = {
     })
   },
 
+  /**
+   * Create Sequelize object based on config options
+   * @param  {Object} config Trails.js store
+   * @return {Sequelize}     Sequelize instance
+   */
+  createFromConfig (config) {
+    if (config.uri) {
+      return new Sequelize(config.uri, _.clone(config)) // Sequelize modify options object
+    }
+    else {
+      return new Sequelize(config.database, config.username, config.password, config)
+    }
+  },
+
   /**
    * Transform the Trails.js "stores" config into a Sequelize object
    */
   transformStores (app) {
     const stores = app.config.database.stores
     const sequelize = {}
     Object.keys(stores).forEach(key => {
-      sequelize[key] = new Sequelize(stores[key].database, stores[key].username, stores[key].password, stores[key])
+      sequelize[key] = this.createFromConfig(stores[key])
       sequelize[key].trailsApp = app
     })
 

test/app.js

@@ -193,6 +193,9 @@ module.exports = _.defaultsDeep({
           dialect: 'sqlite',
           storage: './test/test.sqlite',
           database: 'test'
+        },
+        uristore: {
+          uri: 'sqlite://testuser:password@testhost:1234/testdb'
         }
       },
       models: {

test/index.js

@@ -2,7 +2,8 @@
 
 const TrailsApp = require('trails')
 
-before(() => {
+before(function () {
+  this.timeout(5000)
   global.app = new TrailsApp(require('./app'))
   return global.app.start().catch(global.app.stop)
 })

test/lib/transformer.test.js

@@ -32,6 +32,18 @@ describe('lib.Transformer', () => {
       assert(connections.teststore)
       assert.equal(connections.storeoverride.options.dialect, 'sqlite')
     })
+    it('should transform uri properly', () => {
+      const connections = lib.Transformer.transformStores(global.app)
+      assert(connections.uristore)
+      assert.equal(connections.uristore.options.dialect, 'sqlite')
+      assert.equal(connections.uristore.options.host, 'testhost')
+      assert.equal(connections.uristore.config.host, 'testhost')
+      assert.equal(connections.uristore.config.database, 'testdb')
+      // test config for other dialects
+      assert.equal(connections.uristore.config.port, 1234)
+      assert.equal(connections.uristore.config.username, 'testuser')
+      assert.equal(connections.uristore.config.password, 'password')
+    })
   })
 
 })