activerecord 1.0.0 → 2.0.0

data/lib/active_record/associations.rb

@@ -1,18 +1,87 @@
+require 'active_record/associations/association_proxy'
 require 'active_record/associations/association_collection'
+require 'active_record/associations/belongs_to_association'
+require 'active_record/associations/belongs_to_polymorphic_association'
+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'
 
 module ActiveRecord
+  class HasManyThroughAssociationNotFoundError < ActiveRecordError #:nodoc:
+    def initialize(owner_class_name, reflection)
+      super("Could not find the association #{reflection.options[:through].inspect} in model #{owner_class_name}")
+    end
+  end
+
+  class HasManyThroughAssociationPolymorphicError < ActiveRecordError #:nodoc:
+    def initialize(owner_class_name, reflection, source_reflection)
+      super("Cannot have a has_many :through association '#{owner_class_name}##{reflection.name}' on the polymorphic object '#{source_reflection.class_name}##{source_reflection.name}'.")
+    end
+  end
+  
+  class HasManyThroughAssociationPointlessSourceTypeError < ActiveRecordError #:nodoc:
+    def initialize(owner_class_name, reflection, source_reflection)
+      super("Cannot have a has_many :through association '#{owner_class_name}##{reflection.name}' with a :source_type option if the '#{reflection.through_reflection.class_name}##{source_reflection.name}' is not polymorphic.  Try removing :source_type on your association.")
+    end
+  end
+  
+  class HasManyThroughSourceAssociationNotFoundError < ActiveRecordError #:nodoc:
+    def initialize(reflection)
+      through_reflection      = reflection.through_reflection
+      source_reflection_names = reflection.source_reflection_names
+      source_associations     = reflection.through_reflection.klass.reflect_on_all_associations.collect { |a| a.name.inspect }
+      super("Could not find the source association(s) #{source_reflection_names.collect(&:inspect).to_sentence :connector => 'or'} in model #{through_reflection.klass}.  Try 'has_many #{reflection.name.inspect}, :through => #{through_reflection.name.inspect}, :source => <name>'.  Is it one of #{source_associations.to_sentence :connector => 'or'}?")
+    end
+  end
+
+  class HasManyThroughSourceAssociationMacroError < ActiveRecordError #:nodoc:
+    def initialize(reflection)
+      through_reflection = reflection.through_reflection
+      source_reflection  = reflection.source_reflection
+      super("Invalid source reflection macro :#{source_reflection.macro}#{" :through" if source_reflection.options[:through]} for has_many #{reflection.name.inspect}, :through => #{through_reflection.name.inspect}.  Use :source to specify the source reflection.")
+    end
+  end
+
+  class HasManyThroughCantAssociateNewRecords < ActiveRecordError #:nodoc:
+    def initialize(owner, reflection)
+      super("Cannot associate new records through '#{owner.class.name}##{reflection.name}' on '#{reflection.source_reflection.class_name rescue nil}##{reflection.source_reflection.name rescue nil}'. Both records must have an id in order to create the has_many :through record associating them.")
+    end
+  end
+
+  class HasManyThroughCantDissociateNewRecords < ActiveRecordError #:nodoc:
+    def initialize(owner, reflection)
+      super("Cannot dissociate new records through '#{owner.class.name}##{reflection.name}' on '#{reflection.source_reflection.class_name rescue nil}##{reflection.source_reflection.name rescue nil}'. Both records must have an id in order to delete the has_many :through record associating them.")
+    end
+  end
+
+  class EagerLoadPolymorphicError < ActiveRecordError #:nodoc:
+    def initialize(reflection)
+      super("Can not eagerly load the polymorphic association #{reflection.name.inspect}")
+    end
+  end
+
+  class ReadOnlyAssociation < ActiveRecordError #:nodoc:
+    def initialize(reflection)
+      super("Can not add to a has_many :through association.  Try adding to #{reflection.through_reflection.name.inspect}.")
+    end
+  end
+
   module Associations # :nodoc:
-    def self.append_features(base)
-      super
+    def self.included(base)
       base.extend(ClassMethods)
     end
 
+    # Clears out the association cache 
+    def clear_association_cache #:nodoc:
+      self.class.reflect_on_all_associations.to_a.each do |assoc|
+        instance_variable_set "@#{assoc.name}", nil
+      end unless self.new_record?
+    end
+    
     # Associations are a set of macro-like class methods for tying objects together through foreign keys. They express relationships like 
     # "Project has one Project Manager" or "Project belongs to a Portfolio". Each macro adds a number of methods to the class which are 
-    # specialized according to the collection or association symbol and the options hash. It works much the same was as Ruby's own attr* 
+    # specialized according to the collection or association symbol and the options hash. It works much the same way as Ruby's own <tt>attr*</tt> 
     # methods. Example:
     #
     #   class Project < ActiveRecord::Base
@@ -22,48 +91,336 @@ module ActiveRecord
     #     has_and_belongs_to_many :categories
     #   end
     #
-    # The project class now has the following methods to ease the traversel and manipulation of its relationships:
-    # * <tt>Project#portfolio, Project#portfolio=(portfolio), Project#portfolio.nil?, Project#portfolio?(portfolio)</tt>
-    # * <tt>Project#project_manager, Project#project_manager=(project_manager), Project#project_manger.nil?,</tt>
-    #   <tt>Project#project_manager?(project_manager), Project#build_project_manager, Project#create_project_manager</tt>
+    # The project class now has the following methods (and more) to ease the traversal and manipulation of its relationships:
+    # * <tt>Project#portfolio, Project#portfolio=(portfolio), Project#portfolio.nil?</tt>
+    # * <tt>Project#project_manager, Project#project_manager=(project_manager), Project#project_manager.nil?,</tt>
     # * <tt>Project#milestones.empty?, Project#milestones.size, Project#milestones, Project#milestones<<(milestone),</tt>
-    #   <tt>Project#milestones.delete(milestone), Project#milestones.find(milestone_id), Project#milestones.find_all(conditions),</tt>
+    #   <tt>Project#milestones.delete(milestone), Project#milestones.find(milestone_id), Project#milestones.find(:all, options),</tt>
     #   <tt>Project#milestones.build, Project#milestones.create</tt>
     # * <tt>Project#categories.empty?, Project#categories.size, Project#categories, Project#categories<<(category1),</tt>
     #   <tt>Project#categories.delete(category1)</tt>
     #
-    # == Example
+    # === A word of warning
     #
-    # link:../examples/associations.png
+    # Don't create associations that have the same name as instance methods of ActiveRecord::Base. Since the association
+    # adds a method with that name to its model, it will override the inherited method and break things.
+    # For instance, #attributes and #connection would be bad choices for association names.
     #
-    # == Is it belongs_to or has_one?
+    # == Auto-generated methods
     #
-    # Both express a 1-1 relationship, the difference is mostly where to place the foreign key, which goes on the table for the class
-    # saying belongs_to. Example:
+    # ===Singular associations (one-to-one)
+    #                                     |            |  belongs_to  |
+    #   generated methods                 | belongs_to | :polymorphic | has_one
+    #   ----------------------------------+------------+--------------+---------
+    #   #other                            |     X      |      X       |    X
+    #   #other=(other)                    |     X      |      X       |    X
+    #   #build_other(attributes={})       |     X      |              |    X
+    #   #create_other(attributes={})      |     X      |              |    X
+    #   #other.create!(attributes={})     |            |              |    X
+    #   #other.nil?                       |     X      |      X       |    
     #
-    #   class Post < ActiveRecord::Base
-    #     has_one :author
+    # ===Collection associations (one-to-many / many-to-many)
+    #                                     |       |          | has_many
+    #   generated methods                 | habtm | has_many | :through  
+    #   ----------------------------------+-------+----------+----------
+    #   #others                           |   X   |    X     |    X
+    #   #others=(other,other,...)         |   X   |    X     |    
+    #   #other_ids                        |   X   |    X     |    X
+    #   #other_ids=(id,id,...)            |   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     |    
+    #   #others.create!(attributes={})    |   X   |    X     |    X
+    #   #others.size                      |   X   |    X     |    X
+    #   #others.length                    |   X   |    X     |    X
+    #   #others.count                     |       |    X     |    X
+    #   #others.sum(args*,&block)         |   X   |    X     |    X
+    #   #others.empty?                    |   X   |    X     |    X
+    #   #others.clear                     |   X   |    X     |    
+    #   #others.delete(other,other,...)   |   X   |    X     |    X
+    #   #others.delete_all                |   X   |    X     |    
+    #   #others.destroy_all               |   X   |    X     |    X
+    #   #others.find(*args)               |   X   |    X     |    X
+    #   #others.find_first                |   X   |          |    
+    #   #others.uniq                      |   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
+    # the relation. In each case, the +belongs_to+ association is used in the model that has
+    # the foreign key.
+    #
+    # === One-to-one
+    #
+    # Use +has_one+ in the base, and +belongs_to+ in the associated model.
+    #
+    #   class Employee < ActiveRecord::Base
+    #     has_one :office
+    #   end
+    #   class Office < ActiveRecord::Base
+    #     belongs_to :employee    # foreign key - employee_id
     #   end
     #
-    #   class Author < ActiveRecord::Base
-    #     belongs_to :post
+    # === One-to-many
+    #
+    # Use +has_many+ in the base, and +belongs_to+ in the associated model.
+    #
+    #   class Manager < ActiveRecord::Base
+    #     has_many :employees
+    #   end
+    #   class Employee < ActiveRecord::Base
+    #     belongs_to :manager     # foreign key - manager_id
+    #   end
+    #
+    # === Many-to-many
+    #
+    # There are two ways to build a many-to-many relationship.
+    #
+    # The first way uses a +has_many+ association with the <tt>:through</tt> option and a join model, so
+    # there are two stages of associations.
+    #
+    #   class Assignment < ActiveRecord::Base
+    #     belongs_to :programmer  # foreign key - programmer_id
+    #     belongs_to :project     # foreign key - project_id
+    #   end
+    #   class Programmer < ActiveRecord::Base
+    #     has_many :assignments
+    #     has_many :projects, :through => :assignments
+    #   end
+    #   class Project < ActiveRecord::Base
+    #     has_many :assignments
+    #     has_many :programmers, :through => :assignments
+    #   end
+    #
+    # For the second way, use +has_and_belongs_to_many+ in both models. This requires a join table
+    # that has no corresponding model or primary key.
+    #
+    #   class Programmer < ActiveRecord::Base
+    #     has_and_belongs_to_many :projects       # foreign keys in the join table
+    #   end
+    #   class Project < ActiveRecord::Base
+    #     has_and_belongs_to_many :programmers    # foreign keys in the join table
+    #   end
+    #
+    # Choosing which way to build a many-to-many relationship is not always simple.
+    # If you need to work with the relationship model as its own entity, 
+    # 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.
+    #
+    # == Is it a +belongs_to+ or +has_one+ association?
+    #
+    # Both express a 1-1 relationship. The difference is mostly where to place the foreign key, which goes on the table for the class
+    # declaring the +belongs_to+ relationship. Example:
+    #
+    #   class User < ActiveRecord::Base
+    #     # I reference an account.
+    #     belongs_to :account
+    #   end
+    #
+    #   class Account < ActiveRecord::Base
+    #     # One user references me.
+    #     has_one :user
     #   end
     #
     # The tables for these classes could look something like:
     #
