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

.travis.yml

@@ -17,4 +17,3 @@ language: node_js
 node_js:
 node_js:
   - 0.6
   - 0.6
   - 0.8
   - 0.8
-

lib/dialects/postgres/query-generator.js

@@ -243,6 +243,8 @@ module.exports = (function() {
       options = options || {}
       options = options || {}
       options.limit = options.limit || 1
       options.limit = options.limit || 1
 
 
+      primaryKeys[tableName] = primaryKeys[tableName] || [];
+
       var query = "DELETE FROM <%= table %> WHERE <%= primaryKeys %> IN (SELECT <%= primaryKeysSelection %> FROM <%= table %> WHERE <%= where %> LIMIT <%= limit %>)"
       var query = "DELETE FROM <%= table %> WHERE <%= primaryKeys %> IN (SELECT <%= primaryKeysSelection %> FROM <%= table %> WHERE <%= where %> LIMIT <%= limit %>)"
 
 
       var pks;
       var pks;