Changeset 3213

Timestamp:

12/03/05 04:29:55 (3 years ago)

Author:

david

Message:

Added preliminary support for join models [DHH] Added preliminary support for polymorphic associations [DHH] Refactored associations to use reflections to get DRYer, beware, major refactoring -- double check before deploying anything with this (all tests pass, but..)

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/aggregations.rb (modified) (2 diffs)
• trunk/activerecord/lib/active_record/associations.rb (modified) (12 diffs)
• trunk/activerecord/lib/active_record/associations/association_collection.rb (modified) (5 diffs)
• trunk/activerecord/lib/active_record/associations/association_proxy.rb (modified) (6 diffs)
• trunk/activerecord/lib/active_record/associations/belongs_to_association.rb (modified) (2 diffs)
• trunk/activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb (modified) (2 diffs)
• trunk/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb (modified) (11 diffs)
• trunk/activerecord/lib/active_record/associations/has_many_association.rb (modified) (12 diffs)
• trunk/activerecord/lib/active_record/associations/has_many_through_association.rb (added)
• trunk/activerecord/lib/active_record/associations/has_one_association.rb (modified) (6 diffs)
• trunk/activerecord/lib/active_record/base.rb (modified) (2 diffs)
• trunk/activerecord/lib/active_record/reflection.rb (modified) (8 diffs)
• trunk/activerecord/test/associations_join_model_test.rb (moved) (moved from trunk/activerecord/test/associations_interface_test.rb) (1 diff)
• trunk/activerecord/test/fixtures/post.rb (modified) (1 diff)
• trunk/activerecord/test/reflection_test.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added preliminary support for polymorphic associations [DHH]
+
+* Added preliminary support for join models [DHH]
-
-* Allow validate_uniqueness_of to be scoped by more than just one column.  #1559. [jeremy@jthopple.com, Marcel Molina Jr.]

trunk/activerecord/lib/active_record.rb

@@ -39 +39 @@
-require 'active_record/validations'
-require 'active_record/callbacks'
+require 'active_record/reflection'
-require 'active_record/associations'
-require 'active_record/aggregations'
-require 'active_record/transactions'
-require 'active_record/reflection'
-require 'active_record/timestamp'
-require 'active_record/acts/list'

trunk/activerecord/lib/active_record/aggregations.rb

@@ -1 +1 @@
-module ActiveRecord
-  module Aggregations # :nodoc:
-
-
+
-      base.extend(ClassMethods)
-    end
@@ -129 +128 @@
-        reader_method(name, class_name, mapping)
-        writer_method(name, class_name, mapping)
+        
+        create_reflection(:composed_of, part_id, options, self)
-      end
-

trunk/activerecord/lib/active_record/associations.rb