-    #   CREATE TABLE posts (
+    #   CREATE TABLE users (
     #     id int(11) NOT NULL auto_increment,
-    #     title varchar default NULL,
+    #     account_id int(11) default NULL,
+    #     name varchar default NULL,
     #     PRIMARY KEY  (id)
     #   )
     #
-    #   CREATE TABLE authors (
+    #   CREATE TABLE accounts (
     #     id int(11) NOT NULL auto_increment,
-    #     post_id int(11) default NULL,
     #     name varchar default NULL,
     #     PRIMARY KEY  (id)
     #   )
     #
+    # == Unsaved objects and associations
+    #
+    # You can manipulate objects and associations before they are saved to the database, but there is some special behavior you should be
+    # aware of, mostly involving the saving of associated objects.
+    #
+    # === One-to-one associations
+    #
+    # * Assigning an object to a +has_one+ association automatically saves that object and the object being replaced (if there is one), in
+    #   order to update their primary keys - except if the parent object is unsaved (<tt>new_record? == true</tt>).
+    # * If either of these saves fail (due to one of the objects being invalid) the assignment statement returns +false+ and the assignment
+    #   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).
+    # * Assigning an object to a +belongs_to+ association does not save the object, since the foreign key field belongs on the parent. It 
+    #   does not save the parent either.
+    #
+    # === Collections
+    #
+    # * Adding an object to a collection (+has_many+ or +has_and_belongs_to_many+) automatically saves that object, except if the parent object
+    #   (the owner of the collection) is not yet stored in the database.
+    # * If saving any of the objects being added to a collection (via <tt>#push</tt> or similar) fails, then <tt>#push</tt> returns +false+.
+    # * You can add an object to a collection without automatically saving it by using the <tt>#collection.build</tt> method (documented below).
+    # * All unsaved (<tt>new_record? == true</tt>) members of the collection are automatically saved when the parent is saved.
+    #
+    # === Association callbacks
+    #
+    # Similar to the normal callbacks that hook into the lifecycle of an Active Record object, you can also define callbacks that get
+    # triggered when you add an object to or remove an object from an association collection. Example:
+    #
+    #   class Project
+    #     has_and_belongs_to_many :developers, :after_add => :evaluate_velocity
+    #
+    #     def evaluate_velocity(developer)
+    #       ...
+    #     end
+    #   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}]
+    #   end
+    #
+    # Possible callbacks are: +before_add+, +after_add+, +before_remove+ and +after_remove+.
+    #
+    # Should any of the +before_add+ callbacks throw an exception, the object does not get added to the collection. Same with
+    # the +before_remove+ callbacks; if an exception is thrown the object doesn't get removed.
+    #
+    # === Association extensions
+    #
+    # The proxy objects that control the access to associations can be extended through anonymous modules. This is especially
+    # beneficial for adding new finders, creators, and other factory-type methods that are only used as part of this association.
+    # Example:
+    #
+    #   class Account < ActiveRecord::Base
+    #     has_many :people do
+    #       def find_or_create_by_name(name)
+    #         first_name, last_name = name.split(" ", 2)
+    #         find_or_create_by_first_name_and_last_name(first_name, last_name)
+    #       end
+    #     end
+    #   end
+    #
+    #   person = Account.find(:first).people.find_or_create_by_name("David Heinemeier Hansson")
+    #   person.first_name # => "David"
+    #   person.last_name  # => "Heinemeier Hansson"
+    #
+    # If you need to share the same extensions between many associations, you can use a named extension module. Example:
+    #
+    #   module FindOrCreateByNameExtension
+    #     def find_or_create_by_name(name)
+    #       first_name, last_name = name.split(" ", 2)
+    #       find_or_create_by_first_name_and_last_name(first_name, last_name)
+    #     end
+    #   end
+    #
+    #   class Account < ActiveRecord::Base
+    #     has_many :people, :extend => FindOrCreateByNameExtension
+    #   end
+    #
+    #   class Company < ActiveRecord::Base
+    #     has_many :people, :extend => FindOrCreateByNameExtension
+    #   end
+    #
+    # If you need to use multiple named extension modules, you can specify an array of modules with the <tt>:extend</tt> option.
+    # In the case of name conflicts between methods in the modules, methods in modules later in the array supercede
+    # those earlier in the array. Example:
+    #
+    #   class Account < ActiveRecord::Base
+    #     has_many :people, :extend => [FindOrCreateByNameExtension, FindRecentExtension]
+    #   end
+    #
+    # 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.
+    # * +proxy_target+ - Returns the associated object for +belongs_to+ and +has_one+, or the collection of associated objects for +has_many+ and +has_and_belongs_to_many+.
+    #
+    # === 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
+    #   end
+    #
+    #   @firm = Firm.find :first
+    #   @firm.clients.collect { |c| c.invoices }.flatten # select all invoices for all clients of the firm
+    #   @firm.invoices                                   # selects all invoices by going through the Client join model.
+    #
+    # === Polymorphic Associations
+    # 
+    # Polymorphic associations on models are not restricted on what types of models they can be associated with.  Rather, they 
+    # 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.
+    #   end
+    #
+    #   @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
+    # for the associations to work as expected, ensure that you store the base model for the STI models in the 
+    # 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.
+    #
+    #   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
+    #     has_many :assets, :as => :attachable, :dependent => :destroy
+    #   end
+    #
+    #   class GuestPost < Post
+    #   end
+    #
+    #   class MemberPost < Post
+    #   end
+    #
     # == Caching
     #
     # All of the methods are built on a simple caching principle that will keep the result of the last query around unless specifically
@@ -76,6 +433,108 @@ module ActiveRecord
     #   project.milestones(true).size  # fetches milestones from the database
     #   project.milestones             # uses the milestone cache
     #
+    # == Eager loading of associations
+    #
+    # Eager loading is a way to find objects of a certain class and a number of named associations along with it in a single SQL call. This is
+    # one of the easiest ways of to prevent the dreaded 1+N problem in which fetching 100 posts that each need to display their author
+    # triggers 101 database queries. Through the use of eager loading, the 101 queries can be reduced to 1. Example:
+    #
+    #   class Post < ActiveRecord::Base
+    #     belongs_to :author
+    #     has_many   :comments
+    #   end
+    #
+    # Consider the following loop using the class above:
+    #
+    #   for post in Post.find(:all)
+    #     puts "Post:            " + post.title
+    #     puts "Written by:      " + post.author.name
+    #     puts "Last comment on: " + post.comments.first.created_on
+    #   end 
+    #
+    # To iterate over these one hundred posts, we'll generate 201 database queries. Let's first just optimize it for retrieving the author:
+    #
+    #   for post in Post.find(:all, :include => :author)
+    #
+    # This references the name of the +belongs_to+ association that also used the <tt>:author</tt> symbol, so the find will now weave in a join something
+    # like this: <tt>LEFT OUTER JOIN authors ON authors.id = posts.author_id</tt>. Doing so will cut down the number of queries from 201 to 101.
+    #
+    # We can improve upon the situation further by referencing both associations in the finder with:
+    #
+    #   for post in Post.find(:all, :include => [ :author, :comments ])
+    #
+    # That'll add another join along the lines of: <tt>LEFT OUTER JOIN comments ON comments.post_id = posts.id</tt>. And we'll be down to 1 query.
+    #
+    # To include a deep hierarchy of associations, use a hash:
+    #
+    #   for post in Post.find(:all, :include => [ :author, { :comments => { :author => :gravatar } } ])
+    #
+    # That'll grab not only all the comments but all their authors and gravatar pictures.  You can mix and match
+    # symbols, arrays and hashes in any combination to describe the associations you want to load.
+    #
+    # All of this power shouldn't fool you into thinking that you can pull out huge amounts of data with no performance penalty just because you've reduced
+    # 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
+    # <tt>:select</tt> option is ignored.
+    #
+    # You can use eager loading on multiple associations from the same table, but you cannot use those associations in orders and conditions
+    # 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
+    #
+    # ActiveRecord uses table aliasing in the case that a table is referenced multiple times in a join.  If a table is referenced only once,
+    # 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 ...
+    #   Post.find :all, :include => :special_comments # STI
+    #   # => SELECT ... FROM posts LEFT OUTER JOIN comments ON ... AND comments.type = 'SpecialComment'
+    #   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
+    #   # => SELECT ... FROM mixins LEFT OUTER JOIN mixins childrens_mixins ... 
+    #                               LEFT OUTER JOIN parents_mixins ...
+    #   TreeMixin.find :all, :include => {:children => {:parent => :children}} 
+    #   # => SELECT ... FROM mixins LEFT OUTER JOIN mixins childrens_mixins ... 
+    #                               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 ...
+    #   Post.find :all, :include => {:categories => :posts}
+    #   # => SELECT ... FROM posts LEFT OUTER JOIN categories_posts ... LEFT OUTER JOIN categories ...
+    #                              LEFT OUTER JOIN categories_posts posts_categories_join LEFT OUTER JOIN posts posts_categories
+    #   Post.find :all, :include => {:categories => {:posts => :categories}}
+    #   # => SELECT ... FROM posts LEFT OUTER JOIN categories_posts ... LEFT OUTER JOIN categories ...
+    #                              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 ..."
+    #   # => SELECT ... FROM posts LEFT OUTER JOIN comments comments_posts ON ... 
+    #                              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
     #
     # By default, associations will look for objects within the current module scope. Consider:
@@ -90,8 +549,8 @@ module ActiveRecord
     #     end
     #   end
     #
-    # When Firm#clients is called, it'll in turn call <tt>MyApplication::Business::Company.find(firm.id)</tt>. If you want to associate
-    # with a class in another module scope this can be done by specifying the complete class name, such as:
+    # When <tt>Firm#clients</tt> is called, it will in turn call <tt>MyApplication::Business::Company.find(firm.id)</tt>. If you want to associate
+    # with a class in another module scope, this can be done by specifying the complete class name.  Example:
     #
     #   module MyApplication
     #     module Business
@@ -105,325 +564,414 @@ module ActiveRecord
     #     end
     #   end
     #
-    # == Type safety with ActiveRecord::AssociationTypeMismatch
+    # == Type safety with <tt>ActiveRecord::AssociationTypeMismatch</tt>
     #
     # If you attempt to assign an object to an association that doesn't match the inferred or specified <tt>:class_name</tt>, you'll
-    # get a ActiveRecord::AssociationTypeMismatch.
+    # get an <tt>ActiveRecord::AssociationTypeMismatch</tt>.
     #
     # == Options
     #
-    # All of the association macros can be specialized through options which makes more complex cases than the simple and guessable ones
+    # All of the association macros can be specialized through options. This makes cases more complex than the simple and guessable ones
     # possible.
     module ClassMethods
-      # Adds the following methods for retrival and query of collections of associated objects.
+      # Adds the following methods for retrieval and query of collections of associated objects:
       # +collection+ is replaced with the symbol passed as the first argument, so 
