From 379c02267b3cbbf6d1ac48bc79ec6ea01af7b53a Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Thu, 16 Dec 2010 22:06:19 +0000
Subject: Specify insert_record with NotImplementedError in
 AssociationCollection, to indicate that subclasses should implement it. Also
 add save_record to reduce duplication.

---
 .../associations/has_and_belongs_to_many_association.rb             | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb')

diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index e2ce9aefcf..259bf1f591 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -35,11 +35,7 @@ module ActiveRecord
 
         def insert_record(record, force = true, validate = true)
           if record.new_record?
-            if force
-              record.save!
-            else
-              return false unless record.save(:validate => validate)
-            end
+            return false unless save_record(record, force, validate)
           end
 
           if @reflection.options[:insert_sql]
-- 
cgit v1.2.3


From 9863d8a5f6576ab10df51230c0531cec8d4468f9 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Fri, 17 Dec 2010 09:57:27 +0000
Subject: Remove unnecessary overloaded methods create, create! and
 create_record from HasAndBelongsToManyAssociation

---
 .../has_and_belongs_to_many_association.rb             | 18 ------------------
 1 file changed, 18 deletions(-)

(limited to 'activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb')

diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index 259bf1f591..e17ac6f2cc 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -2,14 +2,6 @@ module ActiveRecord
   # = Active Record Has And Belongs To Many Association
   module Associations
     class HasAndBelongsToManyAssociation < AssociationCollection #:nodoc:
-      def create(attributes = {})
-        create_record(attributes) { |record| insert_record(record) }
-      end
-
-      def create!(attributes = {})
-        create_record(attributes) { |record| insert_record(record, true) }
-      end
-
       def columns
         @reflection.columns(@reflection.options[:join_table], "#{@reflection.options[:join_table]} Columns")
       end
@@ -109,16 +101,6 @@ module ActiveRecord
         end
 
       private
-        def create_record(attributes, &block)
-          # Can't use Base.create because the foreign key may be a protected attribute.
-          ensure_owner_is_persisted!
-          if attributes.is_a?(Array)
-            attributes.collect { |attr| create(attr) }
-          else
-            build_record(attributes, &block)
-          end
-        end
-
         def record_timestamp_columns(record)
           if record.record_timestamps
             record.send(:all_timestamp_attributes).map { |x| x.to_s }
-- 
cgit v1.2.3


From e8ada11aac28f0850f0e485acacf34e7eb81aa19 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Fri, 24 Dec 2010 00:29:04 +0000
Subject: Associations: DRY up the code which is generating conditions, and
 make it all use arel rather than SQL strings

---
 .../associations/has_and_belongs_to_many_association.rb        | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb')

diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index e17ac6f2cc..24871303eb 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -75,10 +75,12 @@ module ActiveRecord
           "INNER JOIN #{@owner.connection.quote_table_name @reflection.options[:join_table]} ON #{@reflection.quoted_table_name}.#{@reflection.klass.primary_key} = #{@owner.connection.quote_table_name @reflection.options[:join_table]}.#{@reflection.association_foreign_key}"
         end
 
-        def construct_conditions
-          sql = "#{@owner.connection.quote_table_name @reflection.options[:join_table]}.#{@reflection.primary_key_name} = #{owner_quoted_id} "
-          sql << " AND (#{conditions})" if conditions
-          sql
+        def join_table
+          Arel::Table.new(@reflection.options[:join_table])
+        end
+
+        def construct_owner_conditions
+          super(join_table)
         end
 
         def construct_find_scope
-- 
cgit v1.2.3


From 9f5c18ce075179cfc73a00cba9a19d69aaf5274c Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Sun, 26 Dec 2010 21:37:25 +0000
Subject: Refactor we_can_set_the_inverse_on_this? to use a less bizarre name
 amongst other things

---
 .../active_record/associations/has_and_belongs_to_many_association.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb')

diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index 24871303eb..b1d454545f 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -110,6 +110,10 @@ module ActiveRecord
             []
           end
         end
+
+        def invertible_for?(record)
+          false
+        end
     end
   end
 end
-- 
cgit v1.2.3


From 12675988813e82ac30f7c0e0008c12c4cf5d8cdc Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Fri, 31 Dec 2010 20:00:24 +0000
Subject: Rename AssociationReflection#primary_key_name to foreign_key, since
 the options key which it relates to is :foreign_key