@@ -5 +5 @@
-require 'active_record/associations/has_one_association'
-require 'active_record/associations/has_many_association'
+require 'active_record/associations/has_many_through_association'
-require 'active_record/associations/has_and_belongs_to_many_association'
-require 'active_record/deprecated_associations'
@@ -342 +343 @@
-      #       'ORDER BY p.first_name'
-      def has_many(association_id, options = {}, &extension)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-      end
-
@@ -437 +400 @@
-      #   has_one :project_manager, :class_name => "Person", :conditions => "role = 'project_manager'"
-      def has_one(association_id, options = {})
-
-
-
-
-
-
+
-
-        module_eval do
-          after_save <<-EOF
-association_
+reflection.
-            unless association.nil?
-association_class_
+reflection.
-              association.save(true)
-              association.send(:construct_sql)
-            end
-          EOF
-        end
-      
-association_name, association_class_name, association_class_primary_key_name, options
-association_name, association_class_name, association_class_primary_key_name, options
-association_name, association_class_name, association_class_primary_key_name, options
+reflection
+ reflection
+reflection
-        
-
-
-
-
-
-
-
-
-
-
+
-
-        # deprecated api
-association_
-association_name, association_
+reflection.
+reflection.name, reflection.
-      end
-
@@ -518 +466 @@
-      #              :conditions => 'discounts > #{payments_count}'
-      def belongs_to(association_id, options = {})
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-          module_eval do
-            before_save <<-EOF
-association_
+reflection.
-              if !association.nil? 
-                if association.new_record?
-                  association.save(true)
-                  association.send(:construct_sql)
-                end
-                
-                if association.updated?
-association_class_
-
+reflection.
+reflection.
-                end
-              end
@@ -547 +487 @@
-          end
-        else
-
-
-
-
-
+
+
+
-
-          module_eval do
-            before_save <<-EOF
-association_
+reflection.
-              if !association.nil? 
-                if association.new_record?
-                  association.save(true)
-                  association.send(:construct_sql)
-                end
-                
-                if association.updated?
-association_class_
+reflection.
-                end
-              end            
@@ -571 +508 @@
-          if options[:counter_cache]
-            module_eval(
-association_class_name}.increment_counter(\"#{self.to_s.underscore.pluralize + "_count"}\", #{association_class_
-association_
+reflection.class_name}.increment_counter(\"#{self.to_s.underscore.pluralize + "_count"}\", #{reflection.
+reflection.
-            )
-
-            module_eval(
-association_class_name}.decrement_counter(\"#{self.to_s.underscore.pluralize + "_count"}\", #{association_class_
-association_
+reflection.class_name}.decrement_counter(\"#{self.to_s.underscore.pluralize + "_count"}\", #{reflection.
+reflection.
-            )          
-          end
-
-          # deprecated api
-association_
-association_name, association_
+reflection.
+reflection.name, reflection.
-        end
-      end
@@ -664 +601 @@
-      #   'DELETE FROM developers_projects WHERE active=1 AND developer_id = #{id} AND project_id = #{record.id}'
-      def has_and_belongs_to_many(association_id, options = {}, &extension)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-        # Don't use a before_destroy callback since users' before_destroy
-        # callbacks will be executed after the association is wiped out.
-association_
+reflection.
-        class_eval <<-end_eval
-          alias_method :#{old_method}, :destroy_without_callbacks
-          def destroy_without_callbacks
-association_
+reflection.
-            #{old_method}
-          end
-        end_eval
-
-association_
+reflection.
-        
-        # deprecated api
-association_
-association_
-association_
-association_
+reflection.
+reflection.
+reflection.
+reflection.
-      end
-
@@ -714 +637 @@
-        end
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-            force_reload = params.first unless params.empty?
-
-
-
-
-
+
+
+
+
-              retval = association.reload
-              unless retval.nil?
-association_
+reflection.
-              else
-association_
+reflection.
-                return nil
-              end
@@ -746 +655 @@
-          end
-
-association_
-association_
+reflection.
+reflection.
-            if association.nil?
-
-
-
+
-            end
+
-            association.replace(new_value)
+
-            unless new_value.nil?
-association_
+reflection.
-            else
-association_
+reflection.
-              return nil
-            end
+
-            association
-          end
-
-association_
+reflection.
-            return if target.nil?
-
-
-
+
-            association.target = target
-association_
-
-
-
-accessor_methods(association_name, association_class_name, association_class_primary_key_name, options
-association_
+reflection.
+
+
+
+reader_method(reflection
+reflection.
-            force_reload = params.first unless params.empty?
-
+
+
-            unless association.respond_to?(:loaded?)
-
-
-
-
+
+
-            end
+
-            association.reload if force_reload
+
-            association
-          end
-
-
-
+
+
+
+
+
+
+
-            unless association.respond_to?(:loaded?)
-
-
-
-
+
+
-            end
-            association.replace(new_value)
@@ -799 +710 @@
-          end
-
-Inflector.singularize(association_name)
-association_name}=", association_
+reflection.name.to_s.singularize
+reflection.name}=", reflection.
-          end
-        end
@@ -848 +759 @@
-        end
-
-association_name, association_class_name, association_class_primary_key_name, options
-association_
+reflection
+reflection.
-            attributees      = params.first unless params.empty?
-            replace_existing = params[1].nil? ? true : params[1]
-association_
+reflection.
-
-            if association.nil?
-
-
-
-
+
+
-            end
-
@@ -910 +819 @@
-        end
-
+
+        def configure_dependency_for_has_many(reflection)
+          if reflection.options[:dependent] && reflection.options[:exclusively_dependent]
+            raise ArgumentError, ':dependent and :exclusively_dependent are mutually exclusive options.  You may specify one or the other.'
+          end
+
+          if reflection.options[:exclusively_dependent]
+            reflection.options[:dependent] = :delete_all
+            #warn "The :exclusively_dependent option is deprecated.  Please use :dependent => :delete_all instead.")
+          end
+
+          # See HasManyAssociation#delete_records.  Dependent associations
+          # delete children, otherwise foreign key is set to NULL.
+          case reflection.options[:dependent]
+            when :destroy, true  
+              module_eval "before_destroy '#{reflection.name}.each { |o| o.destroy }'"
+            when :delete_all
+              module_eval "before_destroy { |record| #{reflection.class_name}.delete_all(%(#{reflection.primary_key_name} = \#{record.quoted_id})) }"
+            when :nullify
+              module_eval "before_destroy { |record| #{reflection.class_name}.update_all(%(#{reflection.primary_key_name} = NULL),  %(#{reflection.primary_key_name} = \#{record.quoted_id})) }"
+            when nil, false
+              # pass
+            else
+              raise ArgumentError, 'The :dependent option expects either true, :destroy, :delete_all, or :nullify' 
+          end
+        end
+        
+        def configure_dependency_for_has_one(reflection)
+          case reflection.options[:dependent]
+            when :destroy, true
+              module_eval "before_destroy '#{reflection.name}.destroy unless #{reflection.name}.nil?'"
+            when :nullify
+              module_eval "before_destroy '#{reflection.name}.update_attribute(\"#{reflection.primary_key_name}\", nil)'"
+            when nil, false
+              # pass
+            else
+              raise ArgumentError, "The :dependent option expects either :destroy or :nullify."
+          end
+        end
+        
+        
+        def add_deprecated_api_for_has_many(association_name)
+          deprecated_collection_count_method(association_name)
+          deprecated_add_association_relation(association_name)
+          deprecated_remove_association_relation(association_name)
+          deprecated_has_collection_method(association_name)
+          deprecated_find_in_collection_method(association_name)
+          deprecated_find_all_in_collection_method(association_name)
+          deprecated_collection_create_method(association_name)
+          deprecated_collection_build_method(association_name)
+        end
+
+        def create_has_many_reflection(association_id, options, &extension)
+          options.assert_valid_keys(
+            :foreign_key, :class_name, :exclusively_dependent, :dependent, 
+            :conditions, :order, :include, :finder_sql, :counter_sql, 
+            :before_add, :after_add, :before_remove, :after_remove, :extend,
+            :group, :as, :through
+          )
+
+          options[:extend] = create_extension_module(association_id, extension) if block_given?
+
+          reflection = create_reflection(:has_many, association_id, options, self)
+          reflection.require_class
+
+          reflection
+        end
+
+        def create_has_one_reflection(association_id, options)
+          options.assert_valid_keys(
+            :class_name, :foreign_key, :remote, :conditions, :order, :include, :dependent, :counter_cache, :extend
+          )
+
+          reflection = create_reflection(:has_one, association_id, options, self)
+          reflection.require_class
+
+          reflection
+        end
+
+        def create_belongs_to_reflection(association_id, options)
+          options.assert_valid_keys(
+            :class_name, :foreign_key, :foreign_type, :remote, :conditions, :order, :include, :dependent, 
+            :counter_cache, :extend, :polymorphic
+          )
+          
+          reflection = create_reflection(:belongs_to, association_id, options, self)
+
+          if options[:polymorphic]
+            reflection.options[:foreign_type] ||= reflection.class_name.underscore + "_type"
+          else
+            reflection.require_class
+          end
+
+          reflection
+        end
+        
+        def create_has_and_belongs_to_many_reflection(association_id, options, &extension)
+          options.assert_valid_keys(
+            :class_name, :table_name, :foreign_key, :association_foreign_key, :conditions, :include,
+            :join_table, :finder_sql, :delete_sql, :insert_sql, :order, :uniq, :before_add, :after_add, 
+            :before_remove, :after_remove, :extend
+          )
+
+          options[:extend] = create_extension_module(association_id, extension) if block_given?
+
+          reflection = create_reflection(:has_and_belongs_to_many, association_id, options, self)
+          reflection.require_class
+
+          reflection.options[:join_table] ||= join_table_name(undecorated_table_name(self.to_s), undecorated_table_name(reflection.class_name))
+          
+          reflection
+        end
-
-        def reflect_on_included_associations(associations)

