github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

fewer method calls, fewer code branches

Browse Source
This commit is contained in:
Aaron Patterson
2010-12-08 12:11:43 -08:00
parent c69bd59a9c
commit 45ea60eee7
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
View File

@@ -79,17 +79,16 @@ module ActiveRecord
def aliased_table_name_for(name, suffix = nil)
aliases = @join_dependency.table_aliases
if !aliases[name].zero? # We need an alias
if aliases[name] != 0 # We need an alias
connection = active_record.connection
name = connection.table_alias_for "#{pluralize(reflection.name)}_#{parent_table_name}#{suffix}"
aliases[name] += 1
table_index = aliases[name]
table_index = aliases[name] + 1
name = name[0, connection.table_alias_length-3] + "_#{table_index}" if table_index > 1
else
aliases[name] += 1
end
aliases[name] += 1
name
end