diff options
Diffstat (limited to 'lib/arel/engines/sql/christener.rb')
-rw-r--r-- | lib/arel/engines/sql/christener.rb | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/lib/arel/engines/sql/christener.rb b/lib/arel/engines/sql/christener.rb index 6160f244f7..3c7fb0425e 100644 --- a/lib/arel/engines/sql/christener.rb +++ b/lib/arel/engines/sql/christener.rb @@ -2,17 +2,18 @@ module Arel module Sql class Christener 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.name - @used_names[name] += 1 - hash[relation] = name + (@used_names[name] > 1 ? "_#{@used_names[name]}" : '') - end + @names = {} end def name_for(relation) - @relation_names[relation.table] + table = relation.table + name = table.table_alias || table.name + @names[name] ||= [] + + @names[name] << table unless @names[name].include? table + + idx = @names[name].index table + name + (idx == 0 ? '' : "_#{idx + 1}") end end end |