Merge pull request #2678 from mbroadst/supports-upserts

add dialect checks for upsert support

lib/dialects/abstract/index.js

@@ -34,6 +34,7 @@ AbstractDialect.prototype.supports = {
   schemas: false,
   schemas: false,
   transactions: true,
   transactions: true,
   migrations: true,
   migrations: true,
+  upserts: true,
   constraints: {
   constraints: {
     restrict: true
     restrict: true
   },
   },

test/dao-factory/update.test.js

@@ -12,7 +12,8 @@ var chai      = require('chai')
   , dialect   = Support.getTestDialect()
   , dialect   = Support.getTestDialect()
   , datetime  = require('chai-datetime')
   , datetime  = require('chai-datetime')
   , _         = require('lodash')
   , _         = require('lodash')
-  , assert    = require('assert');
+  , assert    = require('assert')
+  , current   = Support.sequelize;
 
 
 chai.use(datetime);
 chai.use(datetime);
 chai.config.includeStack = true;
 chai.config.includeStack = true;
@@ -40,6 +41,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
     this.clock.restore();
     this.clock.restore();
   });
   });
 
 
+  if (current.dialect.supports.upserts) {
     describe('upsert', function () {
     describe('upsert', function () {
       it('works with upsert on id', function () {
       it('works with upsert on id', function () {
         return this.User.upsert({ id: 42, username: 'john' }).bind(this).then(function (created) {
         return this.User.upsert({ id: 42, username: 'john' }).bind(this).then(function (created) {
@@ -91,4 +93,6 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
         });
         });
       });
       });
     });
     });
+  }
+
 });
 });