only enable RESTRICT fk constraint tests for supporting dialects

MSSQL doesn't support a RESTRICT fk constraint, so we need a way
to conditionally disable these tests. This change adds an extra
section to dialect.supports indicating support for RESTRICT
constraints. Also changed some cases where RESTRICT wasn't being
explicitly tested but used to test the ability to simply use
constraints (query-interface.test.js)

lib/dialects/abstract/index.js

@@ -11,6 +11,9 @@ AbstractDialect.prototype.supports = {
   'VALUES ()': false,
   'VALUES ()': false,
   'LIMIT ON UPDATE': false,
   'LIMIT ON UPDATE': false,
   schemas: false,
   schemas: false,
+  constraints: {
+    restrict: true
+  },
   index: {
   index: {
     collate: true,
     collate: true,
     length: false,
     length: false,

test/associations/belongs-to.test.js

@@ -6,6 +6,7 @@ var chai      = require('chai')
   , Sequelize = require('../../index')
   , Sequelize = require('../../index')
   , Promise   = Sequelize.Promise
   , Promise   = Sequelize.Promise
   , assert    = require('assert')
   , assert    = require('assert')
+  , current   = Support.sequelize;
 
 
 chai.config.includeStack = true
 chai.config.includeStack = true
 
 
@@ -428,67 +429,70 @@ describe(Support.getTestDialectTeaser("BelongsTo"), function() {
       })
       })
     })
     })
 
 
-    it("can restrict deletes", function(done) {
-      var self = this
-      var Task = this.sequelize.define('Task', { title: DataTypes.STRING })
-        , User = this.sequelize.define('User', { username: DataTypes.STRING })
+    if (current.dialect.supports.constraints.restrict) {
+      it("can restrict deletes", function(done) {
+        var self = this
+        var Task = this.sequelize.define('Task', { title: DataTypes.STRING })
+          , User = this.sequelize.define('User', { username: DataTypes.STRING })
 
 
-      Task.belongsTo(User, {onDelete: 'restrict'})
+        Task.belongsTo(User, {onDelete: 'restrict'})
 
 
-      this.sequelize.sync({ force: true }).success(function() {
-        User.create({ username: 'foo' }).success(function(user) {
-          Task.create({ title: 'task' }).success(function(task) {
-            task.setUser(user).success(function() {
-              // Should fail due to FK restriction
-              user.destroy().catch(self.sequelize.ForeignKeyConstraintError, function(err) {
-                expect(err).to.be.ok;
-                Task.findAll().success(function(tasks) {
-                  expect(tasks).to.have.length(1)
-                  done()
+        this.sequelize.sync({ force: true }).success(function() {
+          User.create({ username: 'foo' }).success(function(user) {
+            Task.create({ title: 'task' }).success(function(task) {
+              task.setUser(user).success(function() {
+                // Should fail due to FK restriction
+                user.destroy().catch(self.sequelize.ForeignKeyConstraintError, function(err) {
+                  expect(err).to.be.ok;
+                  Task.findAll().success(function(tasks) {
+                    expect(tasks).to.have.length(1)
+                    done()
+                  })
                 })
                 })
-              })
-            });
+              });
+            })
           })
           })
         })
         })
       })
       })
-    })
-
-    it("can cascade updates", function(done) {
-      var Task = this.sequelize.define('Task', { title: DataTypes.STRING })
-        , User = this.sequelize.define('User', { username: DataTypes.STRING })
 
 
-      Task.belongsTo(User, {onUpdate: 'cascade'})
-
-      this.sequelize.sync({ force: true }).success(function() {
-        User.create({ username: 'foo' }).success(function(user) {
-          Task.create({ title: 'task' }).success(function(task) {
-            task.setUser(user).success(function() {
+      it("can restrict updates", function(done) {
+        var self = this
+        var Task = this.sequelize.define('Task', { title: DataTypes.STRING })
+          , User = this.sequelize.define('User', { username: DataTypes.STRING })
 
 
-              // Changing the id of a DAO requires a little dance since
-              // the `UPDATE` query generated by `save()` uses `id` in the
-              // `WHERE` clause
+        Task.belongsTo(User, {onUpdate: 'restrict'})
 
 
-              var tableName = user.QueryInterface.QueryGenerator.addSchema(user.Model)
-              user.QueryInterface.update(user, tableName, {id: 999}, user.id)
-              .success(function() {
-                Task.findAll().success(function(tasks) {
-                  expect(tasks).to.have.length(1)
-                  expect(tasks[0].UserId).to.equal(999)
-                  done()
+        this.sequelize.sync({ force: true }).success(function() {
+          User.create({ username: 'foo' }).success(function(user) {
+            Task.create({ title: 'task' }).success(function(task) {
+              task.setUser(user).success(function() {
+
+                // Changing the id of a DAO requires a little dance since
+                // the `UPDATE` query generated by `save()` uses `id` in the
+                // `WHERE` clause
+
+                var tableName = user.QueryInterface.QueryGenerator.addSchema(user.Model)
+                user.QueryInterface.update(user, tableName, {id: 999}, user.id)
+                .catch(self.sequelize.ForeignKeyConstraintError, function() {
+                  // Should fail due to FK restriction
+                  Task.findAll().success(function(tasks) {
+                    expect(tasks).to.have.length(1)
+                    done()
+                  })
                 })
                 })
               })
               })
             })
             })
           })
           })
         })
         })
       })
       })
-    })
 
 
-    it("can restrict updates", function(done) {
-      var self = this
+    }
+
+    it("can cascade updates", function(done) {
       var Task = this.sequelize.define('Task', { title: DataTypes.STRING })
       var Task = this.sequelize.define('Task', { title: DataTypes.STRING })
         , User = this.sequelize.define('User', { username: DataTypes.STRING })
         , User = this.sequelize.define('User', { username: DataTypes.STRING })
 
 
-      Task.belongsTo(User, {onUpdate: 'restrict'})
+      Task.belongsTo(User, {onUpdate: 'cascade'})
 
 
       this.sequelize.sync({ force: true }).success(function() {
       this.sequelize.sync({ force: true }).success(function() {
         User.create({ username: 'foo' }).success(function(user) {
         User.create({ username: 'foo' }).success(function(user) {
@@ -501,10 +505,10 @@ describe(Support.getTestDialectTeaser("BelongsTo"), function() {
 
 
               var tableName = user.QueryInterface.QueryGenerator.addSchema(user.Model)
               var tableName = user.QueryInterface.QueryGenerator.addSchema(user.Model)
               user.QueryInterface.update(user, tableName, {id: 999}, user.id)
               user.QueryInterface.update(user, tableName, {id: 999}, user.id)
-              .catch(self.sequelize.ForeignKeyConstraintError, function() {
-                // Should fail due to FK restriction
+              .success(function() {
                 Task.findAll().success(function(tasks) {
                 Task.findAll().success(function(tasks) {
                   expect(tasks).to.have.length(1)
                   expect(tasks).to.have.length(1)
+                  expect(tasks[0].UserId).to.equal(999)
                   done()
                   done()
                 })
                 })
               })
               })
@@ -513,6 +517,7 @@ describe(Support.getTestDialectTeaser("BelongsTo"), function() {
         })
         })
       })
       })
     })
     })
+
   })
   })
 
 
   describe("Association column", function() {
   describe("Association column", function() {

test/associations/has-one.test.js

@@ -4,6 +4,7 @@ var chai      = require('chai')
   , Support   = require(__dirname + '/../support')
   , Support   = require(__dirname + '/../support')
   , Sequelize = require('../../index')
   , Sequelize = require('../../index')
   , Promise   = Sequelize.Promise
   , Promise   = Sequelize.Promise
+  , current   = Support.sequelize;
 
 
 chai.config.includeStack = true
 chai.config.includeStack = true
 
 
@@ -386,32 +387,6 @@ describe(Support.getTestDialectTeaser("HasOne"), function() {
       })
       })
     })
     })
 
 
