Merge branch 'master' into milestones/2.0.0

.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

@@ -19,6 +19,8 @@ test:
 	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

changelog.md

@@ -85,6 +85,7 @@
 - [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.
 - [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/dao-factory.js

@@ -1016,7 +1016,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: [] })
@@ -1029,6 +1029,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) {

lib/dao.js

@@ -132,7 +132,7 @@ 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

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/mysql/query-generator.js

 var Utils     = require("../../utils")
   , DataTypes = require("../../data-types")
-  , SqlString = require("../../sql-string")
   , util      = require("util")
 
 module.exports = (function() {

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'))

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, next) {
             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
 
@@ -244,11 +246,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)
     }

package.json

@@ -57,7 +57,8 @@
     "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/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-factory.test.js

@@ -440,7 +440,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
   describe('create', function() {
     it('is possible to use casting when creating an instance', function (done) {
       var self = this
-        , type = dialect === "mysql" ? 'signed' : 'integer'
+        , type = Support.dialectIsMySQL() ? 'signed' : 'integer'
         , _done = _.after(2, function() {
           done()
         })
@@ -466,14 +466,14 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
           done()
         })
 
-      if (dialect === "mysql") {
+      if (Support.dialectIsMySQL()) {
         type = this.sequelize.cast(this.sequelize.cast(this.sequelize.literal('1-2'), 'unsigned'), 'signed')
       }
 
       this.User.create({
         intVal: type
       }).on('sql', function (sql) {
-        if (dialect === "mysql") {
+        if (Support.dialectIsMySQL()) {
           expect(sql).to.contain('CAST(CAST(1-2 AS UNSIGNED) AS SIGNED)')
         } else {
           expect(sql).to.contain('CAST(CAST(1-2 AS INTEGER) AS INTEGER)')
@@ -492,7 +492,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
       var self = this
 
       this.User.create({
-        intVal: this.sequelize.literal('CAST(1-2 AS ' + (dialect === "mysql" ? 'SIGNED' : 'INTEGER') + ')')
+        intVal: this.sequelize.literal('CAST(1-2 AS ' + (Support.dialectIsMySQL() ? 'SIGNED' : 'INTEGER') + ')')
       }).success(function (user) {
         self.User.find(user.id).success(function (user) {
           expect(user.intVal).to.equal(-1)
@@ -505,7 +505,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
       var self = this
 
       this.User.create({
-        intVal: this.sequelize.literal(this.sequelize.cast('1-2', (dialect === "mysql" ? 'SIGNED' : 'INTEGER')))
+        intVal: this.sequelize.literal(this.sequelize.cast('1-2', (Support.dialectIsMySQL() ? 'SIGNED' : 'INTEGER')))
       }).success(function (user) {
         self.User.find(user.id).success(function (user) {
           expect(user.intVal).to.equal(-1)
@@ -580,7 +580,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
     })
 
     it("casts empty arrays correctly for postgresql insert", function(done) {
-      if (dialect !== "postgres" && dialect !== "postgresql-native") {
+      if (dialect !== "postgres") {
         expect('').to.equal('')
         return done()
       }
@@ -599,7 +599,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
       })
     })
     it("casts empty array correct for postgres update", function(done) {
-      if (dialect !== "postgres" && dialect !== "postgresql-native") {
+      if (dialect !== "postgres") {
         expect('').to.equal('')
         return done()
       }
@@ -636,7 +636,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
             if (dialect === "sqlite") {
               expect(err.message).to.match(/.*SQLITE_CONSTRAINT.*/)
             }
-            else if (dialect === "mysql") {
+            else if (Support.dialectIsMySQL()) {
               expect(err.message).to.match(/.*Duplicate\ entry.*/)
             } else {
               expect(err.message).to.match(/.*duplicate\ key\ value.*/)
@@ -660,7 +660,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
         UserNull.create({ username: 'foo2', smth: null }).error(function(err) {
           expect(err).to.exist
 
-          if (dialect === "mysql") {
+          if (Support.dialectIsMySQL()) {
             // We need to allow two different errors for MySQL, see:
             // http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.html#sqlmode_strict_trans_tables
             expect(err.message).to.match(/(Column 'smth' cannot be null|Field 'smth' doesn't have a default value)/)
@@ -678,7 +678,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
               if (dialect === "sqlite") {
                 expect(err.message).to.match(/.*SQLITE_CONSTRAINT.*/)
               }
-              else if (dialect === "mysql") {
+              else if (Support.dialectIsMySQL()) {
                 expect(err.message).to.match(/Duplicate entry 'foo' for key 'username'/)
               } else {
                 expect(err.message).to.match(/.*duplicate key value violates unique constraint.*/)
@@ -1487,7 +1487,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
 
     it('should be able to handle false/true values just fine...', function(done) {
       var User = this.User
-        , escapeChar = (dialect === "postgres" || dialect === "postgres-native") ? '"' : '`'
+        , escapeChar = (dialect === "postgres") ? '"' : '`'
 
       User.bulkCreate([
         {username: 'boo5', aBool: false},
@@ -1508,7 +1508,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
 
     it('should be able to handle false/true values through associations as well...', function(done) {
       var User = this.User
-        , escapeChar = (dialect === "postgres" || dialect === "postgres-native") ? '"' : '`'
+        , escapeChar = (dialect === "postgres") ? '"' : '`'
       var Passports = this.sequelize.define('Passports', {
         isActive: Sequelize.BOOLEAN
       })
@@ -3626,12 +3626,12 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
         expect(schemas[0]).to.be.instanceof(Array)
         // sqlite & MySQL doesn't actually create schemas unless Model.sync() is called
         // Postgres supports schemas natively
-        expect(schemas[0]).to.have.length((dialect === "postgres" || dialect === "postgres-native" ? 2 : 1))
+        expect(schemas[0]).to.have.length((dialect === "postgres" ? 2 : 1))
         done()
       })
     })
 
-    if (dialect === "mysql" || dialect === "sqlite") {
+    if (Support.dialectIsMySQL() || dialect === "sqlite") {
       it("should take schemaDelimiter into account if applicable", function(done){
         var UserSpecialUnderscore = this.sequelize.define('UserSpecialUnderscore', {age: Sequelize.INTEGER}, {schema: 'hello', schemaDelimiter: '_'})
         var UserSpecialDblUnderscore = this.sequelize.define('UserSpecialDblUnderscore', {age: Sequelize.INTEGER})
@@ -3665,26 +3665,26 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
         UserPublic.schema('special').sync({ force: true }).success(function() {
           self.sequelize.queryInterface.describeTable('Publics')
           .on('sql', function(sql) {
-            if (dialect === "sqlite" || dialect === "mysql") {
+            if (dialect === "sqlite" || Support.dialectIsMySQL()) {
               expect(sql).to.not.contain('special')
               _done()
             }
           })
           .success(function(table) {
-            if (dialect === "postgres" || dialect === "postgres-native") {
+            if (dialect === "postgres") {
               expect(table.id.defaultValue).to.not.contain('special')
               _done()
             }
 
             self.sequelize.queryInterface.describeTable('Publics', 'special')
             .on('sql', function(sql) {
-              if (dialect === "sqlite" || dialect === "mysql") {
+              if (dialect === "sqlite" || Support.dialectIsMySQL()) {
                 expect(sql).to.contain('special')
                 _done()
               }
             })
             .success(function(table) {
-              if (dialect === "postgres" || dialect === "postgres-native") {
+              if (dialect === "postgres") {
                 expect(table.id.defaultValue).to.contain('special')
                 _done()
               }
@@ -3814,7 +3814,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
       Post.sync().on('sql', function(sql) {
         if (dialect === 'postgres') {
           expect(sql).to.match(/"authorId" INTEGER REFERENCES "authors" \("id"\)/)
-        } else if (dialect === 'mysql') {
+        } else if (Support.dialectIsMySQL()) {
           expect(sql).to.match(/FOREIGN KEY \(`authorId`\) REFERENCES `authors` \(`id`\)/)
         } else if (dialect === 'sqlite') {
           expect(sql).to.match(/`authorId` INTEGER REFERENCES `authors` \(`id`\)/)
@@ -3844,7 +3844,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
       Post.sync().on('sql', function(sql) {
         if (dialect === 'postgres') {
           expect(sql).to.match(/"authorId" INTEGER REFERENCES "authors" \("id"\)/)
-        } else if (dialect === 'mysql') {
+        } else if (Support.dialectIsMySQL()) {
           expect(sql).to.match(/FOREIGN KEY \(`authorId`\) REFERENCES `authors` \(`id`\)/)
         } else if (dialect === 'sqlite') {
           expect(sql).to.match(/`authorId` INTEGER REFERENCES `authors` \(`id`\)/)
@@ -3882,8 +3882,10 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
           done()
         }
       }).error(function(err) {
-        if (dialect === 'mysql') {
+        if (Support.dialectIsMySQL(true)) {
           expect(err.message).to.match(/ER_CANNOT_ADD_FOREIGN|ER_CANT_CREATE_TABLE/)
+        } else if (dialect === 'mariadb') {
+          expect(err.message).to.match(/Can\'t create table/)
         } else if (dialect === 'sqlite') {
           // the parser should not end up here ... see above
           expect(1).to.equal(2)
@@ -3913,7 +3915,9 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
 
     describe("dataset", function() {
       it("returns a node-sql instance with the correct dialect", function() {
-        expect(this.User.dataset().sql.dialectName).to.equal(dialect)
+        var _dialect = dialect === 'mariadb' ? 'mysql' : dialect
+
+        expect(this.User.dataset().sql.dialectName).to.equal(_dialect)
       })
 
       it("allows me to generate sql queries", function() {
@@ -3936,6 +3940,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
         var sql    = this.User.select("username").toSql()
         var sqlMap = {
           postgres: 'SELECT username FROM "' + this.User.tableName + '";',
+          mariadb: 'SELECT username FROM `' + this.User.tableName + '`;',
           mysql:    'SELECT username FROM `' + this.User.tableName + '`;',
           sqlite:   'SELECT username FROM "' + this.User.tableName + '";'
         }
@@ -3946,6 +3951,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
         var sql    = this.User.select("username").select("firstName").group("username").toSql()
         var sqlMap = {
           postgres: 'SELECT username, firstName FROM "' + this.User.tableName + '" GROUP BY username;',
+          mariadb:    'SELECT username, firstName FROM `' + this.User.tableName + '` GROUP BY username;',
           mysql:    'SELECT username, firstName FROM `' + this.User.tableName + '` GROUP BY username;',
           sqlite:   'SELECT username, firstName FROM "' + this.User.tableName + '" GROUP BY username;'
         }

test/dao.test.js

@@ -1032,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'")

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

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: [

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

@@ -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()