remove code duplication

rails · May 22, 2013 · d226929 · d226929
1 parent b9bbc7f
commit d226929
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb
@@ -21,11 +21,12 @@ def create_reflection(macro, name, scope, options, active_record)
         case macro
         when :has_many, :belongs_to, :has_one, :has_and_belongs_to_many
           klass = options[:through] ? ThroughReflection : AssociationReflection
-          reflection = klass.new(macro, name, scope, options, active_record)
         when :composed_of
-          reflection = AggregateReflection.new(macro, name, scope, options, active_record)
+          klass = AggregateReflection
         end
 
+        reflection = klass.new(macro, name, scope, options, active_record)
+
         self.reflections = self.reflections.merge(name => reflection)
         reflection
       end