Merge pull request sequelize#2988 from ThankYouMotion/mssqlUUID

UUID datatype mapping for mssql
kkcheungus · Jan 27, 2015 · 3ccca4a · 3ccca4a
2 parents 2cb214b + 8125028
commit 3ccca4a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/lib/dialects/mssql/data-types.js b/lib/dialects/mssql/data-types.js
@@ -5,7 +5,7 @@ var DataTypes = require('../../data-types');
 //drop table Group
 DataTypes.BOOLEAN = 'BIT';
 DataTypes.NOW = 'GETDATE()';
-DataTypes.UUID = 'UNIQUEIDENTIFIER';
+DataTypes.UUID = 'CHAR(36)';
 DataTypes.BLOB = 'VARBINARY(MAX)';
 DataTypes.STRING._typeName = 'NVARCHAR';
 

diff --git a/lib/dialects/mssql/query-generator.js b/lib/dialects/mssql/query-generator.js
@@ -621,6 +621,10 @@ module.exports = (function() {
       dataType = dataType.replace(/BLOB/, 'VARBINARY(MAX)');
     }
 
+    if (Utils._.includes(dataType, 'UUID')) {
+      dataType = dataType.replace(/UUID/, DataTypes.UUID);
+    }
+
     return dataType;
   }
 

diff --git a/test/integration/associations/belongs-to-many.test.js b/test/integration/associations/belongs-to-many.test.js
@@ -727,7 +727,8 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), function() {
       var Beacons = this.sequelize.define('Beacon', {
         id: {
           primaryKey: true,
-          type: DataTypes.UUID
+          type: DataTypes.UUID,
+          defaultValue: DataTypes.UUIDV4
         },
         name: {
           type: DataTypes.STRING

diff --git a/test/integration/associations/has-many.test.js b/test/integration/associations/has-many.test.js
@@ -1485,7 +1485,8 @@ describe(Support.getTestDialectTeaser('HasMany'), function() {
         var Beacons = this.sequelize.define('Beacon', {
           id: {
             primaryKey: true,
-            type: DataTypes.UUID
+            type: DataTypes.UUID,
+            defaultValue: DataTypes.UUIDV4
           },
           name: {
             type: DataTypes.STRING

diff --git a/test/integration/instance.test.js b/test/integration/instance.test.js
@@ -1754,11 +1754,6 @@ describe(Support.getTestDialectTeaser('Instance'), function() {
         var query = { where: { username: 'fnord' }};
 
         self.User.find(query).success(function(user2) {
-          if (dialect === 'mssql') {
-            user1.dataValues.uuidv1 = user1.dataValues.uuidv1.toUpperCase();
-            user1.dataValues.uuidv4 = user1.dataValues.uuidv4.toUpperCase();
-          }
-
           expect(user1.equals(user2)).to.be.true;
           done();
         });