1 files changed, 9 insertions, 4 deletions
diff --git a/lib/arel/engines/sql/christener.rb b/lib/arel/engines/sql/christener.rb
index a2a2da799a..2c96020554 100644
--- a/lib/arel/engines/sql/christener.rb
+++ b/lib/arel/engines/sql/christener.rb
@@ -1,13 +1,18 @@
 module Arel
   module Sql
     class Christener
-      def name_for(relation)
-        @used_names ||= Hash.new(0)
-        (@relation_names ||= Hash.new do |hash, relation|
+      def initialize
+        # FIXME: this exists because all objects hash the same. :'(
+        @used_names = Hash.new(0)
+        @relation_names = Hash.new do |hash, relation|
           name =  relation.table_alias ? relation.table_alias : relation.name
           @used_names[name] += 1
           hash[relation] = name + (@used_names[name] > 1 ? "_#{@used_names[name]}" : '')
-        end)[relation.table]
+        end
+      end
+
+      def name_for(relation)
+        @relation_names[relation.table]
       end
     end
   end