From b171b9e73dcc6a89b1da652da61c5127fe605b51 Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Sun, 27 Feb 2011 18:17:14 +0000 Subject: Move JoinDependency and friends from ActiveRecord::Associations::ClassMethods to just ActiveRecord::Associations --- activerecord/lib/active_record/relation/finder_methods.rb | 4 ++-- activerecord/lib/active_record/relation/query_methods.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'activerecord/lib/active_record/relation') diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb index 7f32e5538e..426000fde1 100644 --- a/activerecord/lib/active_record/relation/finder_methods.rb +++ b/activerecord/lib/active_record/relation/finder_methods.rb @@ -187,7 +187,7 @@ module ActiveRecord def find_with_associations including = (@eager_load_values + @includes_values).uniq - join_dependency = ActiveRecord::Associations::ClassMethods::JoinDependency.new(@klass, including, []) + join_dependency = ActiveRecord::Associations::JoinDependency.new(@klass, including, []) relation = construct_relation_for_association_find(join_dependency) rows = connection.select_all(relation.to_sql, 'SQL', relation.bind_values) join_dependency.instantiate(rows) @@ -197,7 +197,7 @@ module ActiveRecord def construct_relation_for_association_calculations including = (@eager_load_values + @includes_values).uniq - join_dependency = ActiveRecord::Associations::ClassMethods::JoinDependency.new(@klass, including, arel.froms.first) + join_dependency = ActiveRecord::Associations::JoinDependency.new(@klass, including, arel.froms.first) relation = except(:includes, :eager_load, :preload) apply_join_dependency(relation, join_dependency) end diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index 4330d850fe..cd1d7108b3 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -236,7 +236,7 @@ module ActiveRecord 'string_join' when Hash, Symbol, Array 'association_join' - when ActiveRecord::Associations::ClassMethods::JoinDependency::JoinAssociation + when ActiveRecord::Associations::JoinDependency::JoinAssociation 'stashed_join' when Arel::Nodes::Join 'join_node' @@ -254,7 +254,7 @@ module ActiveRecord join_list = custom_join_ast(manager, string_joins) - join_dependency = ActiveRecord::Associations::ClassMethods::JoinDependency.new( + join_dependency = ActiveRecord::Associations::JoinDependency.new( @klass, association_joins, join_list -- cgit v1.2.3