Changeset 8481

Timestamp:

12/22/07 11:26:03 (1 year ago)

Author:

bitsweat

Message:

Ruby 1.9 compat: fix warnings, shadowed block vars, and unitialized instance vars

Files:

• trunk/activerecord/lib/active_record/associations.rb (modified) (74 diffs)
• trunk/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb (modified) (2 diffs)
• trunk/activerecord/lib/active_record/associations/has_many_association.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations/has_many_through_association.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/attribute_methods.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/base.rb (modified) (9 diffs)
• trunk/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb (modified) (2 diffs)
• trunk/activerecord/lib/active_record/migration.rb (modified) (2 diffs)
• trunk/activerecord/lib/active_record/transactions.rb (modified) (3 diffs)
• trunk/activerecord/test/active_schema_test_mysql.rb (modified) (2 diffs)
• trunk/activerecord/test/adapter_test.rb (modified) (1 diff)
• trunk/activerecord/test/associations/callbacks_test.rb (modified) (1 diff)
• trunk/activerecord/test/associations/join_model_test.rb (modified) (2 diffs)

trunk/activerecord/lib/active_record/associations.rb

@@ -20 +20 @@
-    end
-  end
-
+
-  class HasManyThroughAssociationPointlessSourceTypeError < ActiveRecordError #:nodoc:
-    def initialize(owner_class_name, reflection, source_reflection)
@@ -26 +26 @@
-    end
-  end
-
+
-  class HasManyThroughSourceAssociationNotFoundError < ActiveRecordError #:nodoc:
-    def initialize(reflection)
@@ -73 +73 @@
-    end
-
- 
+
-    def clear_association_cache #:nodoc:
-      self.class.reflect_on_all_associations.to_a.each do |assoc|
@@ -79 +79 @@
-      end unless self.new_record?
-    end
-
- 
- 
- 
+
+
+
+
-    # methods. Example:
-    #
-    #   class Project < ActiveRecord::Base
-    #     belongs_to              :portfolio
- 
+
-    #     has_many                :milestones
-    #     has_and_belongs_to_many :categories
@@ -118 +118 @@
-    #   #create_other(attributes={})      |     X      |              |    X
-    #   #other.create!(attributes={})     |            |              |    X
-    
+
-    #
-    # ===Collection associations (one-to-many / many-to-many)
-    #                                     |       |          | has_many
-  
+
-    #   ----------------------------------+-------+----------+----------
-    #   #others                           |   X   |    X     |    X
-    
+
-    #   #other_ids                        |   X   |    X     |    X
-    
+
-    #   #others<<                         |   X   |    X     |    X
-    #   #others.push                      |   X   |    X     |    X
-    #   #others.concat                    |   X   |    X     |    X
-    #   #others.build(attributes={})      |   X   |    X     |    X
-    
+
-    #   #others.create!(attributes={})    |   X   |    X     |    X
-    #   #others.size                      |   X   |    X     |    X
@@ -139 +139 @@
-    #   #others.sum(args*,&block)         |   X   |    X     |    X
-    #   #others.empty?                    |   X   |    X     |    X
-    
+
-    #   #others.delete(other,other,...)   |   X   |    X     |    X
-    
+
-    #   #others.destroy_all               |   X   |    X     |    X
-    #   #others.find(*args)               |   X   |    X     |    X
-    
-    
+
+
-    #   #others.reset                     |   X   |    X     |    X
-    #
-    # == Cardinality and associations
- 
+
-    # ActiveRecord associations can be used to describe relations with one-to-one, one-to-many
-    # and many-to-many cardinality. Each model uses an association to describe its role in
@@ -208 +208 @@
-    #
-    # Choosing which way to build a many-to-many relationship is not always simple.
- 
+
-    # use <tt>has_many :through</tt>. Use +has_and_belongs_to_many+ when working with legacy schemas or when
-    # you never work directly with the relationship itself.
@@ -254 +254 @@
-    #   is cancelled.
-    # * If you wish to assign an object to a +has_one+ association without saving it, use the <tt>#association.build</tt> method (documented below).
- 
+
-    #   does not save the parent either.
-    #
@@ -276 +276 @@
-    #       ...
-    #     end
- 
+
-    #
-    # It's possible to stack callbacks by passing them as an array. Example:
- 
+
-    #   class Project
-    #     has_and_belongs_to_many :developers, :after_add => [:evaluate_velocity, Proc.new { |p, d| p.shipping_date = Time.now}]
@@ -335 +335 @@
-    # Some extensions can only be made to work with knowledge of the association proxy's internals.
-    # Extensions can access relevant state using accessors on the association proxy:
- 
+
-    # * +proxy_owner+ - Returns the object the association is part of.
-    # * +proxy_reflection+ - Returns the reflection object that describes the association.
@@ -341 +341 @@
-    #
-    # === Association Join Models
- 
+
-    # Has Many associations can be configured with the <tt>:through</tt> option to use an explicit join model to retrieve the data.  This
-    # operates similarly to a +has_and_belongs_to_many+ association.  The advantage is that you're able to add validations,
-    # callbacks, and extra attributes on the join model.  Consider the following schema:
- 
+
-    #   class Author < ActiveRecord::Base
-    #     has_many :authorships
-    #     has_many :books, :through => :authorships
-    #   end
- 
+
-    #   class Authorship < ActiveRecord::Base
-    #     belongs_to :author
-    #     belongs_to :book
-    #   end
- 
+
-    #   @author = Author.find :first
-    #   @author.authorships.collect { |a| a.book } # selects all books that the author's authorships belong to.
-    #   @author.books                              # selects all books by using the Authorship join model
- 
+
-    # You can also go through a +has_many+ association on the join model:
- 
+
-    #   class Firm < ActiveRecord::Base
-    #     has_many   :clients
-    #     has_many   :invoices, :through => :clients
-    #   end
-   
+
-    #   class Client < ActiveRecord::Base
-    #     belongs_to :firm
-    #     has_many   :invoices
-    #   end
-   
+
-    #   class Invoice < ActiveRecord::Base
-    #     belongs_to :client
@@ -381 +381 @@
-    #
-    # === Polymorphic Associations
- 
- 
+
+
-    # specify an interface that a +has_many+ association must adhere to.
- 
+
-    #   class Asset < ActiveRecord::Base
-    #     belongs_to :attachable, :polymorphic => true
-    #   end
- 
+
-    #   class Post < ActiveRecord::Base
-    #     has_many :assets, :as => :attachable         # The :as option specifies the polymorphic interface to use.
@@ -394 +394 @@
-    #
-    #   @asset.attachable = @post
- 
+
-    # This works by using a type column in addition to a foreign key to specify the associated record.  In the Asset example, you'd need
-    # an +attachable_id+ integer column and an +attachable_type+ string column.
-    #
-    # Using polymorphic associations in combination with single table inheritance (STI) is a little tricky. In order
- 
+
-    # type column of the polymorphic association. To continue with the asset example above, suppose there are guest posts
-    # and member posts that use the posts table for STI. In this case, there must be a +type+ column in the posts table.
@@ -405 +405 @@
-    #   class Asset < ActiveRecord::Base
-    #     belongs_to :attachable, :polymorphic => true
-     
+
-    #     def attachable_type=(sType)
-    #        super(sType.to_s.classify.constantize.base_class.to_s)
-    #     end
-    #   end
- 
+
-    #   class Post < ActiveRecord::Base
-    #     # because we store "Post" in attachable_type now :dependent => :destroy will work
@@ -425 +425 @@
-    #
-    # All of the methods are built on a simple caching principle that will keep the result of the last query around unless specifically
- 
+
-    # worrying too much about performance at the first go. Example:
-    #
@@ -451 +451 @@
-    #     puts "Written by:      " + post.author.name
-    #     puts "Last comment on: " + post.comments.first.created_on
- 
+
-    #
-    # To iterate over these one hundred posts, we'll generate 201 database queries. Let's first just optimize it for retrieving the author:
@@ -476 +476 @@
-    # the number of queries. The database still needs to send all the data to Active Record and it still needs to be processed. So it's no
-    # catch-all for performance problems, but it's a great way to cut down on the number of queries in a situation as the one described above.
- 
+
-    # Since the eager loading pulls from multiple tables, you'll have to disambiguate any column references in both conditions and orders. So
-    # <tt>:order => "posts.id DESC"</tt> will work while <tt>:order => "id DESC"</tt> will not. Because eager loading generates the +SELECT+ statement too, the
@@ -484 +484 @@
-    # as there is currently not any way to disambiguate them. Eager loading will not pull additional attributes on join tables, so "rich
-    # associations" with +has_and_belongs_to_many+ are not a good fit for eager loading.
- 
+
-    # When eager loaded, conditions are interpolated in the context of the model class, not the model instance.  Conditions are lazily interpolated
-    # before the actual model exists.
- 
+
-    # == Table Aliasing
-    #
@@ -493 +493 @@
-    # the standard table name is used.  The second time, the table is aliased as <tt>#{reflection_name}_#{parent_table_name}</tt>.  Indexes are appended
-    # for any more successive uses of the table name.
- 
+
-    #   Post.find :all, :include => :comments
-    #   # => SELECT ... FROM posts LEFT OUTER JOIN comments ON ...
@@ -500 +500 @@
-    #   Post.find :all, :include => [:comments, :special_comments] # special_comments is the reflection name, posts is the parent table name
-    #   # => SELECT ... FROM posts LEFT OUTER JOIN comments ON ... LEFT OUTER JOIN comments special_comments_posts
- 
+
-    # Acts as tree example:
- 
+
-    #   TreeMixin.find :all, :include => :children
-    #   # => SELECT ... FROM mixins LEFT OUTER JOIN mixins childrens_mixins ...
-    #   TreeMixin.find :all, :include => {:children => :parent} # using cascading eager includes
- 
+
-    #                               LEFT OUTER JOIN parents_mixins ...
- 
- 
- 
+
+
+
-    #                               LEFT OUTER JOIN mixins childrens_mixins_2
- 
+
-    # Has and Belongs to Many join tables use the same idea, but add a <tt>_join</tt> suffix:
- 
+
-    #   Post.find :all, :include => :categories
-    #   # => SELECT ... FROM posts LEFT OUTER JOIN categories_posts ... LEFT OUTER JOIN categories ...
@@ -524 +524 @@
-    #                              LEFT OUTER JOIN categories_posts posts_categories_join LEFT OUTER JOIN posts posts_categories
-    #                              LEFT OUTER JOIN categories_posts categories_posts_join LEFT OUTER JOIN categories categories_posts
- 
+
-    # If you wish to specify your own custom joins using a <tt>:joins</tt> option, those table names will take precedence over the eager associations:
- 
+
-    #   Post.find :all, :include => :comments, :joins => "inner join comments ..."
-    #   # => SELECT ... FROM posts LEFT OUTER JOIN comments_posts ON ... INNER JOIN comments ...
-    #   Post.find :all, :include => [:comments, :special_comments], :joins => "inner join comments ..."
- 
+
-    #                              LEFT OUTER JOIN comments special_comments_posts ...
-    #                              INNER JOIN comments ...
- 
+
-    # Table aliases are automatically truncated according to the maximum length of table identifiers according to the specific database.
- 
+
-    # == Modules
-    #
@@ -576 +576 @@
-    module ClassMethods
-      # Adds the following methods for retrieval and query of collections of associated objects:
- 
+
-      # <tt>has_many :clients</tt> would add among others <tt>clients.empty?</tt>.
-      # * <tt>collection(force_reload = false)</tt> - returns an array of all the associated objects.
-      #   An empty array is returned if none are found.
-      # * <tt>collection<<(object, ...)</tt> - adds one or more objects to the collection by setting their foreign keys to the collection's primary key.
-  
+
-      #   This will also destroy the objects if they're declared as +belongs_to+ and dependent on this model.
-      # * <tt>collection=objects</tt> - replaces the collections content by deleting and adding objects as appropriate.
@@ -593 +593 @@
-      # * <tt>collection.find</tt> - finds an associated object according to the same rules as Base.find.
-      # * <tt>collection.build(attributes = {}, ...)</tt> - returns one or more new objects of the collection type that have been instantiated
- 
+
-      #   associated object already exists, not if it's +nil+!
-      # * <tt>collection.create(attributes = {})</tt> - returns a new object of the collection type that has been instantiated
@@ -613 +613 @@
-      # * <tt>Firm#clients.create</tt> (similar to <tt>c = Client.new("firm_id" => id); c.save; c</tt>)
-      # The declaration can also include an options hash to specialize the behavior of the association.
- 
+
-      # Options are:
-      # * <tt>:class_name</tt>  - specify the class name of the association. Use it only if that name can't be inferred
@@ -638 +638 @@
-      # * <tt>:limit</tt>: An integer determining the limit on the number of rows that should be returned.
-      # * <tt>:offset</tt>: An integer determining the offset from where the rows should be fetched. So at 5, it would skip the first 4 rows.
- 
+
-      #   but not include the joined columns.
-      # * <tt>:as</tt>: Specifies a polymorphic interface (See <tt>#belongs_to</tt>).
- 
+
-      #   are ignored, as the association uses the source reflection. You can only use a <tt>:through</tt> query through a <tt>belongs_to</tt>
-      #   or <tt>has_many</tt> association on the join model.
- 
+
-      #   inferred from the association.  <tt>has_many :subscribers, :through => :subscriptions</tt> will look for either <tt>:subscribers</tt> or
-      #   <tt>:subscriber</tt> on +Subscription+, unless a <tt>:source</tt> is given.
@@ -670 +670 @@
-
-        if options[:through]
-          collection_reader_method(reflection, HasManyThroughAssociation)
-          collection_accessor_methods(reflection, HasManyThroughAssociation, false)
-        else
@@ -680 +679 @@
-
-      # Adds the following methods for retrieval and query of a single associated object:
- 
+
-      # <tt>has_one :manager</tt> would add among others <tt>manager.nil?</tt>.
-      # * <tt>association(force_reload = false)</tt> - returns the associated object. +nil+ is returned if none is found.
- 
+
-      #   and saves the associate object.
-      # * <tt>association.nil?</tt> - returns +true+ if there is no associated object.
@@ -700 +699 @@
-      #
-      # The declaration can also include an options hash to specialize the behavior of the association.
- 
+
-      # Options are:
-      # * <tt>:class_name</tt>  - specify the class name of the association. Use it only if that name can't be inferred
@@ -727 +726 @@
-        reflection = create_has_one_reflection(association_id, options)
-
+        ivar = "@#{reflection.name}"
+
-        module_eval do
-          after_save <<-EOF
-
+
+
-            if !association.nil? && (new_record? || association.new_record? || association["#{reflection.primary_key_name}"] != id)
-              association["#{reflection.primary_key_name}"] = id
@@ -736 +738 @@
-          EOF
-        end
-
+
-        association_accessor_methods(reflection, HasOneAssociation)
-        association_constructor_method(:build,  reflection, HasOneAssociation)
-        association_constructor_method(:create, reflection, HasOneAssociation)
-
+
-        configure_dependency_for_has_one(reflection)
-      end
-
-      # Adds the following methods for retrieval and query for a single associated object for which this object holds an id:
- 
+
-      # <tt>belongs_to :author</tt> would add among others <tt>author.nil?</tt>.
-      # * <tt>association(force_reload = false)</tt> - returns the associated object. +nil+ is returned if none is found.
@@ -763 +765 @@
-      # * <tt>Post#create_author</tt> (similar to <tt>post.author = Author.new; post.author.save; post.author</tt>)
-      # The declaration can also include an options hash to specialize the behavior of the association.
- 
+
-      # Options are:
-      # * <tt>:class_name</tt>  - specify the class name of the association. Use it only if that name can't be inferred
@@ -775 +777 @@
-      #   of the association with an +_id+ suffix. So a class that defines a +belongs_to :person+ association will use +person_id+ as the default +foreign_key+.
-      #   Similarly, +belongs_to :favorite_person, :class_name => "Person"+ will use a foreign key of +favorite_person_id+.
- 
+
-      #   and +decrement_counter+. The counter cache is incremented when an object of this class is created and decremented when it's
-      #   destroyed. This requires that a column named <tt>#{table_name}_count</tt> (such as +comments_count+ for a belonging +Comment+ class)
- 
+
-      #   a column name instead of a +true+/+false+ value to this option (e.g., <tt>:counter_cache => :my_custom_counter</tt>.)
-      #   Note: Specifying a counter_cache will add it to that model's list of readonly attributes using #attr_readonly.
-      # * <tt>:include</tt>  - specify second-order associations that should be eager loaded when this object is loaded.
-      # * <tt>:polymorphic</tt> - specify this association is a polymorphic association by passing +true+.
- 
+
-      #   to the attr_readonly list in the associated classes (e.g. class Post; attr_readonly :comments_count; end).
-      #
@@ -789 +791 @@
-      #   belongs_to :firm, :foreign_key => "client_of"
-      #   belongs_to :author, :class_name => "Person", :foreign_key => "author_id"
- 
+
-      #              :conditions => 'discounts > #{payments_count}'
-      #   belongs_to :attachable, :polymorphic => true
-      def belongs_to(association_id, options = {})
-        reflection = create_belongs_to_reflection(association_id, options)
-
+
+
+
-        if reflection.options[:polymorphic]
-          association_accessor_methods(reflection, BelongsToPolymorphicAssociation)
@@ -800 +804 @@
-          module_eval do
-            before_save <<-EOF
-
+
+
-              if association && association.target
-                if association.new_record?
-                  association.save(true)
-                end
-
+
-                if association.updated?
-                  self["#{reflection.primary_key_name}"] = association.id
@@ -820 +825 @@
-          module_eval do
-            before_save <<-EOF
-
-
+
+
+
-                if association.new_record?
-                  association.save(true)
-                end
-
+
-                if association.updated?
-                  self["#{reflection.primary_key_name}"] = association.id
-                end
-            
+
-            EOF
-          end
@@ -849 +855 @@
-            " unless #{reflection.name}.nil?'"
-          )
-
+
-          module_eval(
-            "#{reflection.class_name}.send(:attr_readonly,\"#{cache_column}\".intern) if defined?(#{reflection.class_name}) && #{reflection.class_name}.respond_to?(:attr_readonly)"
@@ -859 +865 @@
-      # an option, it is guessed using the lexical order of the class names. So a join between +Developer+ and +Project+
-      # will give the default join table name of +developers_projects+ because "D" outranks "P".  Note that this precedence
- 
+
-      # and the strings are equal when compared up to the shortest length, then the longer string is considered of higher
- 
+
-      # to generate a join table name of <tt>papers_paper_boxes</tt> because of the length of the name <tt>paper_boxes</tt>,
- 
+
-      # custom <tt>join_table</tt> option if you need to.
-      #
@@ -872 +878 @@
-      #
-      # Adds the following methods for retrieval and query:
- 
+
-      # <tt>has_and_belongs_to_many :categories</tt> would add among others <tt>categories.empty?</tt>.
-      # * <tt>collection(force_reload = false)</tt> - returns an array of all the associated objects.
-      #   An empty array is returned if none are found.
- 
+
-      #   (<tt>collection.push</tt> and <tt>collection.concat</tt> are aliases to this method).
-  
+
-      #   This does not destroy the objects.
-      # * <tt>collection=objects</tt> - replaces the collection's content by deleting and adding objects as appropriate.
@@ -907 +913 @@
-      # * <tt>Developer#projects.create</tt> (similar to <tt>c = Project.new("project_id" => id); c.save; c</tt>)
-      # The declaration may include an options hash to specialize the behavior of the association.
- 
+
-      # Options are:
-      # * <tt>:class_name</tt> - specify the class name of the association. Use it only if that name can't be inferred
- 
+
-      #   +Project+ class, but if the real class name is +SuperProject+, you'll have to specify it with this option.
-      # * <tt>:join_table</tt> - specify the name of the join table if the default based on lexical order isn't what you want.
@@ -927 +933 @@
-      # * <tt>:uniq</tt> - if set to +true+, duplicate associated objects will be ignored by accessors and query methods
-      # * <tt>:finder_sql</tt> - overwrite the default generated SQL statement used to fetch the association with a manual statement
- 
+
-      #   classes with a manual statement
-      # * <tt>:insert_sql</tt> - overwrite the default generated SQL statement used to add links between the associated classes
@@ -944 +950 @@
-      #   has_and_belongs_to_many :nations, :class_name => "Country"
-      #   has_and_belongs_to_many :categories, :join_table => "prods_cats"
- 
+
-      #   '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)
-        reflection = create_has_and_belongs_to_many_reflection(association_id, options, &extension)
-
+
-        add_multiple_associated_save_callbacks(reflection.name)
-        collection_accessor_methods(reflection, HasAndBelongsToManyAssociation)
@@ -982 +988 @@
-          table_name_prefix + join_table + table_name_suffix
-        end
-
+
-        def association_accessor_methods(reflection, association_proxy_class)
+          ivar = "@#{reflection.name}"
+
-          define_method(reflection.name) do |*params|
-            force_reload = params.first unless params.empty?
-
+
+
-
-            if association.nil? || force_reload
@@ -992 +1001 @@
-              retval = association.reload
-              if retval.nil? and association_proxy_class == BelongsToAssociation
-"@#{reflection.name}"
+ivar
-                return nil
-              end
-"@#{reflection.name}"
+ivar
-            end
-
@@ -1002 +1011 @@
-
-          define_method("#{reflection.name}=") do |new_value|
-
+
+
-            if association.nil? || association.target != new_value
-              association = association_proxy_class.new(self, reflection)
@@ -1009 +1019 @@
-            association.replace(new_value)
-
-
-
-
-
-
+
-          end
-
@@ -1020 +1026 @@
-            association = association_proxy_class.new(self, reflection)
-            association.target = target
-"@#{reflection.name}"
+ivar
-          end
-        end
@@ -1026 +1032 @@
-        def collection_reader_method(reflection, association_proxy_class)
-          define_method(reflection.name) do |*params|
+            ivar = "@#{reflection.name}"
+
-            force_reload = params.first unless params.empty?
-"@#{reflection.name}"
+ivar) if instance_variable_defined?(ivar
-
-            unless association.respond_to?(:loaded?)
-              association = association_proxy_class.new(self, reflection)
-"@#{reflection.name}"
+ivar
-            end
-
@@ -1037 +1045 @@
-
-            association
+          end
+
+          define_method("#{reflection.name.to_s.singularize}_ids") do
+            send(reflection.name).map(&:id)
-          end
-        end
@@ -1043 +1055 @@
-          collection_reader_method(reflection, association_proxy_class)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        end
-
-        def add_multiple_associated_save_callbacks(association_name)
-          method_name = "validate_associated_records_for_#{association_name}".to_sym
+          ivar = "@#{association_name}"
+
-          define_method(method_name) do
-
+
+
-            if association.respond_to?(:loaded?)
-              if new_record?
@@ -1079 +1092 @@
-
-          after_callback = <<-end_eval
-@#{association_name
+#{ivar}") if instance_variable_defined?("#{ivar
-
-            records_to_save = if @new_record_before_save
@@ -1090 +1103 @@
-
-            records_to_save.each { |record| association.send(:insert_record, record) } unless records_to_save.blank?
-
+
-            # reconstruct the SQL queries now that we know the owner's id
-            association.send(:construct_sql) if association.respond_to?(:construct_sql)
@@ -1102 +1115 @@
-        def association_constructor_method(constructor, reflection, association_proxy_class)
-          define_method("#{constructor}_#{reflection.name}") do |*params|
+            ivar = "@#{reflection.name}"
+
-            attributees      = params.first unless params.empty?
-            replace_existing = params[1].nil? ? true : params[1]
-"@#{reflection.name}"
+ivar) if instance_variable_defined?(ivar
-
-            if association.nil?
-              association = association_proxy_class.new(self, reflection)
-"@#{reflection.name}"
+ivar
-            end
-
@@ -1118 +1133 @@
-          end
-        end
-
+
-        def find_with_associations(options = {})
-          catch :invalid_query do
@@ -1174 +1189 @@
-            :as, :through, :source, :source_type,
-            :uniq,
- 
- 
+
+
-            :extend
-          )
-
- if block_given?
+
-
-          create_reflection(:has_many, association_id, options, self)
@@ -1194 +1209 @@
-        def create_belongs_to_reflection(association_id, options)
-          options.assert_valid_keys(
- 
+
-            :counter_cache, :extend, :polymorphic
-          )
-
+
-          reflection = create_reflection(:belongs_to, association_id, options, self)
-
@@ -1206 +1221 @@
-          reflection
-        end
-
+
-        def create_has_and_belongs_to_many_reflection(association_id, options, &extension)
-          options.assert_valid_keys(
- 
+
-            :select, :conditions, :include, :order, :group, :limit, :offset,
- 
+
-            :finder_sql, :delete_sql, :insert_sql,
- 
+
-            :extend
-          )
-
- if block_given?
+
-
-          reflection = create_reflection(:has_and_belongs_to_many, association_id, options, self)
-
-          reflection.options[:join_table] ||= join_table_name(undecorated_table_name(self.to_s), undecorated_table_name(reflection.class_name))
-
+
-          reflection
-        end