Merge branch 'master' into newindex

Conflicts:
	lib/dialects/sqlite/query-generator.js

.editorconfig

+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+
+# Change these settings to your own preference
+indent_style = space
+indent_size = 2
+
+# We recommend you to keep these unchanged
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+
+[*.md]
+trim_trailing_whitespace = false
+indent_size = 4

.jshintrc

@@ -10,6 +10,7 @@
         "waitsFor": false,
         "runs": false
     },
+    "node": true,
     "camelcase": true,
     "curly": true,
     "forin": true,
@@ -18,5 +19,7 @@
     "asi": true,
     "evil": false,
     "laxcomma": true,
-    "es5": true
+    "es5": true,
+    "quotmark": false,
+    "strict": false
 }
\ No newline at end of file

.npmignore

+docs
+examples
+test
+README.md
+.watchr.js
+changelog.md
+Makefile
\ No newline at end of file

.travis.yml

@@ -18,6 +18,7 @@ env:
   - DB=mysql DIALECT=postgres
   - DB=mysql DIALECT=postgres-native
   - DB=mysql DIALECT=sqlite
+  - DB=mysql DIALECT=mariadb
 
 language: node_js
 

Makefile

@@ -13,12 +13,14 @@ teaser:
 
 test:
 	@if [ "$$GREP" ]; then \
-		make teaser && ./node_modules/mocha/bin/mocha --colors --reporter $(REPORTER) -g "$$GREP" $(TESTS); \
+		make teaser && ./node_modules/mocha/bin/mocha --colors -t 10000 --reporter $(REPORTER) -g "$$GREP" $(TESTS); \
 	else \
-		make teaser && ./node_modules/mocha/bin/mocha --colors --reporter $(REPORTER) $(TESTS); \
+		make teaser && ./node_modules/mocha/bin/mocha --colors -t 10000 --reporter $(REPORTER) $(TESTS); \
 	fi
 
 
+mariadb:
+	@DIALECT=mariadb make test
 sqlite:
 	@DIALECT=sqlite make test
 mysql:
@@ -37,6 +39,6 @@ postgresn: postgres-native
 
 # test all the dialects \o/
 
-all: sqlite mysql postgres postgres-native
+all: sqlite mysql postgres postgres-native mariadb
 
 .PHONY: sqlite mysql postgres pgsql postgres-native postgresn all test

README.md

-# Sequelize [![Build Status](https://secure.travis-ci.org/sequelize/sequelize.png)](http://travis-ci.org/sequelize/sequelize) [![Dependency Status](https://david-dm.org/sequelize/sequelize.png)](https://david-dm.org/sequelize/sequelize) [![Dependency Status](https://david-dm.org/sequelize/sequelize.png)](https://david-dm.org/sequelize/sequelize) [![Flattr this](http://api.flattr.com/button/flattr-badge-large.png)](http://flattr.com/thing/1259407/Sequelize) #
+# Sequelize [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/sequelize/sequelize/trend.png)](https://bitdeli.com/free "Bitdeli Badge") [![Build Status](https://secure.travis-ci.org/sequelize/sequelize.png)](http://travis-ci.org/sequelize/sequelize) [![Dependency Status](https://david-dm.org/sequelize/sequelize.png)](https://david-dm.org/sequelize/sequelize) [![Flattr this](http://api.flattr.com/button/flattr-badge-large.png)](http://flattr.com/thing/1259407/Sequelize) #
 