trunk/activerecord/lib/active_record/associations/association_collection.rb

@@ -19 +19 @@
-        result = true
-        load_target
+
-        @owner.transaction do
-          flatten_deeper(records).each do |record|
@@ -29 +30 @@
-        end
-                                
-and
+&&
-      end
-
@@ -61 +62 @@
-      def clear
-        return self if length.zero? # forces load_target if hasn't happened already
-
+
+
-          destroy_all
-        else          
-          delete_all
-        end
+
-        self
-      end
@@ -125 +128 @@
-
-      private
-        def raise_on_type_mismatch(record)
-          raise ActiveRecord::AssociationTypeMismatch, "#{@association_class} expected, got #{record.class}" unless record.is_a?(@association_class)
-        end
-
-        def target_obsolete?
-          false
-        end
-
-        # Array#flatten has problems with recursive arrays. Going one level deeper solves the majority of the problems.
-        def flatten_deeper(array)
@@ -156 +151 @@
-        
-        def callbacks_for(callback_name)
-.to_s}_for_#{@association_name.to_s
-or
+}_for_#{@reflection.name
+||
-        end
-        

trunk/activerecord/lib/active_record/associations/association_proxy.rb

@@ -6 +6 @@
-      instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?|^proxy_respond_to\?|^proxy_extend|^send)/ }
-
-
-
-
-
-
-
-
-
-
+
+
+
-        reset
-      end
@@ -27 +21 @@
-        load_target
-        other === @target
+      end
+
+      def reset
+        @target = nil
+        @loaded = false
-      end
-
@@ -46 +45 @@
-      end
-      
-
-
-@loaded = true
+arget
+arget
+loaded
-      end
-      
-      protected
-        def dependent?
-
+reflection.
-        end
-        
@@ -69 +68 @@
-
-        def sanitize_sql(sql)
-association_c
+reflection.k
-        end
-
@@ -85 +84 @@
-          if !@owner.new_record? || foreign_key_present
-            begin
-not 
+!
-            rescue ActiveRecord::RecordNotFound
-              reset
-            end
-          end
-
-
+
+
+
-        end
-
@@ -101 +101 @@
-
-        def raise_on_type_mismatch(record)
-
+
+
+
-        end
-    end

