simplify the JoinAssociation constructor, check validity *before*

2 files changed, 6 insertions, 6 deletions

diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb
index 7d6d25eeb7..00fe249837 100644
--- a/activerecord/lib/active_record/associations/join_dependency.rb
+++ b/activerecord/lib/active_record/associations/join_dependency.rb
@@ -174,6 +174,12 @@ module ActiveRecord
       end
 
       def build_join_association(reflection, parent)
+        reflection.check_validity!
+
+        if reflection.options[:polymorphic]
+          raise EagerLoadPolymorphicError.new(reflection)
+        end
+
         JoinAssociation.new(reflection, self, parent)
       end
 
diff --git a/activerecord/lib/active_record/associations/join_dependency/join_association.rb b/activerecord/lib/active_record/associations/join_dependency/join_association.rb
index d97c1972f7..3bc7f7ad50 100644
--- a/activerecord/lib/active_record/associations/join_dependency/join_association.rb
+++ b/activerecord/lib/active_record/associations/join_dependency/join_association.rb
@@ -30,12 +30,6 @@ module ActiveRecord
         delegate :alias_tracker, :to => :join_dependency
 
         def initialize(reflection, join_dependency, parent)
-          reflection.check_validity!
-
-          if reflection.options[:polymorphic]
-            raise EagerLoadPolymorphicError.new(reflection)
-          end
-
           super(reflection.klass)
 
           @reflection      = reflection