diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-07-26 17:32:36 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-07-26 17:32:36 -0700 |
| commit | ae6a14251462597ca13f255c02307f5308062214 (patch) | |
| tree | b6c6e480c4109e0fa92dd8769568733b01f9d639 /lib/arel | |
| parent | 4d625d6bd9b56907dcedf14590d0edd083260f0c (diff) | |
| download | rails-ae6a14251462597ca13f255c02307f5308062214.tar.gz rails-ae6a14251462597ca13f255c02307f5308062214.tar.bz2 rails-ae6a14251462597ca13f255c02307f5308062214.zip | |
PERF: a block is never given to this method, so stop checking
Diffstat (limited to 'lib/arel')
| -rw-r--r-- | lib/arel/algebra/relations/relation.rb | 6 | ||||
| -rw-r--r-- | lib/arel/algebra/relations/utilities/compound.rb | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/arel/algebra/relations/relation.rb b/lib/arel/algebra/relations/relation.rb index 34d798837c..b3dccaf8be 100644 --- a/lib/arel/algebra/relations/relation.rb +++ b/lib/arel/algebra/relations/relation.rb @@ -119,9 +119,9 @@ module Arel where project order take skip group from having }.each do |operation_name| class_eval <<-OPERATION, __FILE__, __LINE__ - def #{operation_name}(*arguments, &block) - arguments.all? { |x| x.blank? } && !block_given? ? - self : #{operation_name.capitalize}.new(self, *arguments, &block) + def #{operation_name}(*arguments) + arguments.all? { |x| x.blank? } ? + self : #{operation_name.capitalize}.new(self, *arguments) end OPERATION end diff --git a/lib/arel/algebra/relations/utilities/compound.rb b/lib/arel/algebra/relations/utilities/compound.rb index 31b2159883..dbd9af9d3d 100644 --- a/lib/arel/algebra/relations/utilities/compound.rb +++ b/lib/arel/algebra/relations/utilities/compound.rb @@ -28,6 +28,7 @@ module Arel relation.call.collect { |row| row.bind(self) } end + # FIXME: remove this. :'( def hash @hash ||= :relation.hash end |