From 722623dab397427df7a99b7aeefe4356cadcce25 Mon Sep 17 00:00:00 2001 From: Nick Kallen Date: Sun, 13 Apr 2008 19:55:07 -0700 Subject: adding limit options to update and destroy --- lib/active_relation/relations/deletion.rb | 3 ++- lib/active_relation/relations/update.rb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/active_relation/relations/deletion.rb b/lib/active_relation/relations/deletion.rb index 1b94df8729..f1d121d68f 100644 --- a/lib/active_relation/relations/deletion.rb +++ b/lib/active_relation/relations/deletion.rb @@ -8,7 +8,8 @@ module ActiveRelation [ "DELETE", "FROM #{table_sql}", - ("WHERE #{selects.collect(&:to_sql).join('\n\tAND ')}" unless selects.blank?) + ("WHERE #{selects.collect(&:to_sql).join('\n\tAND ')}" unless selects.blank? ), + ("LIMIT #{taken}" unless taken.blank? ), ].compact.join("\n") end diff --git a/lib/active_relation/relations/update.rb b/lib/active_relation/relations/update.rb index 5a7be31290..6262ead187 100644 --- a/lib/active_relation/relations/update.rb +++ b/lib/active_relation/relations/update.rb @@ -12,7 +12,8 @@ module ActiveRelation assignments.collect do |attribute, value| "#{value.format(attribute)} = #{attribute.format(value)}" end.join(",\n"), - ("WHERE #{selects.collect(&:to_sql).join('\n\tAND ')}" unless selects.blank?) + ("WHERE #{selects.collect(&:to_sql).join('\n\tAND ')}" unless selects.blank? ), + ("LIMIT #{taken}" unless taken.blank? ) ].join("\n") end -- cgit v1.2.3