diff options
| -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 |