trunk/activerecord/lib/active_record/associations/belongs_to_association.rb

@@ -2 +2 @@
-  module Associations
-    class BelongsToAssociation < AssociationProxy #:nodoc:
-      def initialize(owner, association_name, association_class_name, association_class_primary_key_name, options)
-        super        
-        construct_sql        
-      end
-      
-      def reset
-        @target = nil
-        @loaded = false
-      end
-
-      def create(attributes = {})
-
-
-
+
-      end
-
-      def build(attributes = {})
-
-
-
+
-      end
-
-obj, dont_save = false
-obj
-association_class_
+record
+record
+reflection.
-        else
-obj) unless obj.nil?
+record)
-
-obj ? obj.target : obj
-association_class_primary_key_name] = obj.id unless obj
+record ? record.target : record
+reflection.primary_key_name] = record.id unless record
-          @updated = true
-        end
-        @loaded = true
-
-
+
+
-      end
-      
@@ -45 +31 @@
-      private
-        def find_target
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        end
-
-        def foreign_key_present
-
-
-
-
-
-
-
-
-
+
-        end
-    end

trunk/activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb

@@ -1 +1 @@
-module ActiveRecord
-  module Associations
-BelongsToAssociation
-initialize(owner, association_name, association_class_name, association_class_primary_key_name, options
-@owner = owner
-@options = options
-@association_name = association_nam
-@association_class_primary_key_name = association_class_primary_key_name
+AssociationProxy
+replace(record
+if record.nil?
+  @target = @owner[@reflection.primary_key_name] = @owner[@reflection.options[:foreign_type]] = nil
+els
+  @target = (AssociationProxy === record ? record.target : record)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+