-      # <tt>has_many :clients</tt> would add among others <tt>has_clients?</tt>.
+      # <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 is found.
-      # * <tt>collection<<(object)</tt> - adds the object to the collection (by setting the foreign key on it) and saves it.
-      # * <tt>collection.delete(object)</tt> - removes the association by setting the foreign key to null on the associated object.
-      # * <tt>!collection.empty?</tt> - returns true if there's any 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.
+      # * <tt>collection.delete(object, ...)</tt> - removes one or more objects from the collection by setting their foreign keys to NULL.  
+      #   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.
+      # * <tt>collection_singular_ids</tt> - returns an array of the associated objects' ids
+      # * <tt>collection_singular_ids=ids</tt> - replace the collection with the objects identified by the primary keys in +ids+
+      # * <tt>collection.clear</tt> - removes every object from the collection. This destroys the associated objects if they
+      #   are associated with <tt>:dependent => :destroy</tt>, deletes them directly from the database if <tt>:dependent => :delete_all</tt>,
+      #   otherwise sets their foreign keys to NULL.
+      # * <tt>collection.empty?</tt> - returns +true+ if there are no associated objects.
       # * <tt>collection.size</tt> - returns the number of associated objects.
-      # * <tt>collection.find(id)</tt> - finds an associated object responding to the +id+ and that
-      #   meets the condition that it has to be associated with this object.
-      # * <tt>collection.find_all(conditions = nil, orderings = nil, limit = nil, joins = nil)</tt> - finds all associated objects responding 
-      #   criterias mentioned (like in the standard find_all) and that meets the condition that it has to be associated with this object.
-      # * <tt>collection.build(attributes = {})</tt> - returns a new object of the collection type that has been instantiated
-      #   with +attributes+ and linked to this object through a foreign key but has not yet been saved.
+      # * <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
+      #   with +attributes+ and linked to this object through a foreign key, but have not yet been saved. *Note:* This only works if an 
+      #   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
-      #   with +attributes+ and linked to this object through a foreign key and that has already been saved (if it passed the validation).
+      #   with +attributes+, linked to this object through a foreign key, and that has already been saved (if it passed the validation).
+      #   *Note:* This only works if an associated object already exists, not if it's +nil+!
       #
-      # Example: A Firm class declares <tt>has_many :clients</tt>, which will add:
-      # * <tt>Firm#clients</tt> (similar to <tt>Clients.find_all "firm_id = #{id}"</tt>)
+      # Example: A +Firm+ class declares <tt>has_many :clients</tt>, which will add:
+      # * <tt>Firm#clients</tt> (similar to <tt>Clients.find :all, :conditions => "firm_id = #{id}"</tt>)
       # * <tt>Firm#clients<<</tt>
       # * <tt>Firm#clients.delete</tt>
-      # * <tt>!Firm#clients.empty?</tt> (similar to <tt>firm.clients.length > 0</tt>)
+      # * <tt>Firm#clients=</tt>
+      # * <tt>Firm#client_ids</tt>
+      # * <tt>Firm#client_ids=</tt>
+      # * <tt>Firm#clients.clear</tt>
+      # * <tt>Firm#clients.empty?</tt> (similar to <tt>firm.clients.size == 0</tt>)
       # * <tt>Firm#clients.size</tt> (similar to <tt>Client.count "firm_id = #{id}"</tt>)
-      # * <tt>Firm#clients.find</tt> (similar to <tt>Client.find_on_conditions(id, "firm_id = #{id}")</tt>)
-      # * <tt>Firm#clients.find_all</tt> (similar to <tt>Client.find_all "firm_id = #{id}"</tt>)
+      # * <tt>Firm#clients.find</tt> (similar to <tt>Client.find(id, :conditions => "firm_id = #{id}")</tt>)
       # * <tt>Firm#clients.build</tt> (similar to <tt>Client.new("firm_id" => id)</tt>)
-      # * <tt>Firm#clients.create</tt> (similar to <tt>c = Client.new("client_id" => id); c.save; c</tt>)
-      # The declaration can also include an options hash to specialize the generated methods.
+      # * <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 infered
+      # * <tt>:class_name</tt>  - specify the class name of the association. Use it only if that name can't be inferred
       #   from the association name. So <tt>has_many :products</tt> will by default be linked to the +Product+ class, but
       #   if the real class name is +SpecialProduct+, you'll have to specify it with this option.
-      # * <tt>:conditions</tt>  - specify the conditions that the associated objects must meet in order to be included as a "WHERE"
-      #   sql fragment, such as "price > 5 AND name LIKE 'B%'".
-      # * <tt>:order</tt>       - specify the order in which the associated objects are returned as a "ORDER BY" sql fragment,
-      #   such as "last_name, first_name DESC"
+      # * <tt>:conditions</tt>  - specify the conditions that the associated objects must meet in order to be included as a +WHERE+
+      #   SQL fragment, such as <tt>price > 5 AND name LIKE 'B%'</tt>.
+      # * <tt>:order</tt>       - specify the order in which the associated objects are returned as an <tt>ORDER BY</tt> SQL fragment,
+      #   such as <tt>last_name, first_name DESC</tt>
       # * <tt>:foreign_key</tt> - specify the foreign key used for the association. By default this is guessed to be the name
-      #   of this class in lower-case and "_id" suffixed. So a +Person+ class that makes a has_many association will use "person_id"
-      #   as the default foreign_key.
-      # * <tt>:dependent</tt>   - if set to true all the associated object are destroyed alongside this object
-      # * <tt>:exclusively_dependent</tt>   - if set to true all the associated object are deleted in one SQL statement without having their
-      #   before_destroy callback run. This should only be used on associations that depend solely on this class and don't need to do any
-      #   clean-up in before_destroy. The upside is that it's much faster, especially if there's a counter_cache involved.
+      #   of this class in lower-case and +_id+ suffixed. So a +Person+ class that makes a +has_many+ association will use +person_id+
+      #   as the default +foreign_key+.
+      # * <tt>:dependent</tt>   - if set to <tt>:destroy</tt> all the associated objects are destroyed
+      #   alongside this object by calling their destroy method.  If set to <tt>:delete_all</tt> all associated
+      #   objects are deleted *without* calling their destroy method.  If set to <tt>:nullify</tt> all associated
+      #   objects' foreign keys are set to +NULL+ *without* calling their save callbacks.
       # * <tt>:finder_sql</tt>  - specify a complete SQL statement to fetch the association. This is a good way to go for complex
-      #   associations that depends on multiple tables. Note: When this option is used, +find_in_collection+ is _not_ added.
+      #   associations that depend on multiple tables. Note: When this option is used, +find_in_collection+ is _not_ added.
+      # * <tt>:counter_sql</tt>  - specify a complete SQL statement to fetch the size of the association. If <tt>:finder_sql</tt> is
+      #   specified but not <tt>:counter_sql</tt>, <tt>:counter_sql</tt> will be generated by replacing <tt>SELECT ... FROM</tt> with <tt>SELECT COUNT(*) FROM</tt>.
+      # * <tt>:extend</tt>  - specify a named module for extending the proxy. See "Association extensions".
+      # * <tt>:include</tt>  - specify second-order associations that should be eager loaded when the collection is loaded.
+      # * <tt>:group</tt>: An attribute name by which the result should be grouped. Uses the <tt>GROUP BY</tt> SQL-clause.
+      # * <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.
+      # * <tt>:select</tt>: By default, this is <tt>*</tt> as in <tt>SELECT * FROM</tt>, but can be changed if you, for example, want to do a join 
+      #   but not include the joined columns.
+      # * <tt>:as</tt>: Specifies a polymorphic interface (See <tt>#belongs_to</tt>).
+      # * <tt>:through</tt>: Specifies a Join Model through which to perform the query.  Options for <tt>:class_name</tt> and <tt>:foreign_key</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.
+      # * <tt>:source</tt>: Specifies the source association name used by <tt>has_many :through</tt> queries.  Only use it if the name cannot be 
+      #   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.
+      # * <tt>:source_type</tt>: Specifies type of the source association used by <tt>has_many :through</tt> queries where the source
+      #   association is a polymorphic +belongs_to+.
+      # * <tt>:uniq</tt> - if set to +true+, duplicates will be omitted from the collection. Useful in conjunction with <tt>:through</tt>.
       #
       # Option examples:
       #   has_many :comments, :order => "posted_on"
+      #   has_many :comments, :include => :author
       #   has_many :people, :class_name => "Person", :conditions => "deleted = 0", :order => "name"
-      #   has_many :tracks, :order => "position", :dependent => true
+      #   has_many :tracks, :order => "position", :dependent => :destroy
+      #   has_many :comments, :dependent => :nullify
+      #   has_many :tags, :as => :taggable
+      #   has_many :subscribers, :through => :subscriptions, :source => :user
       #   has_many :subscribers, :class_name => "Person", :finder_sql =>
       #       'SELECT DISTINCT people.* ' +
       #       'FROM people p, post_subscriptions ps ' +
       #       'WHERE ps.post_id = #{id} AND ps.person_id = p.id ' +
       #       'ORDER BY p.first_name'
-      def has_many(association_id, options = {})
-        validate_options([ :foreign_key, :class_name, :exclusively_dependent, :dependent, :conditions, :order, :finder_sql ], options.keys)
-        association_name, association_class_name, association_class_primary_key_name =
-              associate_identification(association_id, options[:class_name], options[:foreign_key])
- 
-        if options[:dependent]
-          module_eval "before_destroy '#{association_name}.each { |o| o.destroy }'"
-        end
+      def has_many(association_id, options = {}, &extension)
+        reflection = create_has_many_reflection(association_id, options, &extension)
 
-        if options[:exclusively_dependent]
-          module_eval "before_destroy Proc.new{ |record| #{association_class_name}.delete_all(%(#{association_class_primary_key_name} = '\#{record.id}')) }"
-        end
+        configure_dependency_for_has_many(reflection)
 
-        module_eval <<-"end_eval", __FILE__, __LINE__
-          def #{association_name}(force_reload = false)
-            if @#{association_name}.nil?
-                @#{association_name} = HasManyAssociation.new(self, "#{association_name}", "#{association_class_name}", 
-                  "#{association_class_primary_key_name}", #{options.inspect})
-            end
-            @#{association_name}.reload if force_reload
-            
-            return @#{association_name}
-          end
-        end_eval
-        
-        # deprecated api
-        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_create_method(association_name)
-        deprecated_build_method(association_name)
+        if options[:through]
+          collection_reader_method(reflection, HasManyThroughAssociation)
+          collection_accessor_methods(reflection, HasManyThroughAssociation, false)
+        else
+          add_multiple_associated_save_callbacks(reflection.name)
+          add_association_callbacks(reflection.name, reflection.options)
+          collection_accessor_methods(reflection, HasManyAssociation)
+        end
       end
 
-      # Adds the following methods for retrival and query of a single associated object.
+      # Adds the following methods for retrieval and query of a single associated object:
       # +association+ is replaced with the symbol passed as the first argument, so 
-      # <tt>has_one :manager</tt> would add among others <tt>has_manager?</tt>.
-      # * <tt>association(force_reload = false)</tt> - returns the associated object. Nil is returned if none is found.
+      # <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.
       # * <tt>association=(associate)</tt> - assigns the associate object, extracts the primary key, sets it as the foreign key, 
       #   and saves the associate object.
-      # * <tt>association?(object, force_reload = false)</tt> - returns true if the +object+ is of the same type and has the
-      #   same id as the associated object.
-      # * <tt>!association.nil?</tt> - returns true if there's an associated object.
+      # * <tt>association.nil?</tt> - returns +true+ if there is no associated object.
       # * <tt>build_association(attributes = {})</tt> - returns a new object of the associated type that has been instantiated
