aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/alias_tracker.rb
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2010-10-31 11:21:28 +0000
committerJon Leighton <j@jonathanleighton.com>2010-10-31 11:21:28 +0000
commit9a1a32ac2b8a526f543367bc7e8258bbd7e6a164 (patch)
treea14e5d2b8d0b9f34766a91d3bac9bf78b445eb51 /activerecord/lib/active_record/associations/alias_tracker.rb
parentd010fb13ef622bdb781e3134005fc849db4c9bea (diff)
downloadrails-9a1a32ac2b8a526f543367bc7e8258bbd7e6a164.tar.gz
rails-9a1a32ac2b8a526f543367bc7e8258bbd7e6a164.tar.bz2
rails-9a1a32ac2b8a526f543367bc7e8258bbd7e6a164.zip
Fix naughty trailing whitespace
Diffstat (limited to 'activerecord/lib/active_record/associations/alias_tracker.rb')
-rw-r--r--activerecord/lib/active_record/associations/alias_tracker.rb26
1 files changed, 13 insertions, 13 deletions
diff --git a/activerecord/lib/active_record/associations/alias_tracker.rb b/activerecord/lib/active_record/associations/alias_tracker.rb
index 10e90ec117..64582188b6 100644
--- a/activerecord/lib/active_record/associations/alias_tracker.rb
+++ b/activerecord/lib/active_record/associations/alias_tracker.rb
@@ -11,10 +11,10 @@ module ActiveRecord
@aliases = Hash.new
@other_sql = other_sql.to_s.downcase
end
-
+
def aliased_name_for(table_name, aliased_name = nil)
aliased_name ||= table_name
-
+
initialize_count_for(table_name) if @aliases[table_name].nil?
if @aliases[table_name].zero?
@@ -24,12 +24,12 @@ module ActiveRecord
else
# Otherwise, we need to use an alias
aliased_name = connection.table_alias_for(aliased_name)
-
+
initialize_count_for(aliased_name) if @aliases[aliased_name].nil?
-
+
# Update the count
@aliases[aliased_name] += 1
-
+
if @aliases[aliased_name] > 1
"#{truncate(aliased_name)}_#{@aliases[aliased_name]}"
else
@@ -41,30 +41,30 @@ module ActiveRecord
def pluralize(table_name)
ActiveRecord::Base.pluralize_table_names ? table_name.to_s.pluralize : table_name
end
-
+
private
-
+
def initialize_count_for(name)
@aliases[name] = 0
-
+
unless @other_sql.blank?
# quoted_name should be downcased as some database adapters (Oracle) return quoted name in uppercase
quoted_name = connection.quote_table_name(name.downcase).downcase
-
+
# Table names
@aliases[name] += @other_sql.scan(/join(?:\s+\w+)?\s+#{quoted_name}\son/).size
-
+
# Table aliases
@aliases[name] += @other_sql.scan(/join(?:\s+\w+)?\s+\S+\s+#{quoted_name}\son/).size
end
-
+
@aliases[name]
end
-
+
def truncate(name)
name[0..connection.table_alias_length-3]
end
-
+
def connection
ActiveRecord::Base.connection
end