Merge branch 'master' of github.com:sequelize/sequelize

lib/dialects/abstract/query-generator.js

@@ -329,6 +329,13 @@ module.exports = (function() {
     },
     },
 
 
     /*
     /*
+      Returns an upsert query.
+    */
+    upsertQuery: function (tableName, insertValues, updateValues, where, rawAttributes, options) {
+      throwMethodUndefined('upsertQuery');
+    },
+
+    /*
       Returns a deletion query.
       Returns a deletion query.
       Parameters:
       Parameters:
         - tableName -> Name of the table
         - tableName -> Name of the table