using in memory relations as results from sql relation

Conflicts:

	lib/arel/algebra/primitives/expression.rb
	lib/arel/algebra/relations/relation.rb

2 files changed, 11 insertions, 3 deletions

diff --git a/spec/arel/algebra/unit/primitives/attribute_spec.rb b/spec/arel/algebra/unit/primitives/attribute_spec.rb
index bab9fad3d5..dcac5abf65 100644
--- a/spec/arel/algebra/unit/primitives/attribute_spec.rb
+++ b/spec/arel/algebra/unit/primitives/attribute_spec.rb
@@ -26,8 +26,16 @@ module Arel
       end
     
       describe '#to_attribute' do
-        it "returns self" do
-          @attribute.to_attribute.should == @attribute
+        describe 'when the given relation is the same as the attributes relation' do
+          it "returns self" do
+            @attribute.to_attribute(@relation).should == @attribute
+          end
+        end
+        
+        describe 'when the given relation differs from the attributes relation' do
+          it 'binds to the new relation' do
+            @attribute.to_attribute(new_relation = @relation.alias).should == @attribute.bind(new_relation)
+          end
         end
       end
     end
diff --git a/spec/arel/algebra/unit/primitives/expression_spec.rb b/spec/arel/algebra/unit/primitives/expression_spec.rb
index 10bdb56302..dfd2100048 100644
--- a/spec/arel/algebra/unit/primitives/expression_spec.rb
+++ b/spec/arel/algebra/unit/primitives/expression_spec.rb
@@ -31,7 +31,7 @@ module Arel
       
       describe '#to_attribute' do
         it "manufactures an attribute with the expression as an ancestor" do
-          @expression.to_attribute.should == Attribute.new(@expression.relation, @expression.alias, :ancestor => @expression)
+          @expression.to_attribute(@relation).should == Attribute.new(@relation, @expression.alias, :ancestor => @expression)
         end
       end
     end