-      #   with +attributes+ and linked to this object through a foreign key but has not yet been saved.
+      #   with +attributes+ and linked to this object through a foreign key, but has not yet been saved. Note: This ONLY works if
+      #   an association already exists. It will NOT work if the association is +nil+.
       # * <tt>create_association(attributes = {})</tt> - returns a new object of the associated type that has been instantiated
-      #   with +attributes+ and linked to this object through a foreign key and that has already been saved (if it passed the validation).
+      #   with +attributes+, linked to this object through a foreign key, and that has already been saved (if it passed the validation).
       #
       # Example: An Account class declares <tt>has_one :beneficiary</tt>, which will add:
-      # * <tt>Account#beneficiary</tt> (similar to <tt>Beneficiary.find_first "account_id = #{id}"</tt>)
+      # * <tt>Account#beneficiary</tt> (similar to <tt>Beneficiary.find(:first, :conditions => "account_id = #{id}")</tt>)
       # * <tt>Account#beneficiary=(beneficiary)</tt> (similar to <tt>beneficiary.account_id = account.id; beneficiary.save</tt>)
-      # * <tt>Account#beneficiary?</tt> (similar to <tt>account.beneficiary == some_beneficiary</tt>)
-      # * <tt>!Account#beneficiary.nil?</tt>
+      # * <tt>Account#beneficiary.nil?</tt>
       # * <tt>Account#build_beneficiary</tt> (similar to <tt>Beneficiary.new("account_id" => id)</tt>)
       # * <tt>Account#create_beneficiary</tt> (similar to <tt>b = Beneficiary.new("account_id" => id); b.save; b</tt>)
-      # The declaration can also include an options hash to specialize the generated methods.
+      #
+      # 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 infered
+      # * <tt>:class_name</tt>  - specify the class name of the association. Use it only if that name can't be inferred
       #   from the association name. So <tt>has_one :manager</tt> will by default be linked to the +Manager+ class, but
       #   if the real class name is +Person+, you'll have to specify it with this option.
-      # * <tt>:conditions</tt>  - specify the conditions that the associated object must meet in order to be included as a "WHERE"
-      #   sql fragment, such as "rank = 5".
-      # * <tt>:order</tt>       - specify the order from which the associated object will be picked at the top. Specified as
-      #    an "ORDER BY" sql fragment, such as "last_name, first_name DESC"
-      # * <tt>:dependent</tt>   - if set to true the associated object is destroyed alongside this object
+      # * <tt>:conditions</tt>  - specify the conditions that the associated object must meet in order to be included as a +WHERE+
+      #   SQL fragment, such as <tt>rank = 5</tt>.
+      # * <tt>:order</tt>       - specify the order in which the associated objects are returned as an <tt>ORDER BY</tt> SQL fragment,
+      #   such as <tt>last_name, first_name DESC</tt>
+      # * <tt>:dependent</tt>   - if set to <tt>:destroy</tt>, the associated object is destroyed when this object is. If set to
+      #   <tt>:delete</tt>, the associated object is deleted *without* calling its destroy method. If set to <tt>:nullify</tt>, the associated
+      #   object's foreign key is set to +NULL+. Also, association is assigned.
       # * <tt>:foreign_key</tt> - specify the foreign key used for the association. By default this is guessed to be the name
-      #   of this class in lower-case and "_id" suffixed. So a +Person+ class that makes a has_one association will use "person_id"
-      #   as the default foreign_key.
-      #
+      #   of this class in lower-case and +_id+ suffixed. So a +Person+ class that makes a +has_one+ association will use +person_id+
+      #   as the default +foreign_key+.
+      # * <tt>:include</tt>  - specify second-order associations that should be eager loaded when this object is loaded.
+      # * <tt>:as</tt>: Specifies a polymorphic interface (See <tt>#belongs_to</tt>).
+            #
       # Option examples:
-      #   has_one :credit_card, :dependent => true
+      #   has_one :credit_card, :dependent => :destroy  # destroys the associated credit card
+      #   has_one :credit_card, :dependent => :nullify  # updates the associated records foreign key value to NULL rather than destroying it
       #   has_one :last_comment, :class_name => "Comment", :order => "posted_on"
       #   has_one :project_manager, :class_name => "Person", :conditions => "role = 'project_manager'"
+      #   has_one :attachment, :as => :attachable
       def has_one(association_id, options = {})
-        options.merge!({ :remote => true })
-        belongs_to(association_id, options)
-
-        association_name, association_class_name, class_primary_key_name =
-            associate_identification(association_id, options[:class_name], options[:foreign_key], false)
+        reflection = create_has_one_reflection(association_id, options)
 
-        has_one_writer_method(association_name, association_class_name, class_primary_key_name)
-        build_method("build_", association_name, association_class_name, class_primary_key_name)
-        create_method("create_", association_name, association_class_name, class_primary_key_name)
+        module_eval do
+          after_save <<-EOF
+            association = instance_variable_get("@#{reflection.name}")
+            if !association.nil? && (new_record? || association.new_record? || association["#{reflection.primary_key_name}"] != id)
+              association["#{reflection.primary_key_name}"] = id
+              association.save(true)
+            end
+          EOF
+        end
+      
+        association_accessor_methods(reflection, HasOneAssociation)
+        association_constructor_method(:build,  reflection, HasOneAssociation)
+        association_constructor_method(:create, reflection, HasOneAssociation)
         
-        module_eval "before_destroy '#{association_name}.destroy if has_#{association_name}?'" if options[:dependent]
+        configure_dependency_for_has_one(reflection)
       end
 
-      # Adds the following methods for retrival and query for a single associated object that this object holds an id to.
+      # Adds the following methods for retrieval and query for a single associated object for which this object holds an id:
       # +association+ is replaced with the symbol passed as the first argument, so 
-      # <tt>belongs_to :author</tt> would add among others <tt>has_author?</tt>.
-      # * <tt>association(force_reload = false)</tt> - returns the associated object. Nil is returned if none is found.
+      # <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.
       # * <tt>association=(associate)</tt> - assigns the associate object, extracts the primary key, and sets it as the foreign key.
-      # * <tt>association?(object, force_reload = false)</tt> - returns true if the +object+ is of the same type and has the
-      #   same id as the associated object.
-      # * <tt>association.nil?</tt> - returns true if there's an associated object.
+      # * <tt>association.nil?</tt> - returns +true+ if there is no associated object.
+      # * <tt>build_association(attributes = {})</tt> - returns a new object of the associated type that has been instantiated
+      #   with +attributes+ and linked to this object through a foreign key, but has not yet been saved.
+      # * <tt>create_association(attributes = {})</tt> - returns a new object of the associated type that has been instantiated
+      #   with +attributes+, linked to this object through a foreign key, and that has already been saved (if it passed the validation).
       #
-      # Example: An Post class declares <tt>has_one :author</tt>, which will add:
+      # Example: A Post class declares <tt>belongs_to :author</tt>, which will add:
       # * <tt>Post#author</tt> (similar to <tt>Author.find(author_id)</tt>)
       # * <tt>Post#author=(author)</tt> (similar to <tt>post.author_id = author.id</tt>)
       # * <tt>Post#author?</tt> (similar to <tt>post.author == some_author</tt>)
-      # * <tt>!Post#author.nil?</tt>
-      # The declaration can also include an options hash to specialize the generated methods.
+      # * <tt>Post#author.nil?</tt>
+      # * <tt>Post#build_author</tt> (similar to <tt>post.author = Author.new</tt>)
+      # * <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 infered
+      # * <tt>:class_name</tt>  - specify the class name of the association. Use it only if that name can't be inferred
       #   from the association name. So <tt>has_one :author</tt> will by default be linked to the +Author+ class, but
       #   if the real class name is +Person+, you'll have to specify it with this option.
-      # * <tt>:conditions</tt>  - specify the conditions that the associated object must meet in order to be included as a "WHERE"
-      #   sql fragment, such as "authorized = 1".
-      # * <tt>:order</tt>       - specify the order from which the associated object will be picked at the top. Specified as
-      #   an "ORDER BY" sql fragment, such as "last_name, first_name DESC"
+      # * <tt>:conditions</tt>  - specify the conditions that the associated object must meet in order to be included as a +WHERE+
+      #   SQL fragment, such as <tt>authorized = 1</tt>.
+      # * <tt>:order</tt>       - specify the order in which the associated objects are returned as an <tt>ORDER BY</tt> SQL fragment,
+      #   such as <tt>last_name, first_name DESC</tt>
       # * <tt>:foreign_key</tt> - specify the foreign key used for the association. By default this is guessed to be the name
-      #   of the associated class in lower-case and "_id" suffixed. So a +Person+ class that makes a belongs_to association to a
-      #   +Boss+ class will use "boss_id" as the default foreign_key.
-      # * <tt>:counter_cache</tt> - caches the number of belonging objects on the associate class through use of increment_counter 
-      #   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 "#{table_name}_count" (such as comments_count for a belonging Comment class)
-      #   is used on the associate class (such as a Post class).
+      #   of the associated class in lower-case and +_id+ suffixed. So a +Person+ class that makes a +belongs_to+ association to a
+      #   +Boss+ class will use +boss_id+ as the default +foreign_key+.
+      # * <tt>:counter_cache</tt> - caches the number of belonging objects on the associate class through the use of +increment_counter+ 
+      #   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)
+      #   is used on the associate class (such as a +Post+ class). You can also specify a custom counter cache column by providing 
+      #   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+.
+      #   Note: If you've enabled the counter cache, then you may want to add the counter cache attribute 
+      #   to the attr_readonly list in the associated classes (e.g. class Post; attr_readonly :comments_count; end).
       #
       # Option examples:
       #   belongs_to :firm, :foreign_key => "client_of"
       #   belongs_to :author, :class_name => "Person", :foreign_key => "author_id"
       #   belongs_to :valid_coupon, :class_name => "Coupon", :foreign_key => "coupon_id", 
       #              :conditions => 'discounts > #{payments_count}'
-       def belongs_to(association_id, options = {})
-          validate_options([ :class_name, :foreign_key, :remote, :conditions, :order, :dependent, :counter_cache ], options.keys)
-
-          association_name, association_class_name, class_primary_key_name =
-              associate_identification(association_id, options[:class_name], options[:foreign_key], false)
+      #   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)
 
-          association_class_primary_key_name = options[:foreign_key] || Inflector.underscore(Inflector.demodulize(association_class_name)) + "_id"
+          module_eval do
+            before_save <<-EOF
+              association = instance_variable_get("@#{reflection.name}")
+              if association && association.target
+                if association.new_record?
+                  association.save(true)
+                end
+                
+                if association.updated?
+                  self["#{reflection.primary_key_name}"] = association.id
+                  self["#{reflection.options[:foreign_type]}"] = association.class.base_class.name.to_s
+                end
+              end
+            EOF
+          end
+        else
+          association_accessor_methods(reflection, BelongsToAssociation)
+          association_constructor_method(:build,  reflection, BelongsToAssociation)
+          association_constructor_method(:create, reflection, BelongsToAssociation)
 
