Handle more data-types in min() and max() that take optional arguments.

lib/query-interface.js

@@ -688,25 +688,15 @@ module.exports = (function() {
 
           if (options && options.dataType) {
             var dataType = options.dataType;
-            if (dataType instanceof DataTypes.DECIMAL) {
-              dataType = DataTypes.DECIMAL;
-            }
 
-            switch (dataType) {
-              case DataTypes.INTEGER:
-              case DataTypes.BIGINT:
-                result = parseInt(result, 10);
-                break;
-              case DataTypes.FLOAT:
-              case DataTypes.DECIMAL:
-                result = parseFloat(result);
-                break;
-              case DataTypes.DATE:
-                result = new Date(result + 'Z');
-                break;
-              case DataTypes.STRING:
-                // Nothing to do, result is already a string.
-                break;
+            if (dataType instanceof DataTypes.DECIMAL || dataType instanceof DataTypes.FLOAT) {
+              result = parseFloat(result);
+            } else if (dataType === DataTypes.INTEGER || dataType instanceof DataTypes.BIGINT) {
+              result = parseInt(result, 10);
+            } else if (dataType === DataTypes.DATE) {
+              result = new Date(result + 'Z');
+            } else if (dataType === DataTypes.STRING) {
+              // Nothing to do, result is already a string.
             }
           }
 

test/data-types.test.js

@@ -6,8 +6,43 @@ var chai      = require('chai')
 chai.Assertion.includeStack = true
 
 describe(Support.getTestDialectTeaser('DataTypes'), function() {
-  it('should return DECIMAL for the default decimal type', function(done) {
-    expect(Sequelize.DECIMAL.toString()).to.equal('DECIMAL')
+  it('should return false when comparing DECIMAL and DECIMAL(10,2)', function(done) {
+    expect(Sequelize.DECIMAL).to.not.equal(Sequelize.DECIMAL(10,2))
+    done()
+  })
+
+  it('DECIMAL(10,2) should be an instance of DECIMAL', function(done) {
+    expect(Sequelize.DECIMAL(10,2)).to.be.an.instanceof(Sequelize.DECIMAL)
+    done()
+  })
+
+  it('should return false when comparing FLOAT and FLOAT(11)', function(done) {
+    expect(Sequelize.FLOAT).to.not.equal(Sequelize.FLOAT(11))
+    done()
+  })
+
+  it('FLOAT(11) should be an instance of FLOAT', function(done) {
+    expect(Sequelize.FLOAT(11)).to.be.an.instanceof(Sequelize.FLOAT)
+    done()
+  })
+
+  it('should return false when comparing STRING and STRING(4096)', function(done) {
+    expect(Sequelize.STRING).to.not.equal(Sequelize.STRING(4096))
+    done()
+  })
+
+  it('STRING(4096) should be an instance of STRING', function(done) {
+    expect(Sequelize.STRING(4096)).to.be.an.instanceof(Sequelize.STRING)
+    done()
+  })
+
+  it('should return false when comparing BIGINT and BIGINT(11)', function(done) {
+    expect(Sequelize.BIGINT).to.not.equal(Sequelize.BIGINT(11))
+    done()
+  })
+
+  it('BIGINT(11) should be an instance of BIGINT', function(done) {
+    expect(Sequelize.BIGINT(11)).to.be.an.instanceof(Sequelize.BIGINT)
     done()
   })