Wrap errors from SQLLite in the new connection error objects. Update the Connect…

…ionError constructor so that it can handle a falsey error object being sent as a parameter. Update the configuration tests to support SQLite and it's custom messages as well as the lack of authentication.

lib/dialects/sqlite/connection-manager.js

@@ -2,7 +2,8 @@
 var AbstractConnectionManager = require('../abstract/connection-manager')
 var AbstractConnectionManager = require('../abstract/connection-manager')
   , ConnectionManager
   , ConnectionManager
   , Utils = require('../../utils')
   , Utils = require('../../utils')
-  , Promise = require('../../promise');
+  , Promise = require('../../promise')
+  , sequelizeErrors = require('../../errors');
 
 
 ConnectionManager = function(dialect, sequelize) {
 ConnectionManager = function(dialect, sequelize) {
   this.sequelize = sequelize;
   this.sequelize = sequelize;
@@ -29,8 +30,9 @@ ConnectionManager.prototype.getConnection = function(options) {
   return new Promise(function (resolve, reject) {
   return new Promise(function (resolve, reject) {
     self.connections[options.uuid] = new self.lib.Database(self.sequelize.options.storage || ':memory:', function(err) {
     self.connections[options.uuid] = new self.lib.Database(self.sequelize.options.storage || ':memory:', function(err) {
       if (err) {
       if (err) {
-        if (err.code === 'SQLITE_CANTOPEN') return reject('Failed to find SQL server. Please double check your settings.');
-        return reject(err);
+        console.log(err);
+        if (err.code === 'SQLITE_CANTOPEN') return reject(new sequelizeErrors.ConnectionError(err));
+        return reject(new sequelizeErrors.ConnectionError(err));
       }
       }
       resolve(self.connections[options.uuid]);
       resolve(self.connections[options.uuid]);
     });
     });

lib/errors.js

@@ -191,7 +191,7 @@ error.ValidationErrorItem = function(message, type, path, value) {
  * @constructor
  * @constructor
  */
  */
 error.ConnectionError = function (parent) {
 error.ConnectionError = function (parent) {
-  error.BaseError.apply(this, [parent.message]);
+  error.BaseError.apply(this, [parent ? parent.message : '']);
   this.name = 'SequelizeConnectionError';
   this.name = 'SequelizeConnectionError';
 
 
   this.parent = parent;
   this.parent = parent;

test/configuration.test.js

@@ -11,12 +11,22 @@ describe(Support.getTestDialectTeaser("Configuration"), function() {
   describe('Connections problems should fail with a nice message', function() {
   describe('Connections problems should fail with a nice message', function() {
     it("when we don't have the correct server details", function(done) {
     it("when we don't have the correct server details", function(done) {
       var seq = new Sequelize(config[dialect].database, config[dialect].username, config[dialect].password, {storage: '/path/to/no/where/land', logging: false, host: '0.0.0.1', port: config[dialect].port, dialect: dialect})
       var seq = new Sequelize(config[dialect].database, config[dialect].username, config[dialect].password, {storage: '/path/to/no/where/land', logging: false, host: '0.0.0.1', port: config[dialect].port, dialect: dialect})
-      return expect(seq.query('select 1 as hello')).to.eventually.be.rejectedWith(seq.InvalidConnectionError, 'connect EINVAL')
+      if (dialect === 'sqlite') {
+        // SQLite doesn't have a breakdown of error codes, so we are unable to discern between the different types of errors.
+        return expect(seq.query('select 1 as hello')).to.eventually.be.rejectedWith(seq.ConnectionError, 'SQLITE_CANTOPEN: unable to open database file').notify(done)
+      } else {
+        return expect(seq.query('select 1 as hello')).to.eventually.be.rejectedWith(seq.InvalidConnectionError, 'connect EINVAL').notify(done)
+      }
     })
     })
 
 
     it('when we don\'t have the correct login information', function(done) {
     it('when we don\'t have the correct login information', function(done) {
       var seq = new Sequelize(config[dialect].database, config[dialect].username, 'fakepass123', {logging: false, host: config[dialect].host, port: 1, dialect: dialect})
       var seq = new Sequelize(config[dialect].database, config[dialect].username, 'fakepass123', {logging: false, host: config[dialect].host, port: 1, dialect: dialect})
-      return expect(seq.query('select 1 as hello')).to.eventually.be.rejectedWith(seq.ConnectionRefusedError, 'connect ECONNREFUSED')
+      if (dialect === 'sqlite') {
+        // SQLite doesn't require authentication and `select 1 as hello` is a valid query, so this should be fulfilled not rejected for it.
+        return expect(seq.query('select 1 as hello')).to.eventually.be.fulfilled.notify(done)
+      } else {
+        return expect(seq.query('select 1 as hello')).to.eventually.be.rejectedWith(seq.ConnectionRefusedError, 'connect ECONNREFUSED').notify(done)
+      }
     })
     })
 
 
     it('when we don\'t have a valid dialect.', function(done) {
     it('when we don\'t have a valid dialect.', function(done) {