-          if options[:remote]
-            association_finder = <<-"end_eval"
-              #{association_class_name}.find_first(
-                "#{class_primary_key_name} = '\#{id}'#{options[:conditions] ? " AND " + options[:conditions] : ""}",
-                #{options[:order] ? "\"" + options[:order] + "\"" : "nil" }
-              )
-            end_eval
-          else
-            association_finder = options[:conditions] ?
-              "#{association_class_name}.find_on_conditions(#{association_class_primary_key_name}, \"#{options[:conditions]}\")" :
-              "#{association_class_name}.find(#{association_class_primary_key_name})"
+          module_eval do
+            before_save <<-EOF
+              association = instance_variable_get("@#{reflection.name}")
+              if !association.nil? 
+                if association.new_record?
+                  association.save(true)
+                end
+                
+                if association.updated?
+                  self["#{reflection.primary_key_name}"] = association.id
+                end
+              end            
+            EOF
           end
+        end
 
-          has_association_method(association_name)
-          association_reader_method(association_name, association_finder)
-          belongs_to_writer_method(association_name, association_class_name, association_class_primary_key_name)
-          association_comparison_method(association_name, association_class_name)
+        # Create the callbacks to update counter cache
+        if options[:counter_cache]
+          cache_column = options[:counter_cache] == true ?
+            "#{self.to_s.underscore.pluralize}_count" :
+            options[:counter_cache]
 
-          if options[:counter_cache]
-            module_eval(
-              "after_create '#{association_class_name}.increment_counter(\"#{Inflector.pluralize(self.to_s.downcase). + "_count"}\", #{association_class_primary_key_name})" +
-              " if has_#{association_name}?'"
-            )
+          module_eval(
+            "after_create '#{reflection.name}.class.increment_counter(\"#{cache_column}\", #{reflection.primary_key_name})" +
+            " unless #{reflection.name}.nil?'"
+          )
 
-            module_eval(
-              "before_destroy '#{association_class_name}.decrement_counter(\"#{Inflector.pluralize(self.to_s.downcase) + "_count"}\", #{association_class_primary_key_name})" +
-              " if has_#{association_name}?'"
-            )          
-          end
+          module_eval(
+            "before_destroy '#{reflection.name}.class.decrement_counter(\"#{cache_column}\", #{reflection.primary_key_name})" +
+            " 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)"
+          )
         end
+      end
 
       # Associates two classes via an intermediate join table.  Unless the join table is explicitly specified as
-      # 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".
-      # Adds the following methods for retrival and query.
+      # 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
+      # is calculated using the <tt><</tt> operator for <tt>String</tt>.  This means that if the strings are of different lengths, 
+      # and the strings are equal when compared up to the shortest length, then the longer string is considered of higher
+      # lexical precedence than the shorter one.  For example, one would expect the tables <tt>paper_boxes</tt> and <tt>papers</tt> 
+      # to generate a join table name of <tt>papers_paper_boxes</tt> because of the length of the name <tt>paper_boxes</tt>,
+      # but it in fact generates a join table name of <tt>paper_boxes_papers</tt>.  Be aware of this caveat, and use the 
+      # custom <tt>join_table</tt> option if you need to.
+      #
+      # Deprecated: Any additional fields added to the join table will be placed as attributes when pulling records out through
+      # +has_and_belongs_to_many+ associations. Records returned from join tables with additional attributes will be marked as
+      # +ReadOnly+ (because we can't save changes to the additional attributes). It's strongly recommended that you upgrade any
+      # associations with attributes to a real join model (see introduction).
+      #
+      # Adds the following methods for retrieval and query:
       # +collection+ is replaced with the symbol passed as the first argument, so 
-      # <tt>has_and_belongs_to_many :categories</tt> would add among others +add_categories+.
+      # <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 is found.
-      # * <tt>!collection.empty?</tt> - returns true if there's any associated objects.
+      #   An empty array is returned if none are found.
+      # * <tt>collection<<(object, ...)</tt> - adds one or more objects to the collection by creating associations in the join table 
+      #   (<tt>collection.push</tt> and <tt>collection.concat</tt> are aliases to this method).
+      # * <tt>collection.delete(object, ...)</tt> - removes one or more objects from the collection by removing their associations from the join table.  
+      #   This does not destroy the objects.
+      # * <tt>collection=objects</tt> - replaces the collection's content by deleting and adding objects as appropriate.
+      # * <tt>collection_singular_ids</tt> - returns an array of the associated objects' ids
+      # * <tt>collection_singular_ids=ids</tt> - replace the collection by the objects identified by the primary keys in +ids+
+      # * <tt>collection.clear</tt> - removes every object from the collection. This does not destroy the objects.
+      # * <tt>collection.empty?</tt> - returns +true+ if there are no associated objects.
       # * <tt>collection.size</tt> - returns the number of associated objects.
-      # * <tt>collection<<(object)</tt> - adds an association between this object and the object given as argument. Multiple associations
-      #   can be created by passing an array of objects instead.
-      # * <tt>collection.delete(object)</tt> - removes the association between this object and the object given as 
-      #   argument. Multiple associations can be removed by passing an array of objects instead.
+      # * <tt>collection.find(id)</tt> - finds an associated object responding to the +id+ and that
+      #   meets the condition that it has to be associated with this object.
+      # * <tt>collection.build(attributes = {})</tt> - returns a new object of the collection type that has been instantiated
+      #   with +attributes+ and linked to this object through the join table, but has not yet been saved.
+      # * <tt>collection.create(attributes = {})</tt> - returns a new object of the collection type that has been instantiated
+      #   with +attributes+, linked to this object through the join table, and that has already been saved (if it passed the validation).
       #
-      # Example: An Developer class declares <tt>has_and_belongs_to_many :projects</tt>, which will add:
+      # Example: A Developer class declares <tt>has_and_belongs_to_many :projects</tt>, which will add:
       # * <tt>Developer#projects</tt>
-      # * <tt>!Developer#projects.empty?</tt>
-      # * <tt>Developer#projects.size</tt>
       # * <tt>Developer#projects<<</tt>
       # * <tt>Developer#projects.delete</tt>
-      # The declaration can also include an options hash to specialize the generated methods.
+      # * <tt>Developer#projects=</tt>
+      # * <tt>Developer#project_ids</tt>
+      # * <tt>Developer#project_ids=</tt>
+      # * <tt>Developer#projects.clear</tt>
+      # * <tt>Developer#projects.empty?</tt>
+      # * <tt>Developer#projects.size</tt>
+      # * <tt>Developer#projects.find(id)</tt>
+      # * <tt>Developer#projects.build</tt> (similar to <tt>Project.new("project_id" => id)</tt>)
+      # * <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 infered
+      # * <tt>:class_name</tt> - specify the class name of the association. Use it only if that name can't be inferred
       #   from the association name. So <tt>has_and_belongs_to_many :projects</tt> will by default be linked to the 
       #   +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.
-      #   WARNING: If you're overwriting the table name of either class, the table_name method MUST be declared underneath any
-      #   has_and_belongs_to_many declaration in order to work.
+      #   WARNING: If you're overwriting the table name of either class, the +table_name+ method MUST be declared underneath any
+      #   +has_and_belongs_to_many+ declaration in order to work.
       # * <tt>:foreign_key</tt> - specify the foreign key used for the association. By default this is guessed to be the name
-      #   of this class in lower-case and "_id" suffixed. So a +Person+ class that makes a has_and_belongs_to_many association
-      #   will use "person_id" as the default foreign_key.
+      #   of this class in lower-case and +_id+ suffixed. So a +Person+ class that makes a +has_and_belongs_to_many+ association
+      #   will use +person_id+ as the default +foreign_key+.
       # * <tt>:association_foreign_key</tt> - specify the association foreign key used for the association. By default this is
-      #   guessed to be the name of the associated class in lower-case and "_id" suffixed. So the associated class is +Project+
-      #   that makes a has_and_belongs_to_many association will use "project_id" as the default association foreign_key.
-      # * <tt>:order</tt> - specify the order in which the associated objects are returned as a "ORDER BY" sql fragment, such as "last_name, first_name DESC".
-      # * <tt>:finder_sql</tt> - overwrite the default generated SQL used to fetch the association with a manual one
-      # * <tt>:delete_sql</tt> - overwrite the default generated SQL used to remove links between the associated 
-      #   classes with a manual one
-      # * <tt>:insert_sql</tt> - overwrite the default generated SQL used to add links between the associated classes
-      #   with a manual one
+      #   guessed to be the name of the associated class in lower-case and +_id+ suffixed. So if the associated class is +Project+,
+      #   the +has_and_belongs_to_many+ association will use +project_id+ as the default association +foreign_key+.
+      # * <tt>:conditions</tt>  - specify the conditions that the associated object must meet in order to be included as a +WHERE+
+      #   SQL fragment, such as <tt>authorized = 1</tt>.
+      # * <tt>:order</tt> - specify the order in which the associated objects are returned as an <tt>ORDER BY</tt> SQL fragment,
+      #   such as <tt>last_name, first_name DESC</tt>
+      # * <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
+      # * <tt>:delete_sql</tt> - overwrite the default generated SQL statement used to remove links between the associated 
+      #   classes with a manual statement
+      # * <tt>:insert_sql</tt> - overwrite the default generated SQL statement used to add links between the associated classes
+      #   with a manual statement
+      # * <tt>:extend</tt>  - anonymous module for extending the proxy, see "Association extensions".
+      # * <tt>:include</tt>  - specify second-order associations that should be eager loaded when the collection is loaded.
+      # * <tt>:group</tt>: An attribute name by which the result should be grouped. Uses the <tt>GROUP BY</tt> SQL-clause.
+      # * <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.
+      # * <tt>:select</tt>: By default, this is <tt>*</tt> as in <tt>SELECT * FROM</tt>, but can be changed if, for example, you want to do a join
+      #   but not include the joined columns.
       #
       # Option examples:
       #   has_and_belongs_to_many :projects
+      #   has_and_belongs_to_many :projects, :include => [ :milestones, :manager ]
       #   has_and_belongs_to_many :nations, :class_name => "Country"
       #   has_and_belongs_to_many :categories, :join_table => "prods_cats"
-      def has_and_belongs_to_many(association_id, options = {})
-        validate_options([ :class_name, :table_name, :foreign_key, :association_foreign_key,
-                           :join_table, :finder_sql, :delete_sql, :insert_sql, :order ], options.keys)
-        association_name, association_class_name, association_class_primary_key_name =
-              associate_identification(association_id, options[:class_name], options[:foreign_key])
-
-        join_table  = options[:join_table] || 
-          join_table_name(undecorated_table_name(self.to_s), undecorated_table_name(association_class_name))
- 
+      #   has_and_belongs_to_many :active_projects, :join_table => 'developers_projects', :delete_sql => 
+      #   '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)
         
-        module_eval <<-"end_eval", __FILE__, __LINE__
-          def #{association_name}(force_reload = false)
-            if @#{association_name}.nil?
-                @#{association_name} = HasAndBelongsToManyCollection.new(self, "#{association_name}", "#{association_class_name}", 
-                  "#{association_class_primary_key_name}", '#{join_table}', #{options.inspect})
-            end
-            @#{association_name}.reload if force_reload
-            
-            return @#{association_name}
+        add_multiple_associated_save_callbacks(reflection.name)
+        collection_accessor_methods(reflection, HasAndBelongsToManyAssociation)
+
+        # Don't use a before_destroy callback since users' before_destroy
+        # callbacks will be executed after the association is wiped out.
+        old_method = "destroy_without_habtm_shim_for_#{reflection.name}"
+        class_eval <<-end_eval unless method_defined?(old_method)
+          alias_method :#{old_method}, :destroy_without_callbacks
+          def destroy_without_callbacks
+            #{reflection.name}.clear
+            #{old_method}
           end
         end_eval
 