-    it("can restrict deletes", function(done) {
-      var self = this
-      var Task = this.sequelize.define('Task', { title: Sequelize.STRING })
-        , User = this.sequelize.define('User', { username: Sequelize.STRING })
-
-      User.hasOne(Task, {onDelete: 'restrict'})
-
-      User.sync({ force: true }).success(function() {
-        Task.sync({ force: true }).success(function() {
-          User.create({ username: 'foo' }).success(function(user) {
-            Task.create({ title: 'task' }).success(function(task) {
-              user.setTask(task).success(function() {
-                user.destroy().catch(self.sequelize.ForeignKeyConstraintError, function() {
-                  // Should fail due to FK restriction
-                  Task.findAll().success(function(tasks) {
-                    expect(tasks).to.have.length(1)
-                    done()
-                  })
-                })
-              })
-            })
-          })
-        })
-      })
-    })
-
     it("can cascade updates", function(done) {
     it("can cascade updates", function(done) {
       var Task = this.sequelize.define('Task', { title: Sequelize.STRING })
       var Task = this.sequelize.define('Task', { title: Sequelize.STRING })
         , User = this.sequelize.define('User', { username: Sequelize.STRING })
         , User = this.sequelize.define('User', { username: Sequelize.STRING })
@@ -444,30 +419,59 @@ describe(Support.getTestDialectTeaser("HasOne"), function() {
       })
       })
     })
     })
 
 
