activerecord 3.1.1.rc1 → 3.1.1.rc2

data/CHANGELOG

@@ -1,5 +1,27 @@
 *Rails 3.1.1 (unreleased)*
 
+* Add deprecation for the preload_associations method. Fixes #3022.
+
+  [Jon Leighton]
+
+* Don't require a DB connection when loading a model that uses set_primary_key. GH #2807.
+
+  [Jon Leighton]
+
+* Fix using select() with a habtm association, e.g. Person.friends.select(:name). GH #3030 and
+  #2923.
+
+  [Hendy Tanata]
+
+* Fix belongs_to polymorphic with custom primary key on target. GH #3104.
+
+  [Jon Leighton]
+
+* CollectionProxy#replace should change the DB records rather than just mutating the array.
+  Fixes #3020.
+
+  [Jon Leighton]
+
 * LRU cache in mysql and sqlite are now per-process caches.
 
 	* lib/active_record/connection_adapters/mysql_adapter.rb: LRU cache

data/lib/active_record/associations.rb

@@ -5,6 +5,7 @@ require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/string/conversions'
 require 'active_support/core_ext/module/remove_method'
 require 'active_support/core_ext/class/attribute'
+require 'active_support/deprecation'
 
 module ActiveRecord
   class InverseOfAssociationNotFoundError < ActiveRecordError #:nodoc:
@@ -76,12 +77,6 @@ module ActiveRecord
     end
   end
 
-  class HasAndBelongsToManyAssociationWithPrimaryKeyError < ActiveRecordError #:nodoc:
-    def initialize(reflection)
-      super("Primary key is not allowed in a has_and_belongs_to_many join table (#{reflection.options[:join_table]}).")
-    end
-  end
-
   class HasAndBelongsToManyAssociationForeignKeyNeeded < ActiveRecordError #:nodoc:
     def initialize(reflection)
       super("Cannot create self referential has_and_belongs_to_many association on '#{reflection.class_name rescue nil}##{reflection.name rescue nil}'. :association_foreign_key cannot be the same as the :foreign_key.")
@@ -1576,10 +1571,21 @@ module ActiveRecord
       #   has_and_belongs_to_many :categories, :join_table => "prods_cats"
       #   has_and_belongs_to_many :categories, :readonly => true
       #   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}'
+      #   "DELETE FROM developers_projects WHERE active=1 AND developer_id = #{id} AND project_id = #{record.id}"
       def has_and_belongs_to_many(name, options = {}, &extension)
         Builder::HasAndBelongsToMany.build(self, name, options, &extension)
       end
+
+      protected
+
+      def preload_associations(records, associations, options = {}) #:nodoc:
+        ActiveSupport::Deprecation.warn(
+          "preload_associations(records, associations, options = {}) is deprecated. Use " \
+          "ActiveRecord::Associations::Preloader.new(records, associations, options = {}).run " \
+          "instead."
+        )
+        Preloader.new(records, associations, options).run
+      end
     end
   end
 end

data/lib/active_record/associations/association_scope.rb

@@ -42,10 +42,6 @@ module ActiveRecord
           select_value ||= options[:uniq] && "DISTINCT #{reflection.quoted_table_name}.*"
         end
 
-        if reflection.macro == :has_and_belongs_to_many
-          select_value ||= reflection.klass.arel_table[Arel.star]
-        end
-
         select_value
       end
 
@@ -68,7 +64,12 @@ module ActiveRecord
           end
 
           if reflection.source_macro == :belongs_to
-            key         = reflection.association_primary_key
+            if reflection.options[:polymorphic]
+              key = reflection.association_primary_key(klass)
+            else
+              key = reflection.association_primary_key
+            end
+
             foreign_key = reflection.foreign_key
           else
             key         = reflection.foreign_key

data/lib/active_record/associations/belongs_to_association.rb

@@ -45,7 +45,11 @@ module ActiveRecord
         end
 
         def replace_keys(record)
-          owner[reflection.foreign_key] = record && record[reflection.association_primary_key]
+          if record
+            owner[reflection.foreign_key] = record[reflection.association_primary_key(record.class)]
+          else
+            owner[reflection.foreign_key] = nil
+          end
         end
 
         def foreign_key_present?

data/lib/active_record/associations/builder/has_and_belongs_to_many.rb

@@ -37,10 +37,6 @@ module ActiveRecord::Associations::Builder
           model.send(:undecorated_table_name, model.to_s),
           model.send(:undecorated_table_name, reflection.class_name)
         )
-
-        if model.connection.supports_primary_key? && (model.connection.primary_key(reflection.options[:join_table]) rescue false)
-          raise ActiveRecord::HasAndBelongsToManyAssociationWithPrimaryKeyError.new(reflection)
-        end
       end
 
       # Generates a join table name from two provided table names.

data/lib/active_record/associations/collection_proxy.rb

@@ -53,7 +53,7 @@ module ActiveRecord
 
       delegate :select, :find, :first, :last,
                :build, :create, :create!,
