Merge branch 'Costent-master'

lib/data-types.js

+var STRING = function(length, binary) {
+  if (this instanceof STRING) {
+    this._binary = !!binary;
+    if (typeof length === 'number') {
+      this._length = length;
+    } else {
+      this._length = 255;
+    }
+  } else {
+    return new STRING(length, binary);
+  }
+};
+
+STRING.prototype = {
+  get BINARY() {
+    this._binary = true;
+    return this;
+  },
+  get type() {
+    return this.toString();
+  },
+  toString: function() {
+    return 'VARCHAR(' + this._length + ')' + ((this._binary) ? ' BINARY' : '');
+  }
+};
+
+Object.defineProperty(STRING, 'BINARY', {
+  get: function() {
+    return new STRING(undefined, true);
+  }
+});
+
+var INTEGER = function() {
+  return INTEGER.prototype.construct.apply(this, [INTEGER].concat(Array.prototype.slice.apply(arguments)));
+};
+
+var BIGINT = function() {
+  return BIGINT.prototype.construct.apply(this, [BIGINT].concat(Array.prototype.slice.apply(arguments)));
+};
+
+var FLOAT = function() {
+  return FLOAT.prototype.construct.apply(this, [FLOAT].concat(Array.prototype.slice.apply(arguments)));
+};
+
+FLOAT._type = FLOAT;
+FLOAT._typeName = 'FLOAT';
+INTEGER._type = INTEGER;
+INTEGER._typeName = 'INTEGER';
+BIGINT._type = BIGINT;
+BIGINT._typeName = 'BIGINT';
+STRING._type = STRING;
+STRING._typeName = 'VARCHAR';
+
+STRING.toString = INTEGER.toString = FLOAT.toString = BIGINT.toString = function() {
+  return new this._type().toString();
+};
+
+FLOAT.prototype = BIGINT.prototype = INTEGER.prototype = {
+
+  construct: function(RealType, length, decimals, unsigned, zerofill) {
+    if (this instanceof RealType) {
+      this._typeName = RealType._typeName;
+      this._unsigned = !!unsigned;
+      this._zerofill = !!zerofill;
+      if (typeof length === 'number') {
+        this._length = length;
+      }
+      if (typeof decimals === 'number') {
+        this._decimals = decimals;
+      }
+    } else {
+      return new RealType(length, decimals, unsigned, zerofill);
+    }
+  },
+
+  get type() {
+    return this.toString();
+  },
+
+  get UNSIGNED() {
+    this._unsigned = true;
+    return this;
+  },
+
+  get ZEROFILL() {
+    this._zerofill = true;
+    return this;
+  },
+
+  toString: function() {
+    var result = this._typeName;
+    if (this._length) {
+      result += '(' + this._length;
+      if (typeof this._decimals === 'number') {
+        result += ',' + this._decimals;
+      }
+      result += ')';
+    }
+    if (this._unsigned) {
+      result += ' UNSIGNED';
+    }
+    if (this._zerofill) {
+      result += ' ZEROFILL';
+    }
+    return result;
+  }
+};
+
+var unsignedDesc = {
+  get: function() {
+    return new this._type(undefined, undefined, true);
+  }
+};
+
+var zerofillDesc = {
+  get: function() {
+    return new this._type(undefined, undefined, undefined, true);
+  }
+};
+
+var typeDesc = {
+  get: function() {
+    return new this._type().toString();
+  }
+};
+
+Object.defineProperty(STRING,  'type', typeDesc);
+Object.defineProperty(INTEGER, 'type', typeDesc);
+Object.defineProperty(BIGINT,  'type', typeDesc);
+Object.defineProperty(FLOAT,   'type', typeDesc);
+
+Object.defineProperty(INTEGER, 'UNSIGNED', unsignedDesc);
+Object.defineProperty(BIGINT,  'UNSIGNED', unsignedDesc);
+Object.defineProperty(FLOAT,   'UNSIGNED', unsignedDesc);
+
+Object.defineProperty(INTEGER, 'ZEROFILL', zerofillDesc);
+Object.defineProperty(BIGINT,  'ZEROFILL', zerofillDesc);
+Object.defineProperty(FLOAT,   'ZEROFILL', zerofillDesc);
+
 module.exports = {
-  STRING: 'VARCHAR(255)',
+  STRING: STRING,
+
   TEXT: 'TEXT',
-  INTEGER: 'INTEGER',
-  BIGINT:  'BIGINT',
+  INTEGER: INTEGER,
+  BIGINT:  BIGINT,
   DATE: 'DATETIME',
   BOOLEAN: 'TINYINT(1)',
-  FLOAT: 'FLOAT',
+  FLOAT: FLOAT,
   NOW: 'NOW',
 
   get ENUM() {

spec/data-types.spec.js

@@ -7,7 +7,7 @@ if(typeof require === 'function') {
 
 buster.spec.expose()
 
-describe(Helpers.getTestDialectTeaser('Data types'), function() {
+describe(Helpers.getTestDialectTeaser('DataTypes'), function() {
   it('should return DECIMAL for the default decimal type', function() {
     expect(Sequelize.DECIMAL).toEqual('DECIMAL');
   });
@@ -15,4 +15,52 @@ describe(Helpers.getTestDialectTeaser('Data types'), function() {
   it('should return DECIMAL(10,2) for the default decimal type with arguments', function() {
     expect(Sequelize.DECIMAL(10, 2)).toEqual('DECIMAL(10,2)');
   });
-});
+
+  var tests = [
+    [Sequelize.STRING, 'STRING', 'VARCHAR(255)'],
+    [Sequelize.STRING(1234), 'STRING(1234)', 'VARCHAR(1234)'],
+    [Sequelize.STRING(1234).BINARY, 'STRING(1234).BINARY', 'VARCHAR(1234) BINARY'],
+    [Sequelize.STRING.BINARY, 'STRING.BINARY', 'VARCHAR(255) BINARY'],
+
+    [Sequelize.TEXT, 'TEXT', 'TEXT'],
+    [Sequelize.DATE, 'DATE', 'DATETIME'],
+    [Sequelize.NOW, 'NOW', 'NOW'],
+    [Sequelize.BOOLEAN, 'BOOLEAN', 'TINYINT(1)'],
+
+    [Sequelize.INTEGER, 'INTEGER', 'INTEGER'],
+    [Sequelize.INTEGER.UNSIGNED, 'INTEGER.UNSIGNED', 'INTEGER UNSIGNED'],
+    [Sequelize.INTEGER(11), 'INTEGER(11)','INTEGER(11)'],
+    [Sequelize.INTEGER(11).UNSIGNED, 'INTEGER(11).UNSIGNED', 'INTEGER(11) UNSIGNED'],
+    [Sequelize.INTEGER(11).UNSIGNED.ZEROFILL,'INTEGER(11).UNSIGNED.ZEROFILL','INTEGER(11) UNSIGNED ZEROFILL'],
+    [Sequelize.INTEGER(11).ZEROFILL,'INTEGER(11).ZEROFILL', 'INTEGER(11) ZEROFILL'],
+    [Sequelize.INTEGER(11).ZEROFILL.UNSIGNED,'INTEGER(11).ZEROFILL.UNSIGNED', 'INTEGER(11) UNSIGNED ZEROFILL'],
+
+    [Sequelize.BIGINT, 'BIGINT', 'BIGINT'],
+    [Sequelize.BIGINT.UNSIGNED, 'BIGINT.UNSIGNED', 'BIGINT UNSIGNED'],
+    [Sequelize.BIGINT(11), 'BIGINT(11)','BIGINT(11)'],
+    [Sequelize.BIGINT(11).UNSIGNED, 'BIGINT(11).UNSIGNED', 'BIGINT(11) UNSIGNED'],
+    [Sequelize.BIGINT(11).UNSIGNED.ZEROFILL, 'BIGINT(11).UNSIGNED.ZEROFILL','BIGINT(11) UNSIGNED ZEROFILL'],
+    [Sequelize.BIGINT(11).ZEROFILL, 'BIGINT(11).ZEROFILL', 'BIGINT(11) ZEROFILL'],
+    [Sequelize.BIGINT(11).ZEROFILL.UNSIGNED, 'BIGINT(11).ZEROFILL.UNSIGNED', 'BIGINT(11) UNSIGNED ZEROFILL'],
+
+    [Sequelize.FLOAT, 'FLOAT', 'FLOAT'],
+    [Sequelize.FLOAT.UNSIGNED, 'FLOAT.UNSIGNED', 'FLOAT UNSIGNED'],
+    [Sequelize.FLOAT(11), 'FLOAT(11)','FLOAT(11)'],
+    [Sequelize.FLOAT(11).UNSIGNED, 'FLOAT(11).UNSIGNED', 'FLOAT(11) UNSIGNED'],
+    [Sequelize.FLOAT(11).UNSIGNED.ZEROFILL,'FLOAT(11).UNSIGNED.ZEROFILL','FLOAT(11) UNSIGNED ZEROFILL'],
+    [Sequelize.FLOAT(11).ZEROFILL,'FLOAT(11).ZEROFILL', 'FLOAT(11) ZEROFILL'],
+    [Sequelize.FLOAT(11).ZEROFILL.UNSIGNED,'FLOAT(11).ZEROFILL.UNSIGNED', 'FLOAT(11) UNSIGNED ZEROFILL'],
+
+    [Sequelize.FLOAT(11, 12), 'FLOAT(11,12)','FLOAT(11,12)'],
+    [Sequelize.FLOAT(11, 12).UNSIGNED, 'FLOAT(11,12).UNSIGNED', 'FLOAT(11,12) UNSIGNED'],
+    [Sequelize.FLOAT(11, 12).UNSIGNED.ZEROFILL,'FLOAT(11,12).UNSIGNED.ZEROFILL','FLOAT(11,12) UNSIGNED ZEROFILL'],
+    [Sequelize.FLOAT(11, 12).ZEROFILL,'FLOAT(11,12).ZEROFILL', 'FLOAT(11,12) ZEROFILL'],
+    [Sequelize.FLOAT(11, 12).ZEROFILL.UNSIGNED,'FLOAT(11,12).ZEROFILL.UNSIGNED', 'FLOAT(11,12) UNSIGNED ZEROFILL']
+  ]
+
+  tests.forEach(function(test) {
+    it('transforms "' + test[1] + '" to "' + test[2] + '"', function() {
+      expect(test[0]).toEqual(test[2])
+    })
+  })
+})