-    it("can restrict updates", function(done) {
-      var self = this
-      var Task = this.sequelize.define('Task', { title: Sequelize.STRING })
-        , User = this.sequelize.define('User', { username: Sequelize.STRING })
+    if (current.dialect.supports.constraints.restrict) {
 
 
-      User.hasOne(Task, {onUpdate: 'restrict'})
+      it("can restrict deletes", function(done) {
+        var self = this
+        var Task = this.sequelize.define('Task', { title: Sequelize.STRING })
+          , User = this.sequelize.define('User', { username: Sequelize.STRING })
 
 
-      User.sync({ force: true }).success(function() {
-        Task.sync({ force: true }).success(function() {
-          User.create({ username: 'foo' }).success(function(user) {
-            Task.create({ title: 'task' }).success(function(task) {
-              user.setTask(task).success(function() {
+        User.hasOne(Task, {onDelete: 'restrict'})
 
 
-                // Changing the id of a DAO requires a little dance since
-                // the `UPDATE` query generated by `save()` uses `id` in the
-                // `WHERE` clause
+        User.sync({ force: true }).success(function() {
+          Task.sync({ force: true }).success(function() {
+            User.create({ username: 'foo' }).success(function(user) {
+              Task.create({ title: 'task' }).success(function(task) {
+                user.setTask(task).success(function() {
+                  user.destroy().catch(self.sequelize.ForeignKeyConstraintError, function() {
+                    // Should fail due to FK restriction
+                    Task.findAll().success(function(tasks) {
+                      expect(tasks).to.have.length(1)
+                      done()
+                    })
+                  })
+                })
+              })
+            })
+          })
+        })
+      })
 
 
-                var tableName = user.QueryInterface.QueryGenerator.addSchema(user.Model)
-                user.QueryInterface.update(user, tableName, {id: 999}, user.id)
-                .catch(self.sequelize.ForeignKeyConstraintError, function() {
-                  // Should fail due to FK restriction
-                  Task.findAll().success(function(tasks) {
-                    expect(tasks).to.have.length(1)
-                    done()
+      it("can restrict updates", function(done) {
+        var self = this
+        var Task = this.sequelize.define('Task', { title: Sequelize.STRING })
+          , User = this.sequelize.define('User', { username: Sequelize.STRING })
+
+        User.hasOne(Task, {onUpdate: 'restrict'})
+
+        User.sync({ force: true }).success(function() {
+          Task.sync({ force: true }).success(function() {
+            User.create({ username: 'foo' }).success(function(user) {
+              Task.create({ title: 'task' }).success(function(task) {
+                user.setTask(task).success(function() {
+
+                  // Changing the id of a DAO requires a little dance since
+                  // the `UPDATE` query generated by `save()` uses `id` in the
+                  // `WHERE` clause
+
+                  var tableName = user.QueryInterface.QueryGenerator.addSchema(user.Model)
+                  user.QueryInterface.update(user, tableName, {id: 999}, user.id)
+                  .catch(self.sequelize.ForeignKeyConstraintError, function() {
+                    // Should fail due to FK restriction
+                    Task.findAll().success(function(tasks) {
+                      expect(tasks).to.have.length(1)
+                      done()
+                    })
                   })
                   })
                 })
                 })
               })
               })
@@ -475,7 +479,8 @@ describe(Support.getTestDialectTeaser("HasOne"), function() {
           })
           })
         })
         })
       })
       })
-    })
+
+    }
 
 
   })
   })
 
 

test/query-interface.test.js

@@ -244,7 +244,7 @@ describe(Support.getTestDialectTeaser("QueryInterface"), function () {
           references: 'level',
           references: 'level',
           referenceKey: 'id',
           referenceKey: 'id',
           onUpdate: 'cascade',
           onUpdate: 'cascade',
-          onDelete: 'restrict'
+          onDelete: 'set null'
         });
         });
       });
       });
     });
     });
@@ -292,7 +292,7 @@ describe(Support.getTestDialectTeaser("QueryInterface"), function () {
             references: 'users',
             references: 'users',
             referenceKey: 'id',
             referenceKey: 'id',
             onUpdate: 'cascade',
             onUpdate: 'cascade',
-            onDelete: 'restrict'
+            onDelete: 'set null'
           },
           },
         })
         })
       })
       })
@@ -308,7 +308,7 @@ describe(Support.getTestDialectTeaser("QueryInterface"), function () {
         if (dialect === "postgres" || dialect === "postgres-native") {
         if (dialect === "postgres" || dialect === "postgres-native") {
           expect(keys).to.have.length(6)
           expect(keys).to.have.length(6)
           expect(keys2).to.have.length(7)
           expect(keys2).to.have.length(7)
-          expect(keys3).to.have.length(8)
+          expect(keys3).to.have.length(7)
         } else if (dialect === "sqlite") {
         } else if (dialect === "sqlite") {
           expect(keys).to.have.length(8)
           expect(keys).to.have.length(8)
         } else if (dialect === "mysql") {
         } else if (dialect === "mysql") {