-        before_destroy_sql = "DELETE FROM #{join_table} WHERE #{Inflector.foreign_key(self.class_name)} = '\\\#{self.id}'"
-        module_eval(%{before_destroy "self.connection.delete(%{#{before_destroy_sql}})"}) # "
-        
-        # deprecated api
-        deprecated_collection_count_method(association_name)
-        deprecated_add_association_relation(association_name)
-        deprecated_remove_association_relation(association_name)
-        deprecated_has_collection_method(association_name)
+        add_association_callbacks(reflection.name, options)
       end
 
       private
-        # Raises an exception if an invalid option has been specified to prevent misspellings from slipping through 
-        def validate_options(valid_option_keys, supplied_option_keys)
-          unknown_option_keys = supplied_option_keys - valid_option_keys
-          raise(ActiveRecord::ActiveRecordError, "Unknown options: #{unknown_option_keys}") unless unknown_option_keys.empty?
-        end
-        
+        # Generate a join table name from two provided tables names.
+        # The order of names in join name is determined by lexical precedence.
+        #   join_table_name("members", "clubs")
+        #   => "clubs_members"
+        #   join_table_name("members", "special_clubs")
+        #   => "members_special_clubs"
         def join_table_name(first_table_name, second_table_name)
           if first_table_name < second_table_name
             join_table = "#{first_table_name}_#{second_table_name}"
@@ -433,104 +981,789 @@ module ActiveRecord
 
           table_name_prefix + join_table + table_name_suffix
         end
-        
-        def associate_identification(association_id, association_class_name, foreign_key, plural = true)
-          if association_class_name !~ /::/
-            association_class_name = type_name_with_module(
-              association_class_name || 
-                Inflector.camelize(plural ? Inflector.singularize(association_id.id2name) : association_id.id2name)
-            )
+      
+        def association_accessor_methods(reflection, association_proxy_class)
+          define_method(reflection.name) do |*params|
+            force_reload = params.first unless params.empty?
+            association = instance_variable_get("@#{reflection.name}")
+
+            if association.nil? || force_reload
+              association = association_proxy_class.new(self, reflection)
+              retval = association.reload
+              if retval.nil? and association_proxy_class == BelongsToAssociation
+                instance_variable_set("@#{reflection.name}", nil)
+                return nil
+              end
+              instance_variable_set("@#{reflection.name}", association)
+            end
+
+            association.target.nil? ? nil : association
           end
 
-          primary_key_name = foreign_key || Inflector.underscore(Inflector.demodulize(name)) + "_id"
-        
-          return association_id.id2name, association_class_name, primary_key_name
+          define_method("#{reflection.name}=") do |new_value|
+            association = instance_variable_get("@#{reflection.name}")
+            if association.nil? || association.target != new_value
+              association = association_proxy_class.new(self, reflection)
+            end
+
+            association.replace(new_value)
+
+            unless new_value.nil?
+              instance_variable_set("@#{reflection.name}", association)
+            else
+              instance_variable_set("@#{reflection.name}", nil)
+            end
+          end
+
+          define_method("set_#{reflection.name}_target") do |target|
+            return if target.nil? and association_proxy_class == BelongsToAssociation
+            association = association_proxy_class.new(self, reflection)
+            association.target = target
+            instance_variable_set("@#{reflection.name}", association)
+          end
         end
-        
-        def association_comparison_method(association_name, association_class_name)
-          module_eval <<-"end_eval", __FILE__, __LINE__
-            def #{association_name}?(comparison_object, force_reload = false)
-              if comparison_object.kind_of?(#{association_class_name})
-                #{association_name}(force_reload) == comparison_object
+
+        def collection_reader_method(reflection, association_proxy_class)
+          define_method(reflection.name) do |*params|
+            force_reload = params.first unless params.empty?
+            association = instance_variable_get("@#{reflection.name}")
+
+            unless association.respond_to?(:loaded?)
+              association = association_proxy_class.new(self, reflection)
+              instance_variable_set("@#{reflection.name}", association)
+            end
+
+            association.reload if force_reload
+
+            association
+          end
+        end
+
+        def collection_accessor_methods(reflection, association_proxy_class, writer = true)
+          collection_reader_method(reflection, association_proxy_class)
+
+          define_method("#{reflection.name}=") do |new_value|
+            # Loads proxy class instance (defined in collection_reader_method) if not already loaded
+            association = send(reflection.name) 
+            association.replace(new_value)
+            association
+          end
+
+          define_method("#{reflection.name.to_s.singularize}_ids") do
+            send(reflection.name).map(&:id)
+          end
+
+          define_method("#{reflection.name.to_s.singularize}_ids=") do |new_value|
+            ids = (new_value || []).reject { |nid| nid.blank? }
+            send("#{reflection.name}=", reflection.class_name.constantize.find(ids))
+          end if writer
+        end
+
+        def add_multiple_associated_save_callbacks(association_name)
+          method_name = "validate_associated_records_for_#{association_name}".to_sym
+          define_method(method_name) do
+            association = instance_variable_get("@#{association_name}")
+            if association.respond_to?(:loaded?)
+              if new_record?
+                association
               else
-                raise "Comparison object is a #{association_class_name}, should have been \#{comparison_object.class.name}"
+                association.select { |record| record.new_record? }
+              end.each do |record|
+                errors.add "#{association_name}" unless record.valid?
               end
             end
+          end
+
+          validate method_name
+          before_save("@new_record_before_save = new_record?; true")
+
+          after_callback = <<-end_eval
+            association = instance_variable_get("@#{association_name}")
+
+            records_to_save = if @new_record_before_save
+              association
+            elsif association.respond_to?(:loaded?) && association.loaded?
+              association.select { |record| record.new_record? }
+            else
+              []
+            end
+
+            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)
           end_eval
+
+          # Doesn't use after_save as that would save associations added in after_create/after_update twice
+          after_create(after_callback)
+          after_update(after_callback)
         end
 
-        def association_reader_method(association_name, association_finder)
-          module_eval <<-"end_eval", __FILE__, __LINE__
-            def #{association_name}(force_reload = false)
-              if @#{association_name}.nil? || force_reload
-                begin
-                  @#{association_name} = #{association_finder}
-                rescue ActiveRecord::StatementInvalid, ActiveRecord::RecordNotFound
-                  nil
-                end
-              end
-              
-              return @#{association_name}
+        def association_constructor_method(constructor, reflection, association_proxy_class)
+          define_method("#{constructor}_#{reflection.name}") do |*params|
+            attributees      = params.first unless params.empty?
+            replace_existing = params[1].nil? ? true : params[1]
+            association      = instance_variable_get("@#{reflection.name}")
+
+            if association.nil?
+              association = association_proxy_class.new(self, reflection)
+              instance_variable_set("@#{reflection.name}", association)
             end
-          end_eval
+
+            if association_proxy_class == HasOneAssociation
+              association.send(constructor, attributees, replace_existing)
+            else
+              association.send(constructor, attributees)
+            end
+          end
+        end
+        
+        def find_with_associations(options = {})
+          catch :invalid_query do
+            join_dependency = JoinDependency.new(self, merge_includes(scope(:find, :include), options[:include]), options[:joins])
+            rows = select_all_rows(options, join_dependency)
+            return join_dependency.instantiate(rows)
+          end
+          []
         end
 
-        def has_one_writer_method(association_name, association_class_name, class_primary_key_name)
-          module_eval <<-"end_eval", __FILE__, __LINE__
-            def #{association_name}=(association)
-              if association.nil?
-                @#{association_name}.#{class_primary_key_name} = nil
-                @#{association_name}.save(false)
-                @#{association_name} = nil
+        # See HasManyAssociation#delete_records.  Dependent associations
+        # delete children, otherwise foreign key is set to NULL.
+        def configure_dependency_for_has_many(reflection)
+          if reflection.options.include?(:dependent)
+            # Add polymorphic type if the :as option is present
+            dependent_conditions = []
+            dependent_conditions << "#{reflection.primary_key_name} = \#{record.quoted_id}"
+            dependent_conditions << "#{reflection.options[:as]}_type = '#{base_class.name}'" if reflection.options[:as]
+            dependent_conditions << sanitize_sql(reflection.options[:conditions]) if reflection.options[:conditions]
+            dependent_conditions = dependent_conditions.collect {|where| "(#{where})" }.join(" AND ")
+
+            case reflection.options[:dependent]
+              when :destroy
+                module_eval "before_destroy '#{reflection.name}.each { |o| o.destroy }'"
+              when :delete_all
+                module_eval "before_destroy { |record| #{reflection.class_name}.delete_all(%(#{dependent_conditions})) }"
+              when :nullify
+                module_eval "before_destroy { |record| #{reflection.class_name}.update_all(%(#{reflection.primary_key_name} = NULL),  %(#{dependent_conditions})) }"
               else
-                raise ActiveRecord::AssociationTypeMismatch unless #{association_class_name} === association
-                association.#{class_primary_key_name} = id
-                association.save(false)
-                @#{association_name} = association
-              end
+                raise ArgumentError, "The :dependent option expects either :destroy, :delete_all, or :nullify (#{reflection.options[:dependent].inspect})"
             end
-          end_eval
+          end
         end
 
-        def belongs_to_writer_method(association_name, association_class_name, association_class_primary_key_name)
-          module_eval <<-"end_eval", __FILE__, __LINE__
-            def #{association_name}=(association)
-              if association.nil?
-                @#{association_name} = self.#{association_class_primary_key_name} = nil
+        def configure_dependency_for_has_one(reflection)
+          if reflection.options.include?(:dependent)
+            case reflection.options[:dependent]
+              when :destroy
+                module_eval "before_destroy '#{reflection.name}.destroy unless #{reflection.name}.nil?'"
+              when :delete
+                module_eval "before_destroy '#{reflection.class_name}.delete(#{reflection.name}.id) unless #{reflection.name}.nil?'"
+              when :nullify
+                module_eval "before_destroy '#{reflection.name}.update_attribute(\"#{reflection.primary_key_name}\", nil) unless #{reflection.name}.nil?'"
               else
-                raise ActiveRecord::AssociationTypeMismatch unless #{association_class_name} === association
-                @#{association_name} = association
-                self.#{association_class_primary_key_name} = association.id
-              end
+                raise ArgumentError, "The :dependent option expects either :destroy, :delete or :nullify (#{reflection.options[:dependent].inspect})"
             end
-          end_eval
+          end
+        end
+
+        def create_has_many_reflection(association_id, options, &extension)
+          options.assert_valid_keys(
+            :class_name, :table_name, :foreign_key,
+            :dependent,
+            :select, :conditions, :include, :order, :group, :limit, :offset,
+            :as, :through, :source, :source_type,
+            :uniq,
+            :finder_sql, :counter_sql, 
+            :before_add, :after_add, :before_remove, :after_remove, 
+            :extend
+          )
+
+          options[:extend] = create_extension_modules(association_id, extension, options[:extend]) if block_given?
+
+          create_reflection(:has_many, association_id, options, self)
+        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, :as
+          )
+
+          create_reflection(:has_one, association_id, options, self)
         end
 