-MySQL, PostgresSQL, and SQLite Object Relational Mapper (ORM) for [node](http://nodejs.org).
+MySQL, MariaDB, PostgresSQL, and SQLite Object Relational Mapper (ORM) for [node](http://nodejs.org).
 
 ## Important Notes ##
 
@@ -61,7 +61,7 @@ A very basic roadmap. Chances aren't too bad, that not mentioned things are impl
 - Transactions
 - Associations of not yet saved objects: [#864](https://github.com/sequelize/sequelize/issues/864)
 - Support for update of tables without primary key
-- MariaDB support
+- ~~MariaDB support~~
 - ~~Support for update and delete calls for whole tables without previous loading of instances~~ Implemented in [#569](https://github.com/sequelize/sequelize/pull/569) thanks to @optiltude
 - Eager loading of nested associations [#388](https://github.com/sequelize/sequelize/issues/388)
 - ~~Model#delete~~ (renamed to [Model.destroy()](http://sequelizejs.com/documentation#instances-destroy))

changelog.md

@@ -41,6 +41,7 @@
 - [BUG] Fix for counts queries with no result [#906](https://github.com/sequelize/sequelize/pull/906). thanks to iamjochem
 - [BUG] Allow include when the same table is referenced multiple times using hasMany [#913](https://github.com/sequelize/sequelize/pull/913). thanks to janmeier
 - [BUG] Allow definition of defaultValue for the timestamp columns (createdAt, updatedAt, deletedAt) [#930](https://github.com/sequelize/sequelize/pull/930). Thank to durango
+- [BUG] Don't delete foreign keys of many-to-many associations, if still needed. [#961](https://github.com/sequelize/sequelize/pull/961). thanks to sdepold
 - [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
@@ -79,6 +80,10 @@
 - [FEATURE] Triggers for Postgres. [#915](https://github.com/sequelize/sequelize/pull/915). Thanks to jonathana.
 - [FEATURE] Support for join tables. [#877](https://github.com/sequelize/sequelize/pull/877). Thanks to janmeier.
 - [FEATURE] Support for hooks. [#894](https://github.com/sequelize/sequelize/pull/894). Thanks to durango.
+- [FEATURE] Support for literals and casts. [#950](https://github.com/sequelize/sequelize/pull/950). Thanks to durango.
+- [FEATURE] Model#findOrBuild. [#960](https://github.com/sequelize/sequelize/pull/960). Thanks to durango.
+- [FEATURE] Support for MariaDB. [#948](https://github.com/sequelize/sequelize/pull/948). Thanks to reedog117 and janmeier.
+- [FEATURE] Filter through associations. [#991](https://github.com/sequelize/sequelize/pull/991). Thanks to snit-ram.
 - [REFACTORING] hasMany now uses a single SQL statement when creating and destroying associations, instead of removing each association seperately [690](https://github.com/sequelize/sequelize/pull/690). Inspired by [#104](https://github.com/sequelize/sequelize/issues/104). janmeier
 - [REFACTORING] Consistent handling of offset across dialects. Offset is now always applied, and limit is set to max table size of not limit is given [#725](https://github.com/sequelize/sequelize/pull/725). janmeier
 - [REFACTORING] Moved Jasmine to Buster and then Buster to Mocha + Chai. sdepold and durango

lib/associations/has-many.js

@@ -48,6 +48,7 @@ module.exports = (function() {
   HasMany.prototype.injectAttributes = function() {
     var multiAssociation = this.target.associations.hasOwnProperty(this.associationAccessor)
       , self             = this
+
     this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName, this.source.options.language) + "Id", this.options.underscored)
 
     // is there already a single sided association between the source and the target?
@@ -59,9 +60,15 @@ module.exports = (function() {
       } else {
         this.foreignIdentifier = this.target.associations[this.associationAccessor].identifier
         this.target.associations[this.associationAccessor].foreignIdentifier = this.identifier
+
+        if (isForeignKeyDeletionAllowedFor.call(this, this.source, this.foreignIdentifier)) {
           delete this.source.rawAttributes[this.foreignIdentifier]
+        }
+
+        if (isForeignKeyDeletionAllowedFor.call(this, this.target, this.identifier)) {
           delete this.target.associations[this.associationAccessor].source.rawAttributes[this.identifier]
         }
+      }
 
       // define a new model, which connects the models
       var combinedTableAttributes = {}
@@ -256,5 +263,27 @@ module.exports = (function() {
     return this
   }
 
+  /**
+   * The method checks if it is ok to delete the previously defined foreign key.
+   * This is done because we need to keep the foreign key if another association
+   * is depending on it.
+   *
+   * @param  {DaoFactory}  daoFactory The source or target DaoFactory of this assocation
+   * @param  {[type]}  identifier     The name of the foreign key identifier
+   * @return {Boolean}                Whether or not the deletion of the foreign key is ok.
+   */
+  var isForeignKeyDeletionAllowedFor = function(daoFactory, identifier) {
+    var isAllowed        = true
+      , associationNames = Utils._.without(Object.keys(daoFactory.associations), this.associationAccessor)
+
+    associationNames.forEach(function(associationName) {
+      if (daoFactory.associations[associationName].identifier === identifier) {
+        isAllowed = false
+      }
+    })
+
+    return isAllowed
+  }
+
   return HasMany
 })()

lib/dao-factory.js

@@ -186,9 +186,8 @@ module.exports = (function() {
         self.DAO.prototype.booleanValues.push(name);
       }
       if (definition.hasOwnProperty('defaultValue')) {
-        self.DAO.prototype.defaultValues[name] = function() {
-          return Utils.toDefaultValue(definition.defaultValue)
-        }
+        self.DAO.prototype.defaultValues[name] = Utils._.partial(
+          Utils.toDefaultValue, definition.defaultValue)
       }
 
       if (definition.hasOwnProperty('validate')) {
@@ -545,6 +544,39 @@ module.exports = (function() {
     return this.build(values).save(fields)
   }
 
+  DAOFactory.prototype.findOrInitialize = DAOFactory.prototype.findOrBuild = function (params, defaults) {
+    var self          = this
+      , defaultKeys   = Object.keys(defaults || {})
+      , defaultLength = defaultKeys.length
+
+    return new Utils.CustomEventEmitter(function (emitter) {
+      self.find({
+        where: params
+      }).success(function (instance) {
+        if (instance === null) {
+          var i = 0
+
+          for (i = 0; i < defaultLength; i++) {
+            params[defaultKeys[i]] = defaults[defaultKeys[i]]
+          }
+
+          var build = self.build(params)
+
+          build.hookValidate({skip: Object.keys(params)}).success(function (instance) {
+            emitter.emit('success', build, true)
+          })
+          .error(function (error) {
+            emitter.emit('error', error)
+          })
+        } else {
+          emitter.emit('success', instance, false)
+        }
+      }).error(function (error) {
+        emitter.emit('error', error)
+      })
+    }).run()
+  }
+
   DAOFactory.prototype.findOrCreate = function (params, defaults) {
     var self = this;
 
@@ -988,7 +1020,7 @@ module.exports = (function() {
 
   DAOFactory.prototype.dataset = function() {
     if (!this.__sql) {
-      this.__sql = sql.setDialect(this.daoFactoryManager.sequelize.options.dialect)
+      this.__setSqlDialect()
     }
 
     var instance   = this.__sql.define({ name: this.tableName, columns: [] })
@@ -1001,6 +1033,11 @@ module.exports = (function() {
     return instance
   }
 
+  DAOFactory.prototype.__setSqlDialect = function() {
+    var dialect = this.daoFactoryManager.sequelize.options.dialect 
+    this.__sql = sql.setDialect(dialect === 'mariadb' ? 'mysql' : dialect)
+  }
+
   // private
 
   var paranoidClause = function(options) {
@@ -1089,7 +1126,10 @@ module.exports = (function() {
       if (include.hasOwnProperty('attributes')) {
         var primaryKeys;
         if (include.daoFactory.hasPrimaryKeys) {
-          primaryKeys = include.daoFactory.primaryKeys
+          primaryKeys = []
+          for (var field_name in include.daoFactory.primaryKeys) {
+            primaryKeys.push(field_name)
+          }
         } else {
           primaryKeys = ['id']
         }

lib/dao.js

@@ -131,11 +131,11 @@ module.exports = (function() {
             var definition = self.daoFactory.rawAttributes[attrName]
               , isHstore   = !!definition.type && !!definition.type.type && definition.type.type === DataTypes.HSTORE.type
               , isEnum          = definition.type && (definition.type.toString() === DataTypes.ENUM.toString())
-              , isMySQL         = self.daoFactory.daoFactoryManager.sequelize.options.dialect === "mysql"
+              , isMySQL         = ['mysql', 'mariadb'].indexOf(self.daoFactory.daoFactoryManager.sequelize.options.dialect) !== -1
               , ciCollation     = !!self.daoFactory.options.collate && self.daoFactory.options.collate.match(/_ci$/i)
 
             // Unfortunately for MySQL CI collation we need to map/lowercase values again
-            if (isEnum && isMySQL && ciCollation) {
+            if (isEnum && isMySQL && ciCollation && (attrName in values)) {
               var scopeIndex = (definition.values || []).map(function(d) { return d.toLowerCase() }).indexOf(values[attrName].toLowerCase())
               valueOutOfScope = scopeIndex === -1
 
@@ -422,7 +422,7 @@ module.exports = (function() {
   }
 
   DAO.prototype.addAttribute = function(attribute, value) {
-    if (this.booleanValues.length && this.booleanValues.indexOf(attribute) !== -1 && value !== undefined) { // transform integer 0,1 into boolean
+    if (this.booleanValues.length && this.booleanValues.indexOf(attribute) !== -1 && value != null) { // transform integer 0,1 into boolean
       value = !!value
     }
 

lib/dialects/mariadb/query-generator.js

+var Utils     = require("../../utils")
+
+module.exports = (function() {
+  var QueryGenerator = {
+    dialect: 'mariadb'
+  }
+  // "MariaDB is a drop-in replacement for MySQL." - so thats exactly what we do, drop in the mysql query generator
+
+  return Utils._.extend(Utils._.clone(require("../mysql/query-generator")), QueryGenerator)
+})()

lib/dialects/mariadb/query.js

+var Utils         = require("../../utils")
+  , AbstractQuery = require('../abstract/query')
+
+module.exports = (function() {
+  var Query = function(client, sequelize, callee, options) {
+    this.client    = client
+    this.callee    = callee
+    this.sequelize = sequelize
+    this.options   = Utils._.extend({
+      logging: console.log,
+      plain: false,
+      raw: false
+    }, options || {})
+
+    this.checkLoggingOption()
+  }
+
+  Utils.inherit(Query, AbstractQuery)
+  Query.prototype.run = function(sql) {
+    this.sql = sql
+
+    if (this.options.logging !== false) {
+      this.options.logging('Executing: ' + this.sql)
+    }
+
+    var resultSet = [],
+        errorDetected = false,
+        alreadyEnded = false, // This is needed because CALL queries emit 'end' twice...
+        self = this
+
+    this.client.query(this.sql)
+      .on('result', function(results) {
+        results
+          .on('row', function(row, metadata) {
+            for (var prop in row) {
+              if (row.hasOwnProperty(prop)) {
+                if (row[prop] === null) {
+                  continue
+                }
+
+                type = metadata.types[prop]
+
+                switch (type) {
+                case "TINYINT":
+                case "SMALLINT":
+                case "INTEGER":
+                case "MEDIUMINT":
+                case "BIGINT":
+                case "YEAR":
+                  row[prop] = parseInt(row[prop], 10)
+                  break
+                case "DECIMAL":
+                case "FLOAT":
+                case "DOUBLE":
+                  row[prop] = parseFloat(row[prop])
+                  break
+                case "DATE":
+                case "TIMESTAMP":
+                case "DATETIME":
+                  row[prop] = new Date(row[prop] + 'Z')
+                  break
+                case "BIT":
+                case "BLOB":
+                case "TINYBLOB":
+                case "MEDIUMBLOB":
+                case "LONGBLOB":
+                  if (metadata.charsetNrs[prop] === 63) { // binary
+                    row[prop] = new Buffer(row[prop])  
+                  }
+                  break
+                case "TIME":
+                case "CHAR":
+                case "VARCHAR":
+                case "SET":
+                case "ENUM":
+                case "GEOMETRY":
+                case "NULL":
+                  break
+                default:
+                  // blank
+                }
+              }
+            }
+            resultSet.push(row)
+          })
+          .on('error', function(err) {
+            errorDetected = true
+            self.emit('sql', self.sql)
+            self.emit('error', err, self.callee)
+          })
+          .on('end', function(info) {
+            if (alreadyEnded || errorDetected) {
+              return
+            }
+            alreadyEnded = true
+
+            self.emit('sql', self.sql)
+            // we need to figure out whether to send the result set
+            // or info depending upon the type of query
+            if (/^call/.test(self.sql.toLowerCase())) {
+              self.emit('success', resultSet)
+            } else if( /^show/.test(self.sql.toLowerCase()) ||
+                /^select/.test(self.sql.toLowerCase()) ||
+              /^describe/.test(self.sql.toLowerCase())) {
+              self.emit('success', self.formatResults(resultSet))         
+            } else {
+              self.emit('success', self.formatResults(info))
+            }
+
+          })
+      })
+      .on('error', function(err) {
+        if (errorDetected) {
+          return
+        }
+        errorDetected = true
+        self.emit('sql', self.sql)
+        self.emit('error', err, self.callee)
+      })
+      .setMaxListeners(100)
+
+    return this
+  }
+
+  return Query
+})()
+
+

lib/dialects/postgres/connector-manager.js

@@ -145,6 +145,7 @@ module.exports = (function() {
       // Closes a client correctly even if we have backed up queries
       // https://github.com/brianc/node-postgres/pull/346
       this.client.on('drain', this.client.end.bind(this.client))
+      this.client = null
     }
 
     this.isConnecting = false

lib/dialects/sqlite/query-generator.js

@@ -55,7 +55,7 @@ module.exports = (function() {
                     return Utils._.includes(definition, 'PRIMARY KEY')
                   }).length > 1)
         , attrStr     = []
-
+        , modifierLastIndex = -1
 
       for (var attr in attributes) {
         if (attributes.hasOwnProperty(attr)) {
@@ -65,6 +65,26 @@ module.exports = (function() {
             dataType = dataType.replace(/BIGINT/, 'INTEGER')
           }
 
+          // SQLite thinks that certain modifiers should come before the length declaration,
+          // whereas other dialects want them after, see http://www.sqlite.org/lang_createtable.html.
+
+          // Start by finding the index of the last of the modifiers
+          ['UNSIGNED', 'BINARY', 'ZEROFILL'].forEach(function (modifier) {
+            var tmpIndex = dataType.indexOf(modifier)
+
+            if (tmpIndex > modifierLastIndex) {
+              modifierLastIndex = tmpIndex + modifier.length
+            }
+          })
+          if (modifierLastIndex) {
+            // If a modifier was found, and a lenght declaration is given before the modifier, move the length
+            var length = dataType.match(/\(\s*\d+(\s*,\s*\d)?\s*\)/)
+            if (length && length.index < modifierLastIndex) {
+              dataType = dataType.replace(length[0], '')
+              dataType = Utils._.insert(dataType, modifierLastIndex, length[0])
+            }
+          }
+
           if (Utils._.includes(dataType, 'PRIMARY KEY') && needsMultiplePrimaryKeys) {
             primaryKeys.push(attr)
             attrStr.push(this.quoteIdentifier(attr) + " " + dataType.replace(/PRIMARY KEY/, 'NOT NULL'))
@@ -95,6 +115,10 @@ module.exports = (function() {
       return this.replaceBooleanDefaults(sql)
     },
 
+    booleanValue: function(value){
+      return !!value ? 1 : 0;
+    },
+
     dropTableQuery: function(tableName, options) {
       options = options || {}
 
@@ -117,6 +141,19 @@ module.exports = (function() {
       }
     },
 
+    addLimitAndOffset: function(options, query){
+      if (options.offset && !options.limit) {
+        query += " LIMIT " + options.offset + ", " + 10000000000000;
+      } else if (options.limit && !(options.include && (options.limit === 1))) {
+        if (options.offset) {
+          query += " LIMIT " + options.offset + ", " + options.limit
+        } else {
+          query += " LIMIT " + options.limit
+        }
+      }
+      return query;
+    },
+
     addColumnQuery: function() {
       var sql = MySqlQueryGenerator.addColumnQuery.apply(this, arguments)
       return this.replaceBooleanDefaults(sql)
@@ -163,6 +200,7 @@ module.exports = (function() {
       return Utils._.template(query)(replacements)
     },
 
+<<<<<<< HEAD
     selectQuery: function(tableName, options, factory) {
       var table = null,
           joinQuery = ""
@@ -331,7 +369,10 @@ module.exports = (function() {
             template += " NOT NULL"
           }
 
-          if (dataType.defaultValue !== undefined) {
+          if (Utils.defaultValueSchemable(dataType.defaultValue)) {
+            // TODO thoroughly check that DataTypes.NOW will properly
+            // get populated on all databases as DEFAULT value
+            // i.e. mysql requires: DEFAULT CURRENT_TIMESTAMP
             template += " DEFAULT <%= defaultValue %>"
             replacements.defaultValue = this.escape(dataType.defaultValue)
           }
@@ -395,32 +436,6 @@ module.exports = (function() {
       return fields
     },
 
-    enableForeignKeyConstraintsQuery: function() {
-      var sql = "PRAGMA foreign_keys = ON;"
-      return Utils._.template(sql, {})
-    },
-
-    disableForeignKeyConstraintsQuery: function() {
-      var sql = "PRAGMA foreign_keys = OFF;"
-      return Utils._.template(sql, {})
-    },
-
-    hashToWhereConditions: function(hash) {
-      for (var key in hash) {
-        if (hash.hasOwnProperty(key)) {
-          var value = hash[key]
-
-          if (typeof value === 'boolean') {
-            value = !!value ? 1 : 0
-          }
-
-          hash[key] = value
-        }
-      }
-
-      return hashToWhereConditions.call(this, hash).replace(/\\'/g, "''");
-    },
-
     showIndexQuery: function(tableName) {
       var sql = "PRAGMA INDEX_LIST('<%= tableName %>')"
       return Utils._.template(sql, { tableName: tableName })
@@ -504,6 +519,17 @@ module.exports = (function() {
 
     quoteIdentifiers: function(identifiers, force) {
       return identifiers.split('.').map(function(v) { return this.quoteIdentifier(v, force) }.bind(this)).join('.')
+    },
+
+        /**
+     * Generates an SQL query that returns all foreign keys of a table.
+     *
+     * @param  {String} tableName  The name of the table.
+     * @param  {String} schemaName The name of the schema.
+     * @return {String}            The generated sql query.
+     */
+    getForeignKeysQuery: function(tableName, schemaName) {
+      return "PRAGMA foreign_key_list(\"" + tableName + "\")"
     }
   }
 

lib/dialects/sqlite/query-interface.js

@@ -118,5 +118,60 @@ var QueryInterface = module.exports = {
           queryAndEmit.call(this, queries.splice(queries.length - 1)[0], methodName, {}, emitter)
         }
       }.bind(this))
+  },
+
+  dropAllTables: function() {
+    var self = this
+
+   return new Utils.CustomEventEmitter(function(dropAllTablesEmitter) {
+      var events  = []
+        , chainer = new Utils.QueryChainer()
+        , onError = function(err) {
+            self.emit('dropAllTables', err)
+            dropAllTablesEmitter.emit('error', err)
+          }
+
+      self
+        .showAllTables()
+        .error(onError)
+        .success(function(tableNames) {
+          self
+            .sequelize
+            .query('PRAGMA foreign_keys;')
+            .proxy(dropAllTablesEmitter, { events: ['sql'] })
+            .error(onError)
+            .success(function(result) {
+              var foreignKeysAreEnabled = result.foreign_keys === 1
+
+              if (foreignKeysAreEnabled) {
+                var queries = []
+
+                queries.push('PRAGMA foreign_keys = OFF')
+
+                tableNames.forEach(function(tableName) {
+                  queries.push(self.QueryGenerator.dropTableQuery(tableName).replace(';', ''))
+                })
+
+                queries.push('PRAGMA foreign_keys = ON')
+
+                QueryInterface.execMultiQuery.call(self, queries, 'dropAllTables', dropAllTablesEmitter, self.queryAndEmit)
+              } else {
+                // add the table removal query to the chainer
+                tableNames.forEach(function(tableName) {
+                  chainer.add(self, 'dropTable', [ tableName, { cascade: true } ])
+                })
+
+                chainer
+                  .runSerially()
+                  .proxy(dropAllTablesEmitter, { events: ['sql'] })
+                  .error(onError)
+                  .success(function() {
+                    self.emit('dropAllTables', null)
+                    dropAllTablesEmitter.emit('success', null)
+                  })
+              }
+            })
+        })
+    }).run()
   }
 }

lib/dialects/sqlite/query.js

@@ -139,6 +139,10 @@ module.exports = (function() {
           result[_result.name].defaultValue = result[_result.name].defaultValue.replace(/'/g, "")
         }
       })
+    } else if (this.sql.indexOf('PRAGMA foreign_keys;') !== -1) {
+      result = results[0]
+    } else if (this.sql.indexOf('PRAGMA foreign_keys') !== -1) {
+      result = results
     }
 
     this.emit('success', result)

lib/emitters/custom-event-emitter.js

@@ -3,20 +3,19 @@ var util           = require("util")
   , Promise        = require("promise")
   , proxyEventKeys = ['success', 'error', 'sql']
   , tick           = (typeof setImmediate !== "undefined" ? setImmediate : process.nextTick)
+  , Utils          = require('../utils')
 
 var bindToProcess = function(fct) {
-  if (fct) {
-    if (process.domain) {
-      return process.domain.bind(fct);
-    }
+  if (fct && process.domain) {
+    return process.domain.bind(fct)
   }
 
-  return fct;
+  return fct
 };
 
 module.exports = (function() {
   var CustomEventEmitter = function(fct) {
-    this.fct = bindToProcess(fct);
+    this.fct = bindToProcess(fct)
   }
   util.inherits(CustomEventEmitter, EventEmitter)
 
@@ -50,29 +49,48 @@ module.exports = (function() {
   function(fct) {
     fct = bindToProcess(fct);
     this.on('error', function(err) { fct(err, null) })
-        .on('success', function(result) { fct(null, result) })
+        .on('success', function() {
+          var args = Array.prototype.slice.call(arguments);
+          args.unshift(null);
+          fct.apply(fct, args);
+        })
     return this
   }
 
-  CustomEventEmitter.prototype.sql =
-  function(fct) {
+  CustomEventEmitter.prototype.sql = function(fct) {
     this.on('sql', bindToProcess(fct))
     return this;
   }
 
-  CustomEventEmitter.prototype.proxy = function(emitter) {
-    proxyEventKeys.forEach(function (eventKey) {
+  /**
+   * Proxy every event of this custom event emitter to another one.
+   *
+   * @param  {CustomEventEmitter} emitter The event emitter that should receive the events.
+   * @return {void}
+   */
+  CustomEventEmitter.prototype.proxy = function(emitter, options) {
+    options = Utils._.extend({
+      events:     proxyEventKeys,
+      skipEvents: []
+    }, options || {})
+
+    options.events = Utils._.difference(options.events, options.skipEvents)
+
+    options.events.forEach(function (eventKey) {
       this.on(eventKey, function (result) {
         emitter.emit(eventKey, result)
       })
     }.bind(this))
+
+    return this
   }
 
-  CustomEventEmitter.prototype.then =
-  function (onFulfilled, onRejected) {
+  CustomEventEmitter.prototype.then = function(onFulfilled, onRejected) {
     var self = this
+
     onFulfilled = bindToProcess(onFulfilled)
     onRejected = bindToProcess(onRejected)
+
     return new Promise(function (resolve, reject) {
       self.on('error', reject)
           .on('success', resolve);

lib/query-interface.js

@@ -223,35 +223,46 @@ module.exports = (function() {
   QueryInterface.prototype.dropAllTables = function() {
     var self = this
 
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var chainer = new Utils.QueryChainer()
+    if (this.sequelize.options.dialect === 'sqlite') {
+      // sqlite needs some special treatment as it cannot drop a column
+      return SQLiteQueryInterface.dropAllTables.call(this)
+    } else {
+      return new Utils.CustomEventEmitter(function(dropAllTablesEmitter) {
+        var events  = []
+          , chainer = new Utils.QueryChainer()
+          , onError = function(err) {
+              self.emit('dropAllTables', err)
+              dropAllTablesEmitter.emit('error', err)
+            }
 
         self.showAllTables().success(function(tableNames) {
-          chainer.add(self, 'disableForeignKeyConstraints', [])
+          self.getForeignKeysForTables(tableNames).success(function(foreignKeys) {
 
-          tableNames.forEach(function(tableName) {
-            chainer.add(self, 'dropTable', [tableName, {cascade: true}])
+            // add the foreign key removal query to the chainer
+            Object.keys(foreignKeys).forEach(function(tableName) {
+              foreignKeys[tableName].forEach(function(foreignKey) {
+                var sql = self.QueryGenerator.dropForeignKeyQuery(tableName, foreignKey)
+                chainer.add(self.sequelize, 'query', [ sql ])
+              })
             })
 
-          chainer.add(self, 'enableForeignKeyConstraints', [])
+            // add the table removal query to the chainer
+            tableNames.forEach(function(tableName) {
+              chainer.add(self, 'dropTable', [ tableName, { cascade: true } ])
+            })
 
             chainer
               .runSerially()
               .success(function() {
                 self.emit('dropAllTables', null)
-              emitter.emit('success', null)
-            })
-            .error(function(err) {
-              self.emit('dropAllTables', err)
-              emitter.emit('error', err)
-            })
-
-      }).error(function(err) {
-        self.emit('dropAllTables', err)
-        emitter.emit('error', err)
+                dropAllTablesEmitter.emit('success', null)
               })
+              .error(onError)
+          }).error(onError)
+        }).error(onError)
       }).run()
     }
+  }
 
   QueryInterface.prototype.renameTable = function(before, after) {
     var sql = this.QueryGenerator.renameTableQuery(before, after)
@@ -263,6 +274,7 @@ module.exports = (function() {
 
     return new Utils.CustomEventEmitter(function(emitter) {
       var showTablesSql = self.QueryGenerator.showTablesQuery()
+
       self.sequelize.query(showTablesSql, null, { raw: true }).success(function(tableNames) {
         self.emit('showAllTables', null)
         emitter.emit('success', Utils._.flatten(tableNames))
@@ -397,6 +409,35 @@ module.exports = (function() {
     return queryAndEmit.call(this, sql, 'showIndex')
   }
 
+  QueryInterface.prototype.getForeignKeysForTables = function(tableNames) {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      if (tableNames.length === 0) {
+        emitter.emit('success', {})
+      } else {
+        var chainer = new Utils.QueryChainer()
+
+        tableNames.forEach(function(tableName) {
+          var sql = self.QueryGenerator.getForeignKeysQuery(tableName, self.sequelize.config.database)
+          chainer.add(self.sequelize, 'query', [sql])
+        })
+
+        chainer.runSerially().proxy(emitter, {
+          skipEvents: ['success']
+        }).success(function(results) {
+          var result = {}
+
+          tableNames.forEach(function(tableName, i) {
+            result[tableName] = Utils._.compact(results[i]).map(function(r) { return r.constraint_name })
+          })
+
+          emitter.emit('success', result)
+        })
+      }
+    }).run()
+  }
+
   QueryInterface.prototype.removeIndex = function(tableName, indexNameOrAttributes) {
     var sql = this.QueryGenerator.removeIndexQuery(tableName, indexNameOrAttributes)
     return queryAndEmit.call(this, sql, "removeIndex")
@@ -434,13 +475,12 @@ module.exports = (function() {
     return new Utils.CustomEventEmitter(function(emitter) {
       var chainer = new Utils.QueryChainer()
 
-      chainer.add(self, 'enableForeignKeyConstraints', [])
       chainer.add(self, 'queryAndEmit', [[sql, dao], 'delete'])
 
       chainer.runSerially()
       .success(function(results){
         emitter.query = { sql: sql }
-        emitter.emit('success', results[1])
+        emitter.emit('success', results[0])
         emitter.emit('sql', sql)
       })
       .error(function(err) {
@@ -461,7 +501,6 @@ module.exports = (function() {
     return new Utils.CustomEventEmitter(function(emitter) {
       var chainer = new Utils.QueryChainer()
 
-      chainer.add(self, 'enableForeignKeyConstraints', [])
       chainer.add(self, 'queryAndEmit', [sql, 'bulkUpdate'])
 
       return chainer.runSerially()
@@ -547,7 +586,6 @@ module.exports = (function() {
 
         var chainer = new Utils.QueryChainer()
 
-        chainer.add(self, 'enableForeignKeyConstraints', [])
         chainer.add(self, 'queryAndEmit', [[sql, dao], 'delete'])
 
         chainer.runSerially()
@@ -578,7 +616,6 @@ module.exports = (function() {
     return new Utils.CustomEventEmitter(function(emitter) {
       var chainer = new Utils.QueryChainer()
 
-      chainer.add(self, 'enableForeignKeyConstraints', [])
       chainer.add(self, 'queryAndEmit', [sql, 'bulkDelete', options])
 
       chainer.runSerially()
@@ -660,30 +697,6 @@ module.exports = (function() {
     }).run()
   }
 
-  QueryInterface.prototype.enableForeignKeyConstraints = function() {
-    var sql = this.QueryGenerator.enableForeignKeyConstraintsQuery()
-    if(sql) {
-      return queryAndEmit.call(this, sql, 'enableForeignKeyConstraints')
-    } else {
-      return new Utils.CustomEventEmitter(function(emitter) {
-        this.emit('enableForeignKeyConstraints', null)
-        emitter.emit('success')
-      }).run()
-    }
-  }
-
-  QueryInterface.prototype.disableForeignKeyConstraints = function() {
-    var sql = this.QueryGenerator.disableForeignKeyConstraintsQuery()
-    if(sql){
-      return queryAndEmit.call(this, sql, 'disableForeignKeyConstraints')
-    } else {
-      return new Utils.CustomEventEmitter(function(emitter) {
-        this.emit('disableForeignKeyConstraints', null)
-        emitter.emit('success')
-      }).run()
-    }
-  }
-
   QueryInterface.prototype.createTrigger = function(tableName, triggerName, timingType, fireOnArray,
       functionName, functionParams, optionsArray) {
     var  sql = this.QueryGenerator.createTrigger(tableName, triggerName, timingType, fireOnArray, functionName

lib/sequelize.js

@@ -81,6 +81,7 @@ module.exports = (function() {
       queue: true,
       native: false,
       replication: false,
+      ssl: undefined,
       pool: {},
       quoteIdentifiers: true,
       language: 'en'
@@ -101,6 +102,7 @@ module.exports = (function() {
       protocol: this.options.protocol,
       queue   : this.options.queue,
       native  : this.options.native,
+      ssl     : this.options.ssl,
       replication: this.options.replication,
       dialectModulePath: this.options.dialectModulePath,
       maxConcurrentQueries: this.options.maxConcurrentQueries,
@@ -191,7 +193,7 @@ module.exports = (function() {
         attributes[name].validate = attributes[name].validate || {
           _checkEnum: function(value) {
             var hasValue        = value !== undefined
-              , isMySQL         = self.options.dialect === "mysql"
+              , isMySQL         = ['mysql', 'mariadb'].indexOf(self.options.dialect) !== -1
               , ciCollation     = !!options.collate && options.collate.match(/_ci$/i) !== null
               , valueOutOfScope
 
@@ -243,11 +245,10 @@ module.exports = (function() {
 
   Sequelize.prototype.import = function(path) {
     // is it a relative path?
-    if (url.parse(path).pathname.indexOf('/') !== 0) {
+    if (Path.normalize(path).indexOf(path.sep) !== 0) {
       // make path relative to the caller
       var callerFilename = Utils.stack()[1].getFileName()
-        , callerMatch    = callerFilename.match(/(.+\/).+?$/)
-        , callerPath     = callerMatch[1]
+        , callerPath     = Path.dirname(callerFilename)
        
       path = Path.resolve(callerPath, path)
     }
@@ -363,5 +364,13 @@ module.exports = (function() {
     return new Utils.col(col)
   }
 
+  Sequelize.prototype.cast = function (val, type) {
+    return new Utils.cast(val, type)
+  }
+
+  Sequelize.prototype.literal = function (val) {
+    return new Utils.literal(val)
+  }
+
   return Sequelize
 })()

lib/utils.js

@@ -373,7 +373,32 @@ var Utils = module.exports = {
   },
 
   toDefaultValue: function(value) {
+    if (lodash.isFunction(value)) {
+      return value()
+    } else {
       return (value === DataTypes.NOW) ? Utils.now() : value
+    }
+  },
+
+  /**
+   * Determine if the default value provided exists and can be described
+   * in a db schema using the DEFAULT directive.
+   *
+   * @param  {*} value Any default value.
+   * @return {boolean} yes / no.
+   */
+  defaultValueSchemable: function(value) {
+    if (typeof value === 'undefined') {return false}
+
+    // TODO this will be schemable when all supported db
+    // have been normalized for this case
+    if (value === DataTypes.NOW) {return false}
+
+    if (lodash.isFunction(value)) {
+      return false
+    }
+
+    return true
   },
 
   setAttributes: function(hash, identifier, instance, prefix) {
@@ -492,7 +517,31 @@ var Utils = module.exports = {
   },
   col: function (col) {
     this.col = col
+  },
+  cast: function (val, type) {
+    this.val  = val
+    this.type = (type || '').trim()
+  },
+  literal: function (val) {
+    this.val = val
+  }
+}
+
+// I know this may seem silly, but this gives us the ability to recognize whether
+// or not we should be escaping or if we should trust the user. Basically, it
+// keeps things in perspective and organized.
+Utils.literal.prototype.toString = function() {
+  return this.val
+}
+
+Utils.cast.prototype.toString = function(queryGenerator) {
+  if (!this.val instanceof Utils.fn && !this.val instanceof Utils.col && !this.val instanceof Utils.literal) {
+    this.val = queryGenerator.escape(this.val)
+  } else {
+    this.val = this.val.toString(queryGenerator)
   }
+
+  return 'CAST(' + this.val + ' AS ' + this.type.toUpperCase() + ')'
 }
 
 Utils.fn.prototype.toString = function(queryGenerator) {
@@ -504,6 +553,7 @@ Utils.fn.prototype.toString = function(queryGenerator) {
     }
   }).join(', ') + ')'
 }
+
 Utils.col.prototype.toString = function (queryGenerator) {
   return queryGenerator.quote(this.col)
 }

package.json

@@ -36,7 +36,7 @@
     "url": "https://github.com/sequelize/sequelize/issues"
   },
   "dependencies": {
-    "lodash": "~2.1.0",
+    "lodash": "~2.2.0",
     "underscore.string": "~2.3.0",
     "lingo": "~0.0.5",
     "validator": "~1.5.0",
@@ -46,18 +46,19 @@
     "toposort-class": "~0.2.0",
     "generic-pool": "2.0.4",
     "promise": "~3.2.0",
-    "sql": "~0.26.0"
+    "sql": "~0.28.0"
   },
   "devDependencies": {
     "sqlite3": "~2.1.12",
-    "mysql": "~2.0.0-alpha8",
+    "mysql": "~2.0.0-alpha9",
     "pg": "~2.6.0",
     "watchr": "~2.4.3",
     "yuidocjs": "~0.3.36",
     "chai": "~1.8.0",
     "mocha": "~1.13.0",
     "chai-datetime": "~1.1.1",
-    "sinon": "~1.7.3"
+    "sinon": "~1.7.3",
+    "mariasql": "git://github.com/sequelize/node-mariasql.git"
   },
   "keywords": [
     "mysql",

test/associations/has-many.test.js

@@ -28,12 +28,9 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
     describe('hasSingle', function() {
       beforeEach(function(done) {
         var self = this
-        this.Article = this.sequelize.define('Article', {
-          'title': DataTypes.STRING
-        })
-        this.Label   = this.sequelize.define('Label', {
-          'text': DataTypes.STRING
-        })
+
+        this.Article = this.sequelize.define('Article', { 'title': DataTypes.STRING })
+        this.Label   = this.sequelize.define('Label', { 'text': DataTypes.STRING })
 
         this.Article.hasMany(this.Label)
 
@@ -710,6 +707,71 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
         })
       })
     })
+
+    describe('belongsTo and hasMany at once', function() {
+      beforeEach(function() {
+        this.A = this.sequelize.define('a', { name: Sequelize.STRING })
+        this.B = this.sequelize.define('b', { name: Sequelize.STRING })
+      })
+
+      describe('source belongs to target', function() {
+        beforeEach(function(done) {
+          this.A.belongsTo(this.B, { as: 'relation1' })
+          this.A.hasMany(this.B, { as: 'relation2' })
+          this.B.hasMany(this.A, { as: 'relation2' })
+
+          this.sequelize.sync({ force: true }).success(function() {
+            done()
+          })
+        })
+
+        it('correctly uses bId in A', function(done) {
+          var self = this
+
+          var a1 = this.A.build({ name: 'a1' })
+            , b1 = this.B.build({ name: 'b1' })
+
+          a1
+            .save()
+            .then(function() { return b1.save() })
+            .then(function() { return a1.setRelation1(b1) })
+            .then(function() { return self.A.find({ where: { name: 'a1' } }) })
+            .done(function(a) {
+              expect(a.bId).to.be.eq(b1.id)
+              done()
+            })
+        })
+      })
+
+      describe('target belongs to source', function() {
+        beforeEach(function(done) {
+          this.B.belongsTo(this.A, { as: 'relation1' })
+          this.A.hasMany(this.B, { as: 'relation2' })
+          this.B.hasMany(this.A, { as: 'relation2' })
+
+          this.sequelize.sync({ force: true }).success(function() {
+            done()
+          })
+        })
+
+        it('correctly uses bId in A', function(done) {
+          var self = this
+
+          var a1 = this.A.build({ name: 'a1' })
+            , b1 = this.B.build({ name: 'b1' })
+
+          a1
+            .save()
+            .then(function() { return b1.save() })
+            .then(function() { return b1.setRelation1(a1) })
+            .then(function() { return self.B.find({ where: { name: 'b1' } }) })
+            .done(function(b) {
+              expect(b.aId).to.be.eq(a1.id)
+              done()
+            })
+        })
+      })
+    })
   })
 
   describe("Foreign key constraints", function() {

test/associations/multiple-level-filters.test.js

+/* jshint camelcase: false, expr: true */
+var chai      = require('chai')
+  , expect    = chai.expect
+  , Support   = require(__dirname + '/../support')
+  , DataTypes = require(__dirname + "/../../lib/data-types")
+
+chai.Assertion.includeStack = true
+
+describe(Support.getTestDialectTeaser("Multiple Level Filters"), function() {
+  it('can filter through belongsTo', function(done) {
+    var User = this.sequelize.define('User', {username: DataTypes.STRING })
+      , Task = this.sequelize.define('Task', {title: DataTypes.STRING })
+      , Project = this.sequelize.define('Project', { title: DataTypes.STRING })
+
+    Project.belongsTo(User);
+    User.hasMany(Project)
+
+    Task.belongsTo(Project);
+    Project.hasMany(Task);
+
+
+    this.sequelize.sync({ force: true }).success(function() {
+      User.bulkCreate([{
+        username: 'leia'
+      }, {
+        username: 'vader'
+      }]).success(function() {
+        Project.bulkCreate([{
+          UserId: 1,
+          title: 'republic'
+        },{
+          title: 'empire'
+        }]).success(function() {
+          Task.bulkCreate([{
+            ProjectId: 1,
+            title: 'fight empire'
+          },{
+            ProjectId: 1,
+            title: 'stablish republic'
+          },{
+            ProjectId: 2,
+            title: 'destroy rebel alliance'
+          },{
+            ProjectId: 2,
+            title: 'rule everything'
+          }]).success(function() {
+            Task.findAll({
+              where: {
+                'project.user.username': 'leia'
+              }
+            }).success(function(tasks){
+              try{
+                expect(tasks.length).to.be.equal(2);
+                expect(tasks[0].title).to.be.equal('fight empire');
+                expect(tasks[1].title).to.be.equal('stablish republic');
+                done();
+              }catch(e){
+                done(e);
+              }
+            })
+          });
+        });
+      });
+    })
+  })
+
+  it('avoids duplicated tables in query', function(done) {
+    var User = this.sequelize.define('User', {username: DataTypes.STRING })
+      , Task = this.sequelize.define('Task', {title: DataTypes.STRING })
+      , Project = this.sequelize.define('Project', { title: DataTypes.STRING })
+
+    Project.belongsTo(User);
+    User.hasMany(Project)
+
+    Task.belongsTo(Project);
+    Project.hasMany(Task);
+
+
+    this.sequelize.sync({ force: true }).success(function() {
+      User.bulkCreate([{
+        username: 'leia'
+      }, {
+        username: 'vader'
+      }]).success(function() {
+        Project.bulkCreate([{
+          UserId: 1,
+          title: 'republic'
+        },{
+          UserId: 2,
+          title: 'empire'
+        }]).success(function() {
+          Task.bulkCreate([{
+            ProjectId: 1,
+            title: 'fight empire'
+          },{
+            ProjectId: 1,
+            title: 'stablish republic'
+          },{
+            ProjectId: 2,
+            title: 'destroy rebel alliance'
+          },{
+            ProjectId: 2,
+            title: 'rule everything'
+          }]).success(function() {
+            Task.findAll({
+              where: {
+                'project.user.username': 'leia',
+                'project.user.id': 1
+              }
+            }).success(function(tasks){
+              try{
+                expect(tasks.length).to.be.equal(2);
+                expect(tasks[0].title).to.be.equal('fight empire');
+                expect(tasks[1].title).to.be.equal('stablish republic');
+                done();
+              }catch(e){
+                done(e);
+              }
+            })
+          });
+        });
+      });
+    })
+  })
+
+  it('can filter through hasMany', function(done) {
+    var User = this.sequelize.define('User', {username: DataTypes.STRING })
+      , Task = this.sequelize.define('Task', {title: DataTypes.STRING })
+      , Project = this.sequelize.define('Project', { title: DataTypes.STRING })
+
+    Project.belongsTo(User);
+    User.hasMany(Project)
+
+    Task.belongsTo(Project);
+    Project.hasMany(Task);
+
+
+    this.sequelize.sync({ force: true }).success(function() {
+      User.bulkCreate([{
+        username: 'leia'
+      }, {
+        username: 'vader'
+      }]).success(function() {
+        Project.bulkCreate([{
+          UserId: 1,
+          title: 'republic'
+        },{
+          UserId: 2,
+          title: 'empire'
+        }]).success(function() {
+          Task.bulkCreate([{
+            ProjectId: 1,
+            title: 'fight empire'
+          },{
+            ProjectId: 1,
+            title: 'stablish republic'
+          },{
+            ProjectId: 2,
+            title: 'destroy rebel alliance'
+          },{
+            ProjectId: 2,
+            title: 'rule everything'
+          }]).success(function() {
+            User.findAll({
+              where: {
+                'projects.tasks.title': 'fight empire'
+              }
+            }).success(function(users){
+              try{
+                expect(users.length).to.be.equal(1);
+                expect(users[0].username).to.be.equal('leia');
+                done();
+              }catch(e){
+                done(e);
+              }
+            })
+          });
+        });
+      });
+    })
+  })
+
+  it('can filter through hasMany connector', function(done) {
+    var User = this.sequelize.define('User', {username: DataTypes.STRING })
+      , Project = this.sequelize.define('Project', { title: DataTypes.STRING })
+
+    Project.hasMany(User);
+    User.hasMany(Project)
+
+    this.sequelize.sync({ force: true }).success(function() {
+      User.bulkCreate([{
+        username: 'leia'
+      }, {
+        username: 'vader'
+      }]).success(function() {
+        Project.bulkCreate([{
+          title: 'republic'
+        },{
+          title: 'empire'
+        }]).success(function() {
+          User.find(1).success(function(user){
+            Project.find(1).success(function(project){
+              user.setProjects([project]).success(function(){
+
+                User.find(2).success(function(user){
+                  Project.find(2).success(function(project){
+                    user.setProjects([project]).success(function(){
+                      User.findAll({
+                        where: {
+                          'projects.title': 'republic'
+                        }
+                      }).success(function(users){
+                        try{
+                          expect(users.length).to.be.equal(1);
+                          expect(users[0].username).to.be.equal('leia');
+                          done();
+                        }catch(e){
+                          done(e);
+                        }
+                      })
+                    });
+                  });
+                });
+
+              });
+            });
+          });
+        });
+      });
+    })
+  })
+})

test/config/config.js

@@ -38,5 +38,17 @@ module.exports = {
       maxConnections: process.env.SEQ_PG_POOL_MAX  || process.env.SEQ_POOL_MAX  || 5,
       maxIdleTime:    process.env.SEQ_PG_POOL_IDLE || process.env.SEQ_POOL_IDLE || 3000
     }
+  },
+
+  mariadb: {
+    database: process.env.SEQ_MYSQL_DB   || process.env.SEQ_DB   || 'sequelize_test',
+    username: process.env.SEQ_MYSQL_USER || process.env.SEQ_USER || "root",
+    password: process.env.SEQ_MYSQL_PW   || process.env.SEQ_PW   || null,
+    host:     process.env.SEQ_MYSQL_HOST || process.env.SEQ_HOST || '127.0.0.1',
+    port:     process.env.SEQ_MYSQL_PORT || process.env.SEQ_PORT || 3306,
+    pool:     {
+      maxConnections: process.env.SEQ_MYSQL_POOL_MAX  || process.env.SEQ_POOL_MAX  || 1,
+      maxIdleTime:    process.env.SEQ_MYSQL_POOL_IDLE || process.env.SEQ_POOL_IDLE || 3000
+    }
   }
 }

test/dao.test.js

@@ -449,7 +449,6 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
 
     it("should update read only attributes as well (updatedAt)", function(done) {
       var self = this
-      this.timeout = 2000
 
       this.User.create({ username: 'John Doe' }).complete(function(err, originalUser) {
         var originallyUpdatedAt = originalUser.updatedAt
@@ -565,8 +564,6 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
   })
 
   describe('save', function() {
-    this.timeout(3000) // for update timestamp
-
     it('only updates fields in passed array', function(done) {
       var self   = this
         , userId = null
@@ -1035,7 +1032,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
               if (dialect === "postgres" || dialect === "postgres-native") {
                 expect(sql).to.equal('DELETE FROM "UserDestroys" WHERE "newId" IN (SELECT "newId" FROM "UserDestroys" WHERE "newId"=\'123ABC\' LIMIT 1)')
               }
-              else if (dialect === "mysql") {
+              else if (Support.dialectIsMySQL()) {
                 expect(sql).to.equal("DELETE FROM `UserDestroys` WHERE `newId`='123ABC' LIMIT 1")
               } else {
                 expect(sql).to.equal("DELETE FROM `UserDestroys` WHERE `newId`='123ABC'")
@@ -1117,6 +1114,25 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
         })
       })
     })
+    it("returns null for null, undefined, and unset boolean values", function(done) {
+      var Setting = this.sequelize.define('SettingHelper', {
+        setting_key: DataTypes.STRING,
+          bool_value: { type: DataTypes.BOOLEAN, allowNull: true },
+          bool_value2: { type: DataTypes.BOOLEAN, allowNull: true },
+          bool_value3: { type: DataTypes.BOOLEAN, allowNull: true }
+      }, { timestamps: false, logging: false })
+
+      Setting.sync({ force: true }).success(function() {
+        Setting.create({ setting_key: 'test', bool_value: null, bool_value2: undefined }).success(function() {
+          Setting.find({ where: { setting_key: 'test' } }).success(function(setting) {
+            expect(setting.bool_value).to.equal(null)
+            expect(setting.bool_value2).to.equal(null)
+            expect(setting.bool_value3).to.equal(null)
+            done()
+          })
+        })
+      })
+    })
   })
 
   describe('equals', function() {

test/mysql/associations.test.js

@@ -7,7 +7,7 @@ var chai      = require('chai')
 
 chai.Assertion.includeStack = true
 
-if (dialect.match(/^mysql/)) {
+if (Support.dialectIsMySQL()) {
   describe('[MYSQL Specific] Associations', function() {
     describe('many-to-many', function() {
       describe('where tables have the same prefix', function() {

test/mysql/connector-manager.test.js

@@ -7,10 +7,8 @@ var chai      = require('chai')
 
 chai.Assertion.includeStack = true
 
-if (dialect.match(/^mysql/)) {
+if (Support.dialectIsMySQL()) {
   describe('[MYSQL Specific] Connector Manager', function() {
-    this.timeout(10000)
-
     it('works correctly after being idle', function(done) {
       var User = this.sequelize.define('User', { username: DataTypes.STRING })
       , spy = sinon.spy()

test/mysql/dao-factory.test.js

@@ -8,7 +8,7 @@ var chai      = require('chai')
 
 chai.Assertion.includeStack = true
 
-if (dialect.match(/^mysql/)) {
+if (Support.dialectIsMySQL()) {
   describe("[MYSQL Specific] DAOFactory", function () {
     describe('constructor', function() {
       it("handles extended attributes (unique)", function(done) {

test/mysql/query-generator.test.js

@@ -9,7 +9,7 @@ var chai      = require('chai')
 
 chai.Assertion.includeStack = true
 
-if (dialect.match(/^mysql/)) {
+if (Support.dialectIsMySQL()) {
   describe("[MYSQL Specific] QueryGenerator", function () {
     var suites = {
       attributesToSQL: [
@@ -450,10 +450,10 @@ if (dialect.match(/^mysql/)) {
       showIndexQuery: [
         {
           arguments: ['User'],
-          expectation: 'SHOW INDEX FROM User'
+          expectation: 'SHOW INDEX FROM `User`'
         }, {
           arguments: ['User', { database: 'sequelize' }],
-          expectation: "SHOW INDEX FROM User FROM sequelize"
+          expectation: "SHOW INDEX FROM `User` FROM `sequelize`"
         }
       ],
 

test/query-generator.test.js

@@ -18,7 +18,7 @@ describe(Support.getTestDialectTeaser("QueryGenerators"), function () {
 
       User.sync({ force: true }).success(function() {
         var sql = ''
-        if (dialect === "mysql") {
+        if (Support.dialectIsMySQL()) {
           sql = 'SELECT COLUMN_COMMENT as cmt FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = \'' + self.sequelize.config.database + '\' AND TABLE_NAME = \'Users\' AND COLUMN_NAME = \'username\'';
         }
         else if (dialect === "postgres" || dialect === "postgres-native") {

test/sequelize.test.js

@@ -13,7 +13,7 @@ chai.Assertion.includeStack = true
 var qq = function(str) {
   if (dialect == 'postgres' || dialect == 'sqlite') {
     return '"' + str + '"'
-  } else if (dialect == 'mysql') {
+  } else if (Support.dialectIsMySQL()) {
     return '`' + str + '`'
   } else {
     return str
@@ -147,7 +147,7 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () {
       })
     })
 
-    if (dialect == 'mysql') {
+    if (Support.dialectIsMySQL()) {
       it('executes stored procedures', function(done) {
         var self = this
         self.sequelize.query(this.insertQuery).success(function() {

test/sqlite/query-generator.test.js

@@ -91,6 +91,10 @@ if (dialect === 'sqlite') {
           expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` VARCHAR(255), `name` VARCHAR(255));"
         },
         {
+          arguments: ['myTable', {title: 'VARCHAR(255) BINARY', number: 'INTEGER(5) UNSIGNED'}],
+          expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` VARCHAR BINARY(255), `number` INTEGER UNSIGNED(5));"
+        },
+        {
           arguments: ['myTable', {title: 'ENUM("A", "B", "C")', name: 'VARCHAR(255)'}],
           expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` ENUM(\"A\", \"B\", \"C\"), `name` VARCHAR(255));"
         },

test/support.js

@@ -57,7 +57,7 @@ var Support = {
   },
 
   getSequelizeInstance: function(db, user, pass, options) {
-    options = options || {};
+    options = options || {}
     options.dialect = options.dialect || this.getTestDialect()
     return new Sequelize(db, user, pass, options)
   },
@@ -101,6 +101,19 @@ var Support = {
     return envDialect
   },
 
+  dialectIsMySQL: function(strict) {
+    var envDialect = process.env.DIALECT || 'mysql'
+    if (strict === undefined) {
+      strict = false
+    }
+
+    if (strict) {
+      return envDialect === 'mysql'
+    } else {
+      return ['mysql', 'mariadb'].indexOf(envDialect) !== -1
+    }
+  },
+
   getTestDialectTeaser: function(moduleName) {
     var dialect = this.getTestDialect()
 
@@ -128,6 +141,7 @@ before(function(done) {
 
 beforeEach(function(done) {
   this.sequelize = sequelize
+
   Support.clearDatabase(this.sequelize, function() {
     done()
   })