---
 .../active_record/associations/has_and_belongs_to_many_association.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb')

diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index b1d454545f..5336b6cc28 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -40,7 +40,7 @@ module ActiveRecord
             attributes = columns.map do |column|
               name = column.name
               value = case name.to_s
-                when @reflection.primary_key_name.to_s
+                when @reflection.foreign_key.to_s
                   @owner.id
                 when @reflection.association_foreign_key.to_s
                   record.id
@@ -64,7 +64,7 @@ module ActiveRecord
             records.each { |record| @owner.connection.delete(interpolate_sql(sql, record)) }
           else
             relation = Arel::Table.new(@reflection.options[:join_table])
-            stmt = relation.where(relation[@reflection.primary_key_name].eq(@owner.id).
+            stmt = relation.where(relation[@reflection.foreign_key].eq(@owner.id).
               and(relation[@reflection.association_foreign_key].in(records.map { |x| x.id }.compact))
             ).compile_delete
             @owner.connection.delete stmt.to_sql
-- 
cgit v1.2.3


From 3103296a61709e808aa89c3d37cf22bcdbc5a675 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Sun, 2 Jan 2011 20:33:18 +0000
Subject: Let AssociationCollection#find use #scoped to do its finding. Note
 that I am removing
 test_polymorphic_has_many_going_through_join_model_with_disabled_include,
 since this specifies different behaviour for an association than for a
 regular scope. It seems reasonable to expect scopes and association proxies
 to behave in roughly the same way rather than having subtle differences.

---
 .../has_and_belongs_to_many_association.rb         | 34 ++++++++++++----------
 1 file changed, 19 insertions(+), 15 deletions(-)

(limited to 'activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb')

diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index 5336b6cc28..3abe3c2dae 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -2,6 +2,7 @@ module ActiveRecord
   # = Active Record Has And Belongs To Many Association
   module Associations
     class HasAndBelongsToManyAssociation < AssociationCollection #:nodoc:
+
       def columns
         @reflection.columns(@reflection.options[:join_table], "#{@reflection.options[:join_table]} Columns")
       end
@@ -15,11 +16,6 @@ module ActiveRecord
       end
 
       protected
-        def construct_find_options!(options)
-          options[:joins]      = Arel::SqlLiteral.new(@scope[:find][:joins])
-          options[:readonly]   = finding_with_ambiguous_select?(options[:select] || @reflection.options[:select])
-          options[:select]   ||= (@reflection.options[:select] || Arel::SqlLiteral.new('*'))
-        end
 
         def count_records
           load_target.size
@@ -84,22 +80,23 @@ module ActiveRecord
         end
 
         def construct_find_scope
-          {
-            :conditions => construct_conditions,
-            :joins      => construct_joins,
-            :readonly   => false,
-            :order      => @reflection.options[:order],
-            :include    => @reflection.options[:include],
-            :limit      => @reflection.options[:limit]
-          }
+          super.merge(
+            :joins    => construct_joins,
+            :readonly => ambiguous_select?(@reflection.options[:select]),
+            :select   => @reflection.options[:select] || Arel.star
+          )
         end
 
         # Join tables with additional columns on top of the two foreign keys must be considered
         # ambiguous unless a select clause has been explicitly defined. Otherwise you can get
         # broken records back, if, for example, the join column also has an id column. This will
         # then overwrite the id column of the records coming back.
-        def finding_with_ambiguous_select?(select_clause)
-          !select_clause && columns.size != 2
+        def ambiguous_select?(select)
+          extra_join_columns? && select.nil?
+        end
+
+        def extra_join_columns?
+          columns.size > 2
         end
 
       private
@@ -114,6 +111,13 @@ module ActiveRecord
         def invertible_for?(record)
           false
         end
+
+        def find_by_sql(*args)
+          options   = args.extract_options!
+          ambiguous = ambiguous_select?(@reflection.options[:select] || options[:select])
+
+          scoped.readonly(ambiguous).find(*(args << options))
+        end
     end
   end
 end
-- 
cgit v1.2.3


From 99a8d8430f9b819cd3e8cb3aab44cb04ea402532 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Mon, 3 Jan 2011 12:04:33 +0000
Subject: Create the association scope directly rather than going through
 with_scope

---
 .../active_record/associations/has_and_belongs_to_many_association.rb   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb')

diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index 3abe3c2dae..1c237eda33 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -79,7 +79,7 @@ module ActiveRecord
           super(join_table)
         end
 
-        def construct_find_scope
+        def finder_options
           super.merge(
             :joins    => construct_joins,
             :readonly => ambiguous_select?(@reflection.options[:select]),
-- 
cgit v1.2.3


From 9c1c551f25577c01624b23bc53139c60a4fc451b Mon Sep 17 00:00:00 2001
From: Raimonds Simanovskis <raimonds.simanovskis@gmail.com>
Date: Tue, 4 Jan 2011 17:06:33 +0200
Subject: Explicitly select * from has_and_belongs_to_many association tables,
 simplify exists? query

Previous version (after commit 3103296a61709e808aa89c3d37cf22bcdbc5a675) was generating wrong SQL for Oracle when calling exists? method on HABTM association.
---
 .../active_record/associations/has_and_belongs_to_many_association.rb  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb')

diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index 1c237eda33..a4194defc2 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -83,7 +83,8 @@ module ActiveRecord
           super.merge(
             :joins    => construct_joins,
             :readonly => ambiguous_select?(@reflection.options[:select]),
-            :select   => @reflection.options[:select] || Arel.star
+            :select   => @reflection.options[:select] ||
+              Arel.sql("#{@reflection.quoted_table_name}.*, #{@owner.connection.quote_table_name @reflection.options[:join_table]}.*")
           )
         end
 
-- 
cgit v1.2.3


From 35a225535f38df551a1399b596622f3e3a0bbfbe Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 5 Jan 2011 09:23:25 -0800
Subject: use arel to construct AST rather than generate strings

---
 .../associations/has_and_belongs_to_many_association.rb              | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb')

diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index a4194defc2..f3b1c9de3f 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -83,8 +83,9 @@ module ActiveRecord
           super.merge(
             :joins    => construct_joins,
             :readonly => ambiguous_select?(@reflection.options[:select]),
-            :select   => @reflection.options[:select] ||
-              Arel.sql("#{@reflection.quoted_table_name}.*, #{@owner.connection.quote_table_name @reflection.options[:join_table]}.*")
+            :select   => @reflection.options[:select] || [
+                @reflection.klass.arel_table[Arel.star],
+                join_table[Arel.star]]
           )
         end
 
-- 
cgit v1.2.3


From e468a62dc89d4d3c2a16a6d3e8fd78342a2732df Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 5 Jan 2011 09:47:13 -0800
Subject: use arel ast construction rather than generating strings

---
 .../associations/has_and_belongs_to_many_association.rb           | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb')

diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index f3b1c9de3f..a8e1ea21c4 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -68,7 +68,13 @@ module ActiveRecord
         end
 
         def construct_joins
-          "INNER JOIN #{@owner.connection.quote_table_name @reflection.options[:join_table]} ON #{@reflection.quoted_table_name}.#{@reflection.klass.primary_key} = #{@owner.connection.quote_table_name @reflection.options[:join_table]}.#{@reflection.association_foreign_key}"
+          right = join_table
+          left  = @reflection.klass.arel_table
+
+          condition = left[@reflection.klass.primary_key].eq(
+            right[@reflection.association_foreign_key])
+
+          right.create_join(right, right.create_on(condition))
         end
 
         def join_table
-- 
cgit v1.2.3


From 8bdc191994bb091310cbbe4690900e7a97da0b5e Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 5 Jan 2011 09:51:09 -0800
Subject: we have a method for this, so let's use it

---
 .../active_record/associations/has_and_belongs_to_many_association.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb')

diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index a8e1ea21c4..3c939d7e85 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -29,7 +29,7 @@ module ActiveRecord
           if @reflection.options[:insert_sql]
             @owner.connection.insert(interpolate_sql(@reflection.options[:insert_sql], record))
           else
-            relation   = Arel::Table.new(@reflection.options[:join_table])
+            relation   = join_table
             timestamps = record_timestamp_columns(record)
             timezone   = record.send(:current_time_from_proper_timezone) if timestamps.any?
 
@@ -59,7 +59,7 @@ module ActiveRecord
           if sql = @reflection.options[:delete_sql]
             records.each { |record| @owner.connection.delete(interpolate_sql(sql, record)) }
           else
-            relation = Arel::Table.new(@reflection.options[:join_table])
+            relation = join_table
             stmt = relation.where(relation[@reflection.foreign_key].eq(@owner.id).
               and(relation[@reflection.association_foreign_key].in(records.map { |x| x.id }.compact))
             ).compile_delete
-- 
cgit v1.2.3


From 90171ad833fa15a3030e15b7eb2043e1204d9db0 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 5 Jan 2011 10:29:06 -0800
Subject: avoid creating so many Arel::Table objects

---
 .../associations/has_and_belongs_to_many_association.rb   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb')

diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index 3c939d7e85..b18ec23037 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -2,9 +2,16 @@ module ActiveRecord
   # = Active Record Has And Belongs To Many Association
   module Associations
     class HasAndBelongsToManyAssociation < AssociationCollection #:nodoc:
+      attr_reader :join_table
+
+      def initialize(owner, reflection)
+        @join_table_name = reflection.options[:join_table]
+        @join_table      = Arel::Table.new(@join_table_name)
+        super
+      end
 
       def columns
-        @reflection.columns(@reflection.options[:join_table], "#{@reflection.options[:join_table]} Columns")
+        @reflection.columns(@join_table_name, "#{@join_table_name} Columns")
       end
 
       def reset_column_information
@@ -12,7 +19,7 @@ module ActiveRecord
       end
 
       def has_primary_key?
-        @has_primary_key ||= @owner.connection.supports_primary_key? && @owner.connection.primary_key(@reflection.options[:join_table])
+        @has_primary_key ||= @owner.connection.supports_primary_key? && @owner.connection.primary_key(@join_table_name)
       end
 
       protected
@@ -77,10 +84,6 @@ module ActiveRecord
           right.create_join(right, right.create_on(condition))
         end
 
-        def join_table
-          Arel::Table.new(@reflection.options[:join_table])
-        end
-
         def construct_owner_conditions
           super(join_table)
         end
-- 
cgit v1.2.3


From 770e6893b9f2aaaebe3de10576931dc7194451bc Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Thu, 6 Jan 2011 18:04:32 +0000
Subject: Construct an actual ActiveRecord::Relation object for the association
 scope, rather than a hash which is passed to apply_finder_options. This
 allows more flexibility in how the scope is created, for example because
 scope.where(a, b) and scope.where(a).where(b) mean different things.

---
 .../associations/has_and_belongs_to_many_association.rb  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb')

diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index b18ec23037..bc7894173d 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -88,14 +88,14 @@ module ActiveRecord
           super(join_table)
         end
 
-        def finder_options
-          super.merge(
-            :joins    => construct_joins,
-            :readonly => ambiguous_select?(@reflection.options[:select]),
-            :select   => @reflection.options[:select] || [
-                @reflection.klass.arel_table[Arel.star],
-                join_table[Arel.star]]
-          )
+        def association_scope
+          scope = super.joins(construct_joins)
+          scope = scope.readonly if ambiguous_select?(@reflection.options[:select])
+          scope
+        end
+
+        def select_value
+          super || [@reflection.klass.arel_table[Arel.star], join_table[Arel.star]]
         end
 
         # Join tables with additional columns on top of the two foreign keys must be considered
-- 
cgit v1.2.3


From d1521719c5ac61a0c0e59827fe8cb197f5fe56f5 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Sun, 16 Jan 2011 21:28:47 +0000
Subject: Removed support for accessing attributes on a has_and_belongs_to_many
 join table. This has been documented as deprecated behaviour since April
 2006. Please use has_many :through instead. A deprecation warning will be
 added to the 3-0-stable branch for the 3.0.4 release.

---
 .../has_and_belongs_to_many_association.rb         | 68 ++--------------------
 1 file changed, 6 insertions(+), 62 deletions(-)

(limited to 'activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb')

diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index bc7894173d..b28554dce1 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -10,18 +10,6 @@ module ActiveRecord
         super
       end
 
-      def columns
-        @reflection.columns(@join_table_name, "#{@join_table_name} Columns")
-      end
-
-      def reset_column_information
-        @reflection.reset_column_information
-      end
-
-      def has_primary_key?
-        @has_primary_key ||= @owner.connection.supports_primary_key? && @owner.connection.primary_key(@join_table_name)
-      end
-
       protected
 
         def count_records
@@ -36,26 +24,11 @@ module ActiveRecord
           if @reflection.options[:insert_sql]
             @owner.connection.insert(interpolate_sql(@reflection.options[:insert_sql], record))
           else
-            relation   = join_table
-            timestamps = record_timestamp_columns(record)
-            timezone   = record.send(:current_time_from_proper_timezone) if timestamps.any?
-
-            attributes = columns.map do |column|
-              name = column.name
-              value = case name.to_s
-                when @reflection.foreign_key.to_s
-                  @owner.id
-                when @reflection.association_foreign_key.to_s
-                  record.id
-                when *timestamps
-                  timezone
-                else
-                  @owner.send(:quote_value, record[name], column) if record.has_attribute?(name)
-              end
-              [relation[name], value] unless value.nil?
-            end
+            stmt = join_table.compile_insert(
+              join_table[@reflection.foreign_key]             => @owner.id,
+              join_table[@reflection.association_foreign_key] => record.id
+            )
 
-            stmt = relation.compile_insert Hash[attributes]
             @owner.connection.insert stmt.to_sql
           end
 
@@ -89,46 +62,17 @@ module ActiveRecord
         end
 
         def association_scope
-          scope = super.joins(construct_joins)
-          scope = scope.readonly if ambiguous_select?(@reflection.options[:select])
-          scope
+          super.joins(construct_joins)
         end
 
         def select_value
-          super || [@reflection.klass.arel_table[Arel.star], join_table[Arel.star]]
-        end
-
-        # Join tables with additional columns on top of the two foreign keys must be considered
-        # ambiguous unless a select clause has been explicitly defined. Otherwise you can get
-        # broken records back, if, for example, the join column also has an id column. This will
-        # then overwrite the id column of the records coming back.
-        def ambiguous_select?(select)
-          extra_join_columns? && select.nil?
-        end
-
-        def extra_join_columns?
-          columns.size > 2
+          super || @reflection.klass.arel_table[Arel.star]
         end
 
       private
-        def record_timestamp_columns(record)
-          if record.record_timestamps
-            record.send(:all_timestamp_attributes).map { |x| x.to_s }
-          else
-            []
-          end
-        end
-
         def invertible_for?(record)
           false
         end
-
-        def find_by_sql(*args)
-          options   = args.extract_options!
-          ambiguous = ambiguous_select?(@reflection.options[:select] || options[:select])
-
-          scoped.readonly(ambiguous).find(*(args << options))
-        end
     end
   end
 end
-- 
cgit v1.2.3


From 15601c52e7c7094a6b7b54ef8acfc8299a4d6724 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Mon, 24 Jan 2011 19:28:53 +0000
Subject: =?UTF-8?q?Let's=20be=20less=20blas=C3=A9=20about=20method=20visib?=
 =?UTF-8?q?ility=20on=20association=20proxies?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../has_and_belongs_to_many_association.rb            | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb')

diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index b28554dce1..6ca287a4e3 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -12,10 +12,6 @@ module ActiveRecord
 
       protected
 
-        def count_records
-          load_target.size
-        end
-
         def insert_record(record, force = true, validate = true)
           if record.new_record?
             return false unless save_record(record, force, validate)
@@ -35,6 +31,16 @@ module ActiveRecord
           true
         end
 
+        def association_scope
+          super.joins(construct_joins)
+        end
+
+      private
+
+        def count_records
+          load_target.size
+        end
+
         def delete_records(records)
           if sql = @reflection.options[:delete_sql]
             records.each { |record| @owner.connection.delete(interpolate_sql(sql, record)) }
@@ -61,15 +67,10 @@ module ActiveRecord
           super(join_table)
         end
 
-        def association_scope
-          super.joins(construct_joins)
-        end
-
         def select_value
           super || @reflection.klass.arel_table[Arel.star]
         end
 
-      private
         def invertible_for?(record)
           false
         end
-- 
cgit v1.2.3


From c5e912a8b38bc3555385e43a052a8d3eb0541ff3 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Wed, 26 Jan 2011 22:40:05 +0000
Subject: @join_table_name is no longer used

---
 .../active_record/associations/has_and_belongs_to_many_association.rb  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb')

diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index 6ca287a4e3..3329a4af8e 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -5,8 +5,7 @@ module ActiveRecord
       attr_reader :join_table
 
       def initialize(owner, reflection)
-        @join_table_name = reflection.options[:join_table]
-        @join_table      = Arel::Table.new(@join_table_name)
+        @join_table = Arel::Table.new(reflection.options[:join_table])
         super
       end
 
-- 
cgit v1.2.3


From d55406d2e991056b08f69eb68bcf9b17da807b6c Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Sun, 30 Jan 2011 19:07:08 +0000
Subject: Make record.association.destroy(*records) on habtm and hm:t only
 delete records in the join table. This is to make the destroy method more
 consistent across the different types of associations. For more details see
 the CHANGELOG entry.

---
 .../active_record/associations/has_and_belongs_to_many_association.rb   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb')

diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index 3329a4af8e..d70f326e55 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -40,7 +40,7 @@ module ActiveRecord
           load_target.size
         end
 
-        def delete_records(records)
+        def delete_records(records, method = nil)
           if sql = @reflection.options[:delete_sql]
             records.each { |record| @owner.connection.delete(interpolate_sql(sql, record)) }
           else
-- 
cgit v1.2.3


From e62b57647258fad34129975c5a264d19af2dbbe8 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Sun, 6 Feb 2011 22:14:16 +0000
Subject: Refactor the implementations of AssociatioCollection#delete and
 #destroy to be more consistent with each other, and to stop passing blocks
 around, thus making the execution easier to follow.

---
 .../active_record/associations/has_and_belongs_to_many_association.rb   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb')

diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index d70f326e55..b0ccab2de6 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -40,7 +40,7 @@ module ActiveRecord
           load_target.size
         end
 
-        def delete_records(records, method = nil)
+        def delete_records(records, method)
           if sql = @reflection.options[:delete_sql]
             records.each { |record| @owner.connection.delete(interpolate_sql(sql, record)) }
           else
-- 
cgit v1.2.3


From a7e19b30ca71f62af516675023659be061b2b70a Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Fri, 11 Feb 2011 22:22:19 +0000
Subject: Add interpolation of association conditions back in, in the form of
 proc { ... } rather than instance_eval-ing strings

---
 .../active_record/associations/has_and_belongs_to_many_association.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb')

diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index b0ccab2de6..b5ec45159b 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -17,7 +17,7 @@ module ActiveRecord
           end
 
           if @reflection.options[:insert_sql]
-            @owner.connection.insert(interpolate_sql(@reflection.options[:insert_sql], record))
+            @owner.connection.insert(interpolate(@reflection.options[:insert_sql], record))
           else
             stmt = join_table.compile_insert(
               join_table[@reflection.foreign_key]             => @owner.id,
@@ -42,7 +42,7 @@ module ActiveRecord
 
         def delete_records(records, method)
           if sql = @reflection.options[:delete_sql]
-            records.each { |record| @owner.connection.delete(interpolate_sql(sql, record)) }
+            records.each { |record| @owner.connection.delete(interpolate(sql, record)) }
           else
             relation = join_table
             stmt = relation.where(relation[@reflection.foreign_key].eq(@owner.id).
-- 
cgit v1.2.3


From 7ce7ae0c8bd94e7f96c1448183b83da85ef91edb Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Mon, 14 Feb 2011 00:14:16 +0000
Subject: Get rid of AssociationCollection#save_record

---
 .../associations/has_and_belongs_to_many_association.rb           | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb')

diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index b5ec45159b..b9c9919e7a 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -11,10 +11,8 @@ module ActiveRecord
 
       protected
 
-        def insert_record(record, force = true, validate = true)
-          if record.new_record?
-            return false unless save_record(record, force, validate)
-          end
+        def insert_record(record, validate = true)
+          return if record.new_record? && !record.save(:validate => validate)
 
           if @reflection.options[:insert_sql]
             @owner.connection.insert(interpolate(@reflection.options[:insert_sql], record))
@@ -27,7 +25,7 @@ module ActiveRecord
             @owner.connection.insert stmt.to_sql
           end
 
-          true
+          record
         end
 
         def association_scope
-- 
cgit v1.2.3