diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-07-26 13:51:54 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-07-26 13:51:54 -0700 |
| commit | 7e4e37eae9ce82d42a10de2917bc97529fa4a4b3 (patch) | |
| tree | c9339d3f9a46fba704536eb012b1b26c4824c28a /lib | |
| parent | 91a66677fa6d3962ad5ab9fd49a9c8bc1cf97ef0 (diff) | |
| download | rails-7e4e37eae9ce82d42a10de2917bc97529fa4a4b3.tar.gz rails-7e4e37eae9ce82d42a10de2917bc97529fa4a4b3.tar.bz2 rails-7e4e37eae9ce82d42a10de2917bc97529fa4a4b3.zip | |
reducing files
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/arel/algebra/relations/utilities/compound.rb | 6 | ||||
| -rw-r--r-- | lib/arel/engines/memory/relations.rb | 1 | ||||
| -rw-r--r-- | lib/arel/engines/memory/relations/compound.rb | 9 |
3 files changed, 5 insertions, 11 deletions
diff --git a/lib/arel/algebra/relations/utilities/compound.rb b/lib/arel/algebra/relations/utilities/compound.rb index 1796008117..31b2159883 100644 --- a/lib/arel/algebra/relations/utilities/compound.rb +++ b/lib/arel/algebra/relations/utilities/compound.rb @@ -4,7 +4,7 @@ module Arel attr_reader :relation delegate :joins, :join?, :inserts, :taken, :skipped, :name, :externalizable?, - :column_for, :sources, :locked, :table_alias, + :column_for, :sources, :locked, :table_alias, :array, :to => :relation def initialize relation @@ -24,6 +24,10 @@ module Arel @attributes ||= relation.attributes.bind(self) end + def unoperated_rows + relation.call.collect { |row| row.bind(self) } + end + def hash @hash ||= :relation.hash end diff --git a/lib/arel/engines/memory/relations.rb b/lib/arel/engines/memory/relations.rb index c67af2d63b..2ab56adb3b 100644 --- a/lib/arel/engines/memory/relations.rb +++ b/lib/arel/engines/memory/relations.rb @@ -1,5 +1,4 @@ require 'arel/engines/memory/relations/array' require 'arel/engines/memory/relations/operations' require 'arel/engines/memory/relations/writes' -require 'arel/engines/memory/relations/compound' diff --git a/lib/arel/engines/memory/relations/compound.rb b/lib/arel/engines/memory/relations/compound.rb deleted file mode 100644 index 0f3c24f9ec..0000000000 --- a/lib/arel/engines/memory/relations/compound.rb +++ /dev/null @@ -1,9 +0,0 @@ -module Arel - class Compound - delegate :array, :to => :relation - - def unoperated_rows - relation.call.collect { |row| row.bind(self) } - end - end -end |