diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-02-14 16:51:24 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-02-14 16:51:24 -0800 |
commit | 494a26d798966a900127d3d4df6bada152896222 (patch) | |
tree | 7c1fa6b86ec3f74d48b701fd59b49ecf671ce351 | |
parent | c24ea241e224b2d58e3184fa119beddac096b1f2 (diff) | |
download | rails-494a26d798966a900127d3d4df6bada152896222.tar.gz rails-494a26d798966a900127d3d4df6bada152896222.tar.bz2 rails-494a26d798966a900127d3d4df6bada152896222.zip |
stop exposing table_joins
-rw-r--r-- | activerecord/lib/active_record/associations/alias_tracker.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/associations/alias_tracker.rb b/activerecord/lib/active_record/associations/alias_tracker.rb index 7d938509db..f41f7bffff 100644 --- a/activerecord/lib/active_record/associations/alias_tracker.rb +++ b/activerecord/lib/active_record/associations/alias_tracker.rb @@ -5,12 +5,11 @@ module ActiveRecord # Keeps track of table aliases for ActiveRecord::Associations::ClassMethods::JoinDependency and # ActiveRecord::Associations::ThroughAssociationScope class AliasTracker # :nodoc: - attr_reader :aliases, :table_joins, :connection + attr_reader :aliases, :connection # table_joins is an array of arel joins which might conflict with the aliases we assign here def initialize(connection, table_joins = []) - @aliases = Hash.new { |h,k| h[k] = initial_count_for(k) } - @table_joins = table_joins + @aliases = Hash.new { |h,k| h[k] = initial_count_for(k, table_joins) } @connection = connection end @@ -46,7 +45,7 @@ module ActiveRecord private - def initial_count_for(name) + def initial_count_for(name, table_joins) return 0 if Arel::Table === table_joins # quoted_name should be downcased as some database adapters (Oracle) return quoted name in uppercase |