-        def has_association_method(association_name)
-          module_eval <<-"end_eval", __FILE__, __LINE__
-            def has_#{association_name}?(force_reload = false)
-              !#{association_name}(force_reload).nil?
+        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"
+          end
+
+          reflection
+        end
+        
+        def create_has_and_belongs_to_many_reflection(association_id, options, &extension)
+          options.assert_valid_keys(
+            :class_name, :table_name, :join_table, :foreign_key, :association_foreign_key, 
+            :select, :conditions, :include, :order, :group, :limit, :offset,
+            :uniq, 
+            :finder_sql, :delete_sql, :insert_sql,
+            :before_add, :after_add, :before_remove, :after_remove, 
+            :extend
+          )
+
+          options[:extend] = create_extension_modules(association_id, extension, options[: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
+
+        def reflect_on_included_associations(associations)
+          [ associations ].flatten.collect { |association| reflect_on_association(association.to_s.intern) }
+        end
+
+        def guard_against_unlimitable_reflections(reflections, options)
+          if (options[:offset] || options[:limit]) && !using_limitable_reflections?(reflections)
+            raise(
+              ConfigurationError, 
+              "You can not use offset and limit together with has_many or has_and_belongs_to_many associations"
+            )
+          end
+        end
+
+        def select_all_rows(options, join_dependency)
+          connection.select_all(
+            construct_finder_sql_with_included_associations(options, join_dependency),
+            "#{name} Load Including Associations"
+          )
+        end
+
+        def construct_finder_sql_with_included_associations(options, join_dependency)
+          scope = scope(:find)
+          sql = "SELECT #{column_aliases(join_dependency)} FROM #{(scope && scope[:from]) || options[:from] || quoted_table_name} "
+          sql << join_dependency.join_associations.collect{|join| join.association_join }.join
+ 
+          add_joins!(sql, options, scope)
+          add_conditions!(sql, options[:conditions], scope)
+          add_limited_ids_condition!(sql, options, join_dependency) if !using_limitable_reflections?(join_dependency.reflections) && ((scope && scope[:limit]) || options[:limit])
+
+          add_group!(sql, options[:group], scope)
+          add_order!(sql, options[:order], scope)
+          add_limit!(sql, options, scope) if using_limitable_reflections?(join_dependency.reflections)
+          add_lock!(sql, options, scope)
+ 
+          return sanitize_sql(sql)
+        end
+ 
+        def add_limited_ids_condition!(sql, options, join_dependency)
+          unless (id_list = select_limited_ids_list(options, join_dependency)).empty?
+            sql << "#{condition_word(sql)} #{connection.quote_table_name table_name}.#{primary_key} IN (#{id_list}) "
+          else
+            throw :invalid_query
+          end
+        end
+
+        def select_limited_ids_list(options, join_dependency)
+          pk = columns_hash[primary_key]
+
+          connection.select_all(
+            construct_finder_sql_for_association_limiting(options, join_dependency),
+            "#{name} Load IDs For Limited Eager Loading"
+          ).collect { |row| connection.quote(row[primary_key], pk) }.join(", ")
+        end
+
+        def construct_finder_sql_for_association_limiting(options, join_dependency)
+          scope       = scope(:find)
+          is_distinct = !options[:joins].blank? || include_eager_conditions?(options) || include_eager_order?(options)
+          sql = "SELECT "
+          if is_distinct
+            sql << connection.distinct("#{connection.quote_table_name table_name}.#{primary_key}", options[:order])
+          else
+            sql << primary_key
+          end
+          sql << " FROM #{connection.quote_table_name table_name} "
+
+          if is_distinct
+            sql << join_dependency.join_associations.collect(&:association_join).join
+            add_joins!(sql, options, scope)
+          end
+
+          add_conditions!(sql, options[:conditions], scope)
+          add_group!(sql, options[:group], scope)
+
+          if options[:order] && is_distinct
+            connection.add_order_by_for_association_limiting!(sql, options)
+          else
+            add_order!(sql, options[:order], scope)
+          end
+
+          add_limit!(sql, options, scope)
+
+          return sanitize_sql(sql)
+        end
+
+        # Checks if the conditions reference a table other than the current model table
+        def include_eager_conditions?(options)
+          # look in both sets of conditions
+          conditions = [scope(:find, :conditions), options[:conditions]].inject([]) do |all, cond|
+            case cond
+              when nil   then all
+              when Array then all << cond.first
+              else            all << cond
             end
-          end_eval
+          end
+          return false unless conditions.any?
+          conditions.join(' ').scan(/([\.\w]+)\.\w+/).flatten.any? do |condition_table_name|
+            condition_table_name != table_name
+          end
         end
         
-        def build_method(method_prefix, collection_name, collection_class_name, class_primary_key_name)
-          module_eval <<-"end_eval", __FILE__, __LINE__
-            def #{method_prefix + collection_name}(attributes = {})
-              association = #{collection_class_name}.new
-              association.attributes = attributes.merge({ "#{class_primary_key_name}" => id})
-              association
+        # Checks if the query order references a table other than the current model's table.
+        def include_eager_order?(options)
+          order = options[:order]
+          return false unless order
+          order.scan(/([\.\w]+)\.\w+/).flatten.any? do |order_table_name|
+            order_table_name != table_name
+          end
+        end
+
+        def using_limitable_reflections?(reflections)
+          reflections.reject { |r| [ :belongs_to, :has_one ].include?(r.macro) }.length.zero?
+        end
+
+        def column_aliases(join_dependency)
+          join_dependency.joins.collect{|join| join.column_names_with_alias.collect{|column_name, aliased_name|
+              "#{connection.quote_table_name join.aliased_table_name}.#{connection.quote_column_name column_name} AS #{aliased_name}"}}.flatten.join(", ")
+        end
+
+        def add_association_callbacks(association_name, options)
+          callbacks = %w(before_add after_add before_remove after_remove)
+          callbacks.each do |callback_name|
+            full_callback_name = "#{callback_name}_for_#{association_name}"
+            defined_callbacks = options[callback_name.to_sym]
+            if options.has_key?(callback_name.to_sym)
+              class_inheritable_reader full_callback_name.to_sym
+              write_inheritable_attribute(full_callback_name.to_sym, [defined_callbacks].flatten)
+            else
+              write_inheritable_attribute(full_callback_name.to_sym, [])
             end
-          end_eval
+          end
+        end
+
+        def condition_word(sql)
+          sql =~ /where/i ? " AND " : "WHERE "
         end
 
-        def create_method(method_prefix, collection_name, collection_class_name, class_primary_key_name)
-          module_eval <<-"end_eval", __FILE__, __LINE__
-            def #{method_prefix + collection_name}(attributes = nil)
-              #{collection_class_name}.create((attributes || {}).merge({ "#{class_primary_key_name}" => id}))
+        def create_extension_modules(association_id, block_extension, extensions)
+          extension_module_name = "#{self.to_s}#{association_id.to_s.camelize}AssociationExtension"
+
+          silence_warnings do
+            Object.const_set(extension_module_name, Module.new(&block_extension))
+          end
+
+          Array(extensions).push(extension_module_name.constantize)
+        end
+
+        class JoinDependency # :nodoc:
+          attr_reader :joins, :reflections, :table_aliases
+
+          def initialize(base, associations, joins)
+            @joins                 = [JoinBase.new(base, joins)]
+            @associations          = associations
+            @reflections           = []
+            @base_records_hash     = {}
+            @base_records_in_order = []
+            @table_aliases         = Hash.new { |aliases, table| aliases[table] = 0 }
+            @table_aliases[base.table_name] = 1
+            build(associations)
+          end
+
+          def join_associations
+            @joins[1..-1].to_a
+          end
+
+          def join_base
+            @joins[0]
+          end
+
+          def instantiate(rows)
+            rows.each_with_index do |row, i|
+              primary_id = join_base.record_id(row)
+              unless @base_records_hash[primary_id]
+                @base_records_in_order << (@base_records_hash[primary_id] = join_base.instantiate(row))
+              end
+              construct(@base_records_hash[primary_id], @associations, join_associations.dup, row)
             end
-          end_eval
+            remove_duplicate_results!(join_base.active_record, @base_records_in_order, @associations)
+            return @base_records_in_order
+          end
+
+          def remove_duplicate_results!(base, records, associations)
+            case associations
+              when Symbol, String
+                reflection = base.reflections[associations]
+                if reflection && [:has_many, :has_and_belongs_to_many].include?(reflection.macro)
+                  records.each { |record| record.send(reflection.name).target.uniq! }
+                end
+              when Array
+                associations.each do |association|
+                  remove_duplicate_results!(base, records, association)
+                end
+              when Hash
+                associations.keys.each do |name|
+                  reflection = base.reflections[name]
+                  is_collection = [:has_many, :has_and_belongs_to_many].include?(reflection.macro)
+
+                  parent_records = records.map do |record|
+                    next unless record.send(reflection.name)
+                    is_collection ? record.send(reflection.name).target.uniq! : record.send(reflection.name)
+                  end.flatten.compact
+
+                  remove_duplicate_results!(reflection.class_name.constantize, parent_records, associations[name]) unless parent_records.empty?
+                end
+            end
+          end
+
+          protected
+            def build(associations, parent = nil)
+              parent ||= @joins.last
+              case associations
+                when Symbol, String
+                  reflection = parent.reflections[associations.to_s.intern] or
+                  raise ConfigurationError, "Association named '#{ associations }' was not found; perhaps you misspelled it?"
+                  @reflections << reflection
+                  @joins << build_join_association(reflection, parent)
+                when Array
+                  associations.each do |association|
+                    build(association, parent)
+                  end
+                when Hash
+                  associations.keys.sort{|a,b|a.to_s<=>b.to_s}.each do |name|
+                    build(name, parent)
+                    build(associations[name])
+                  end
+                else
+                  raise ConfigurationError, associations.inspect
+              end
+            end
+
+            # overridden in InnerJoinDependency subclass
+            def build_join_association(reflection, parent)
+              JoinAssociation.new(reflection, self, parent)
+            end
+
+            def construct(parent, associations, joins, row)
+              case associations
+                when Symbol, String
+                  while (join = joins.shift).reflection.name.to_s != associations.to_s
+                    raise ConfigurationError, "Not Enough Associations" if joins.empty?
+                  end
+                  construct_association(parent, join, row)
+                when Array
+                  associations.each do |association|
+                    construct(parent, association, joins, row)
+                  end
+                when Hash
+                  associations.keys.sort{|a,b|a.to_s<=>b.to_s}.each do |name|
+                    association = construct_association(parent, joins.shift, row)
+                    construct(association, associations[name], joins, row) if association
+                  end
+                else
+                  raise ConfigurationError, associations.inspect
+              end
+            end
+
+            def construct_association(record, join, row)
+              case join.reflection.macro
+                when :has_many, :has_and_belongs_to_many
+                  collection = record.send(join.reflection.name)
+                  collection.loaded
+
+                  return nil if record.id.to_s != join.parent.record_id(row).to_s or row[join.aliased_primary_key].nil?
+                  association = join.instantiate(row)
+                  collection.target.push(association)
+                when :has_one
+                  return if record.id.to_s != join.parent.record_id(row).to_s
+                  association = join.instantiate(row) unless row[join.aliased_primary_key].nil?
+                  record.send("set_#{join.reflection.name}_target", association)
+                when :belongs_to
+                  return if record.id.to_s != join.parent.record_id(row).to_s or row[join.aliased_primary_key].nil?
+                  association = join.instantiate(row)
+                  record.send("set_#{join.reflection.name}_target", association)
+                else
+                  raise ConfigurationError, "unknown macro: #{join.reflection.macro}"
+              end
+              return association
+            end
+
+          class JoinBase # :nodoc:
+            attr_reader :active_record, :table_joins
+            delegate    :table_name, :column_names, :primary_key, :reflections, :sanitize_sql, :to => :active_record
+
+            def initialize(active_record, joins = nil)
+              @active_record = active_record
+              @cached_record = {}
+              @table_joins   = joins
+            end
+
+            def aliased_prefix
+              "t0"
+            end
+
+            def aliased_primary_key
+              "#{ aliased_prefix }_r0"
+            end
+
+            def aliased_table_name
+              active_record.table_name
+            end
+
+            def column_names_with_alias
+              unless @column_names_with_alias
+                @column_names_with_alias = []
+                ([primary_key] + (column_names - [primary_key])).each_with_index do |column_name, i|
+                  @column_names_with_alias << [column_name, "#{ aliased_prefix }_r#{ i }"]
+                end
+              end
+              return @column_names_with_alias
+            end
+
+            def extract_record(row)
+              column_names_with_alias.inject({}){|record, (cn, an)| record[cn] = row[an]; record}
+            end
+
+            def record_id(row)
+              row[aliased_primary_key]
+            end
+
+            def instantiate(row)
+              @cached_record[record_id(row)] ||= active_record.send(:instantiate, extract_record(row))
+            end
+          end
+
+          class JoinAssociation < JoinBase # :nodoc:
+            attr_reader :reflection, :parent, :aliased_table_name, :aliased_prefix, :aliased_join_table_name, :parent_table_name
+            delegate    :options, :klass, :through_reflection, :source_reflection, :to => :reflection
+
+            def initialize(reflection, join_dependency, parent = nil)
+              reflection.check_validity!
+              if reflection.options[:polymorphic]
+                raise EagerLoadPolymorphicError.new(reflection)
+              end
+
+              super(reflection.klass)
+              @parent             = parent
+              @reflection         = reflection
+              @aliased_prefix     = "t#{ join_dependency.joins.size }"
+              @aliased_table_name = table_name #.tr('.', '_') # start with the table name, sub out any .'s
+              @parent_table_name  = parent.active_record.table_name
+
+              if !parent.table_joins.blank? && parent.table_joins.to_s.downcase =~ %r{join(\s+\w+)?\s+#{aliased_table_name.downcase}\son}
+                join_dependency.table_aliases[aliased_table_name] += 1
+              end
+              
+              unless join_dependency.table_aliases[aliased_table_name].zero?
+                # if the table name has been used, then use an alias
+                @aliased_table_name = active_record.connection.table_alias_for "#{pluralize(reflection.name)}_#{parent_table_name}"
+                table_index = join_dependency.table_aliases[aliased_table_name]
+                join_dependency.table_aliases[aliased_table_name] += 1
+                @aliased_table_name = @aliased_table_name[0..active_record.connection.table_alias_length-3] + "_#{table_index+1}" if table_index > 0
+              else
+                join_dependency.table_aliases[aliased_table_name] += 1
+              end
+              
+              if reflection.macro == :has_and_belongs_to_many || (reflection.macro == :has_many && reflection.options[:through])
+                @aliased_join_table_name = reflection.macro == :has_and_belongs_to_many ? reflection.options[:join_table] : reflection.through_reflection.klass.table_name
+                unless join_dependency.table_aliases[aliased_join_table_name].zero?
+                  @aliased_join_table_name = active_record.connection.table_alias_for "#{pluralize(reflection.name)}_#{parent_table_name}_join"
+                  table_index = join_dependency.table_aliases[aliased_join_table_name]
+                  join_dependency.table_aliases[aliased_join_table_name] += 1
+                  @aliased_join_table_name = @aliased_join_table_name[0..active_record.connection.table_alias_length-3] + "_#{table_index+1}" if table_index > 0
+                else
+                  join_dependency.table_aliases[aliased_join_table_name] += 1
+                end
+              end
+            end
+
+            def association_join
+              connection = reflection.active_record.connection
+              join = case reflection.macro
+                when :has_and_belongs_to_many
+                  " #{join_type} %s ON %s.%s = %s.%s " % [
+                     table_alias_for(options[:join_table], aliased_join_table_name),
+                     connection.quote_table_name(aliased_join_table_name),
+                     options[:foreign_key] || reflection.active_record.to_s.foreign_key,
+                     connection.quote_table_name(parent.aliased_table_name),
+		     reflection.active_record.primary_key] +
+                  " #{join_type} %s ON %s.%s = %s.%s " % [
+                     table_name_and_alias,
+		     connection.quote_table_name(aliased_table_name),
+		     klass.primary_key,
+                     connection.quote_table_name(aliased_join_table_name),
+		     options[:association_foreign_key] || klass.to_s.foreign_key
+                     ]
+                when :has_many, :has_one
+                  case
+                    when reflection.macro == :has_many && reflection.options[:through]
+                      through_conditions = through_reflection.options[:conditions] ? "AND #{interpolate_sql(sanitize_sql(through_reflection.options[:conditions]))}" : ''
+                      
+                      jt_foreign_key = jt_as_extra = jt_source_extra = jt_sti_extra = nil 
+                      first_key = second_key = as_extra = nil 
+                      
+                      if through_reflection.options[:as] # has_many :through against a polymorphic join
+                        jt_foreign_key = through_reflection.options[:as].to_s + '_id'
+                        jt_as_extra = " AND %s.%s = %s" % [
+                          connection.quote_table_name(aliased_join_table_name),
+                          connection.quote_column_name(through_reflection.options[:as].to_s + '_type'),
+                          klass.quote_value(parent.active_record.base_class.name)
+                        ]
+                      else
+                        jt_foreign_key = through_reflection.primary_key_name 
+                      end
+                        
+                      case source_reflection.macro
+                      when :has_many
+                        if source_reflection.options[:as] 
+                          first_key   = "#{source_reflection.options[:as]}_id" 
+                          second_key  = options[:foreign_key] || primary_key 
+                          as_extra    = " AND %s.%s = %s" % [
+                            connection.quote_table_name(aliased_table_name),
+                            connection.quote_column_name("#{source_reflection.options[:as]}_type"),
+                            klass.quote_value(source_reflection.active_record.base_class.name) 
+                          ]
+                        else
+                          first_key   = through_reflection.klass.base_class.to_s.foreign_key
+                          second_key  = options[:foreign_key] || primary_key
+                        end
+                        
+                        unless through_reflection.klass.descends_from_active_record?
+                          jt_sti_extra = " AND %s.%s = %s" % [
+                            connection.quote_table_name(aliased_join_table_name),
+                            connection.quote_column_name(through_reflection.active_record.inheritance_column),
+                            through_reflection.klass.quote_value(through_reflection.klass.name.demodulize)]
+                        end
+                      when :belongs_to
+                        first_key = primary_key
+                        if reflection.options[:source_type]
+                          second_key = source_reflection.association_foreign_key
+                          jt_source_extra = " AND %s.%s = %s" % [
+                            connection.quote_table_name(aliased_join_table_name),
+                            connection.quote_column_name(reflection.source_reflection.options[:foreign_type]),
+                            klass.quote_value(reflection.options[:source_type])
+                          ]
+                        else
+                          second_key = source_reflection.primary_key_name
+                        end
+                      end
+
+                      " #{join_type} %s ON (%s.%s = %s.%s%s%s%s) " % [
+                        table_alias_for(through_reflection.klass.table_name, aliased_join_table_name),
+                        connection.quote_table_name(parent.aliased_table_name),
+			connection.quote_column_name(parent.primary_key),
+                        connection.quote_table_name(aliased_join_table_name),
+			connection.quote_column_name(jt_foreign_key),
+                        jt_as_extra, jt_source_extra, jt_sti_extra
+                      ] +
+                      " #{join_type} %s ON (%s.%s = %s.%s%s) " % [
+                        table_name_and_alias, 
+                        connection.quote_table_name(aliased_table_name),
+			connection.quote_column_name(first_key),
+                        connection.quote_table_name(aliased_join_table_name),
+			connection.quote_column_name(second_key),
+                        as_extra
+                      ]
+
+                    when reflection.options[:as] && [:has_many, :has_one].include?(reflection.macro)
+                      " #{join_type} %s ON %s.%s = %s.%s AND %s.%s = %s" % [
+                        table_name_and_alias,
+                        connection.quote_table_name(aliased_table_name),
+			"#{reflection.options[:as]}_id",
+                        connection.quote_table_name(parent.aliased_table_name),
+			parent.primary_key,
+                        connection.quote_table_name(aliased_table_name),
+			"#{reflection.options[:as]}_type",
+                        klass.quote_value(parent.active_record.base_class.name)
+                      ]
+                    else
+                      foreign_key = options[:foreign_key] || reflection.active_record.name.foreign_key
+                      " #{join_type} %s ON %s.%s = %s.%s " % [
+                        table_name_and_alias,
+                        aliased_table_name,
+			foreign_key,
+                        parent.aliased_table_name,
+			parent.primary_key
+                      ]
+                  end
+                when :belongs_to
+                  " #{join_type} %s ON %s.%s = %s.%s " % [
+                     table_name_and_alias,
+		     connection.quote_table_name(aliased_table_name),
+		     reflection.klass.primary_key,
+                     connection.quote_table_name(parent.aliased_table_name),
+		     options[:foreign_key] || klass.to_s.foreign_key
+                    ]
+                else
+                  ""
+              end || ''
+              join << %(AND %s.%s = %s ) % [
+                connection.quote_table_name(aliased_table_name),
+                connection.quote_column_name(klass.inheritance_column),
+                klass.quote_value(klass.name.demodulize)] unless klass.descends_from_active_record?
+
+              [through_reflection, reflection].each do |ref|
+                join << "AND #{interpolate_sql(sanitize_sql(ref.options[:conditions]))} " if ref && ref.options[:conditions]
+              end
+
+              join
+            end
+            
+            protected
+
+              def pluralize(table_name)
+                ActiveRecord::Base.pluralize_table_names ? table_name.to_s.pluralize : table_name
+              end
+              
+              def table_alias_for(table_name, table_alias)
+	         "#{reflection.active_record.connection.quote_table_name(table_name)} #{table_alias if table_name != table_alias}".strip
+              end
+
+              def table_name_and_alias
+                table_alias_for table_name, @aliased_table_name
+              end
+
+              def interpolate_sql(sql)
+                instance_eval("%@#{sql.gsub('@', '\@')}@") 
+              end 
+
+            private
+
+              def join_type
+                "LEFT OUTER JOIN"
+              end
+          end
+        end
+
+        class InnerJoinDependency < JoinDependency # :nodoc:
+          protected
+            def build_join_association(reflection, parent)
+              InnerJoinAssociation.new(reflection, self, parent)
+            end
+
+          class InnerJoinAssociation < JoinAssociation
+            private
+              def join_type
+                "INNER JOIN"
+              end
+          end
         end
+
     end
   end
-end
+end