From 7e4e37eae9ce82d42a10de2917bc97529fa4a4b3 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 26 Jul 2010 13:51:54 -0700 Subject: reducing files --- lib/arel/algebra/relations/utilities/compound.rb | 6 +++++- lib/arel/engines/memory/relations.rb | 1 - lib/arel/engines/memory/relations/compound.rb | 9 --------- 3 files changed, 5 insertions(+), 11 deletions(-) delete mode 100644 lib/arel/engines/memory/relations/compound.rb (limited to 'lib/arel') 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 -- cgit v1.2.3