-               :concat, :delete_all, :destroy_all, :delete, :destroy, :uniq,
+               :concat, :replace, :delete_all, :destroy_all, :delete, :destroy, :uniq,
                :sum, :count, :size, :length, :empty?,
                :any?, :many?, :include?,
                :to => :@association

data/lib/active_record/attribute_methods/primary_key.rb

@@ -66,7 +66,6 @@ module ActiveRecord
           @primary_key ||= ''
           self.original_primary_key = @primary_key
           value &&= value.to_s
-          connection_pool.primary_keys[table_name] = value
           self.primary_key = block_given? ? instance_eval(&block) : value
         end
       end

data/lib/active_record/base.rb

@@ -705,6 +705,10 @@ module ActiveRecord #:nodoc:
 
       # Returns an array of column objects for the table associated with this class.
       def columns
+        if defined?(@primary_key)
+          connection_pool.primary_keys[table_name] ||= primary_key
+        end
+
         connection_pool.columns[table_name]
       end
 

data/lib/active_record/reflection.rb

@@ -223,11 +223,9 @@ module ActiveRecord
         @association_foreign_key ||= options[:association_foreign_key] || class_name.foreign_key
       end
 
-      def association_primary_key
-        @association_primary_key ||=
-          options[:primary_key] ||
-          !options[:polymorphic] && klass.primary_key ||
-          'id'
+      # klass option is necessary to support loading polymorphic associations
+      def association_primary_key(klass = nil)
+        options[:primary_key] || (klass || self.klass).primary_key
       end
 
       def active_record_primary_key
@@ -475,17 +473,15 @@ module ActiveRecord
       # We want to use the klass from this reflection, rather than just delegate straight to
       # the source_reflection, because the source_reflection may be polymorphic. We still
       # need to respect the source_reflection's :primary_key option, though.
-      def association_primary_key
-        @association_primary_key ||= begin
-          # Get the "actual" source reflection if the immediate source reflection has a
-          # source reflection itself
-          source_reflection = self.source_reflection
-          while source_reflection.source_reflection
-            source_reflection = source_reflection.source_reflection
-          end
-
-          source_reflection.options[:primary_key] || klass.primary_key
+      def association_primary_key(klass = self.klass)
+        # Get the "actual" source reflection if the immediate source reflection has a
+        # source reflection itself
+        source_reflection = self.source_reflection
+        while source_reflection.source_reflection
+          source_reflection = source_reflection.source_reflection
         end
+
+        source_reflection.options[:primary_key] || klass.primary_key
       end
 
       # Gets an array of possible <tt>:through</tt> source reflection names:

data/lib/active_record/relation/query_methods.rb

@@ -37,6 +37,35 @@ module ActiveRecord
       relation
     end
 
+    # Works in two unique ways.
+    # 
+    # First: takes a block so it can be used just like Array#select.
+    #
+    #   Model.scoped.select { |m| m.field == value }
+    #
+    # This will build an array of objects from the database for the scope,
+    # converting them into an array and iterating through them using Array#select.
+    #
+    # Second: Modifies the SELECT statement for the query so that only certain
+    # fields are retrieved:
+    #
+    #   >> Model.select(:field)
+    #   => [#<Model field:value>]
+    #
+    # Although in the above example it looks as though this method returns an
+    # array, it actually returns a relation object and can have other query
+    # methods appended to it, such as the other methods in ActiveRecord::QueryMethods.
+    #
+    # This method will also take multiple parameters:
+    #
+    #   >> Model.select(:field, :other_field, :and_one_more)
+    #   => [#<Model field: "value", other_field: "value", and_one_more: "value">]
+    #
+    # Any attributes that do not have fields retrieved by a select
+    # will return `nil` when the getter method for that attribute is used:
+    #
+    #   >> Model.select(:field).first.other_field
+    #   => nil
     def select(value = Proc.new)
       if block_given?
         to_a.select {|*block_args| value.call(*block_args) }

data/lib/active_record/version.rb

@@ -3,7 +3,7 @@ module ActiveRecord
     MAJOR = 3
     MINOR = 1
     TINY  = 1
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord
 version: !ruby/object:Gem::Version 
-  hash: 977940594
+  hash: 977940595
   prerelease: true
   segments: 
   - 3
   - 1
   - 1
-  - rc1
-  version: 3.1.1.rc1
+  - rc2
+  version: 3.1.1.rc2
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-14 00:00:00 -07:00
+date: 2011-09-29 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,13 +27,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 977940594
+        hash: 977940595
         segments: 
         - 3
         - 1
         - 1
-        - rc1
-        version: 3.1.1.rc1
+        - rc2
+        version: 3.1.1.rc2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,13 +44,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 977940594
+        hash: 977940595
         segments: 
         - 3
         - 1
         - 1
-        - rc1
-        version: 3.1.1.rc1
+        - rc2
+        version: 3.1.1.rc2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency