delete query

lib/sequelize/query-generator.js

@@ -104,14 +104,29 @@ var QueryGenerator = module.exports = {
     return Utils._.template(query)(replacements)
   },
   
-  // TODO
-  deleteQuery: function(tableName, where) {
-    // if(Sequelize.Helper.Hash.isHash(values.where))
-    //   values.where = Sequelize.Helper.SQL.hashToWhereConditions(values.where)
-    //   
-    // query = "DELETE FROM `%{table}` WHERE %{where}"
-    // if(typeof values.limit == 'undefined') query += " LIMIT 1"
-    // else if(values.limit != null) query += " LIMIT " + values.limit
+  /*
+    Returns a deletion query.
+    Parameters:
+      - tableName -> Name of the table
+      - where -> A hash with conditions (e.g. {name: 'foo'}) 
+                 OR an ID as integer
+                 OR a string with conditions (e.g. 'name="foo"').
+                 If you use a string, you have to escape it on your own.
+    Options:
+      - limit -> Maximaum count of lines to delete
+  */
+  deleteQuery: function(tableName, where, options) {
+    options = options || {}
+    options.limit = options.limit || 1
+    
+    var query = "DELETE FROM <%= table %> WHERE <%= where %> LIMIT <%= limit %>"
+    var replacements = {
+      table: Utils.addTicks(tableName),
+      where: QueryGenerator.getWhereConditions(where),
+      limit: client.escape(options.limit)
+    }
+    
+    return Utils._.template(query)(replacements)
   },
   
   getWhereConditions: function(smth) {

test/QueryGenerator/queries.js

@@ -52,5 +52,11 @@ module.exports = {
     )
     eql(QueryGenerator.updateQuery('myTable', {bar: 2}, {name: 'foo'}), "UPDATE `myTable` SET `bar`=2 WHERE `name`='foo'")
     eql(QueryGenerator.updateQuery('myTable', {name: "foo';DROP TABLE myTable;"}, {name: 'foo'}), "UPDATE `myTable` SET `name`='foo\\';DROP TABLE myTable;' WHERE `name`='foo'")
+  },
+  'deleteQuery': function() {
+    eql(QueryGenerator.deleteQuery('myTable', {name: 'foo'}), "DELETE FROM `myTable` WHERE `name`='foo' LIMIT 1")
+    eql(QueryGenerator.deleteQuery('myTable', 1), "DELETE FROM `myTable` WHERE `id`=1 LIMIT 1")
+    eql(QueryGenerator.deleteQuery('myTable', 1, {limit: 10}), "DELETE FROM `myTable` WHERE `id`=1 LIMIT 10")
+    eql(QueryGenerator.deleteQuery('myTable', {name: "foo';DROP TABLE myTable;"}, {limit: 10}), "DELETE FROM `myTable` WHERE `name`='foo\\';DROP TABLE myTable;' LIMIT 10")
   }
 }
\ No newline at end of file