Merge branch 'master' of https://github.com/sequelize/sequelize

wenyuxiang
Commit a578ff2e authored Sep 13, 2013 by wenyuxiang
Showing with 2 additions and 0 deletions
changelog.md
lib/dialects/sqlite/connector-manager.js
--- a/changelog.md
+++ b/changelog.md
@@ -37,6 +37,7 @@
 - [BUG] Add support for typed arrays in SqlString.escape and SqlString.arrayToList [#891](https://github.com/sequelize/sequelize/pull/891). thanks to LJ1102
 - [BUG] Postgres requires empty array to be explicitly cast on update [#890](https://github.com/sequelize/sequelize/pull/890). thanks to robraux
 - [BUG] Added tests & bugfixes for DAO-Factory.update and array of values in where clause [#880](https://github.com/sequelize/sequelize/pull/880). thanks to domasx2
+- [BUG] sqlite no longer leaks a global `db` variable [#900](https://github.com/sequelize/sequelize/pull/900). thanks to xming
 - [FEATURE] Validate a model before it gets saved. [#601](https://github.com/sequelize/sequelize/pull/601). thanks to durango
 - [FEATURE] Schematics. [#564](https://github.com/sequelize/sequelize/pull/564). thanks to durango
 - [FEATURE] Foreign key constraints. [#595](https://github.com/sequelize/sequelize/pull/595). thanks to optilude

--- a/lib/dialects/sqlite/connector-manager.js
+++ b/lib/dialects/sqlite/connector-manager.js
@@ -18,6 +18,7 @@ module.exports = (function() {
  ConnectorManager.prototype.connect = function() {
    var emitter = new (require('events').EventEmitter)()
      , self = this
+      , db
    this.database = db = new sqlite3.Database(self.sequelize.options.storage || ':memory:', function(err) {
      if (err) {