attribute disambiguation

1 files changed, 25 insertions, 8 deletions

diff --git a/spec/arel/unit/relations/join_spec.rb b/spec/arel/unit/relations/join_spec.rb
index f9d0d9561e..12b7d7a593 100644
--- a/spec/arel/unit/relations/join_spec.rb
+++ b/spec/arel/unit/relations/join_spec.rb
@@ -145,14 +145,31 @@ module Arel
     end
     
     describe 'when joining aliased relations' do
-      it 'aliases the table and attributes properly' do
-        aliased_relation = @relation1.as(:alias)
-        @relation1.join(aliased_relation).on(@relation1[:id].eq(aliased_relation[:id])).to_sql.should be_like("
-          SELECT `users`.`id`, `users`.`name`, `alias`.`id`, `alias`.`name`
-          FROM `users`
-            INNER JOIN `users` AS `alias`
-              ON `users`.`id` = `alias`.`id`
-        ")
+      before do
+        @aliased_relation = @relation1.as(:alias)
+      end
+      
+      describe '#to_sql' do
+        it 'aliases the table and attributes properly' do
+          @relation1.join(@aliased_relation).on(@relation1[:id].eq(@aliased_relation[:id])).to_sql.should be_like("
+            SELECT `users`.`id`, `users`.`name`, `alias`.`id`, `alias`.`name`
+            FROM `users`
+              INNER JOIN `users` AS `alias`
+                ON `users`.`id` = `alias`.`id`
+          ")
+        end
+      end
+      
+      describe 'when joining the same relation to itself' do
+        describe '[]' do
+          describe 'when given an attribute belonging to both sub-relations' do
+            it '' do
+              relation = @relation1.join(@aliased_relation).on(@relation1[:id].eq(@aliased_relation[:id]))
+              relation[@relation1[:id]].ancestor.should == @relation1[:id]
+              relation[@aliased_relation[:id]].ancestor.should == @aliased_relation[:id]
+            end
+          end
+        end
       end
     end