activerecord 4.2.0.beta3 → 4.2.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcd0c0549f0a5ad001c4bb628643c7ff6cec0668
-  data.tar.gz: b959476a5cbfe78feea6ca2fb900227eb3114535
+  metadata.gz: ce2a22714e7ecce16ad964d1f2f3725feb2b1920
+  data.tar.gz: 8812b21dadc7a62d5ff64a05ebec8fa8edc31558
 SHA512:
-  metadata.gz: 8282f5506829019976baaaf5c4ca644530386c36cd9f7f30b5321196136aeb4876bc296d851968241fd2b2e49783f15c1516dbe1bd9320d6456f4de898ce6c36
-  data.tar.gz: db98afe46ff1c0301b5d358334dd02970b3846e0e28c13c6c5837d59ae8c9f6f4d08883d4fbd4d4f867c89f40d909cea7a848559af46e45216748ef118123200
+  metadata.gz: 907e24f6a9edc6d5ce51166fc225c3cd033cf00d0405e4e247aa0bf2721e9c4032a1708a7bc887d4109acdb3cd96dce5b37698985b9993d25d9d405785323f3c
+  data.tar.gz: 547b9bb76efcdb0cb6b56ab8ae31f17ee528a053ee593b2e041406a11edbba209a1cef87ff539863544e840a542f5474274d2448b6bbeb448b9e4f7ffcf38721

data/CHANGELOG.md

@@ -1,5 +1,38 @@
+*   MySQL enum type lookups, with values matching another type, no longer result
+    in an endless loop.
+
+    Fixes #17402.
+
+    *Yves Senn*
+
+*   Raise `ArgumentError` when the body of a scope is not callable.
+
+    *Mauro George*
+
+*   Use type column first in multi-column indexes created with `add-reference`.
+
+    *Derek Prior*
+
+*   Fix `Relation.rewhere` to work with Range values.
+
+    *Dan Olson*
+
+*   `AR::UnknownAttributeError` now includes the class name of a record.
+
+        User.new(name: "Yuki Nishijima", project_attributes: {name: "kaminari"})
+        # => ActiveRecord::UnknownAttributeError: unknown attribute 'name' for User.
+
+    *Yuki Nishijima*
+
+*   Fix regression causing `after_create` callbacks to run before associated
+    records are autosaved.
+
+    Fixes #17209.
+
+    *Agis Anastasopoulos*
+
 *   Honor overridden `rack.test` in Rack environment for the connection
-    management middlware.
+    management middleware.
 
     *Simon Eskildsen*
 
@@ -213,7 +246,7 @@
 
     *Kenn Ejima*
 
-*   Add support for Postgresql JSONB.
+*   Add support for PostgreSQL JSONB.
 
     Example:
 

data/lib/active_record/associations.rb

@@ -46,6 +46,12 @@ module ActiveRecord
     end
   end
 
+  class HasOneAssociationPolymorphicThroughError < ActiveRecordError #:nodoc:
+    def initialize(owner_class_name, reflection)
+      super("Cannot have a has_one :through association '#{owner_class_name}##{reflection.name}' which goes through the polymorphic association '#{owner_class_name}##{reflection.through_reflection.name}'.")
+    end
+  end
+
   class HasManyThroughSourceAssociationNotFoundError < ActiveRecordError #:nodoc:
     def initialize(reflection)
       through_reflection      = reflection.through_reflection

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

@@ -11,7 +11,7 @@ module ActiveRecord::Associations::Builder
         end
 
         def join_table
-          @join_table ||= [@lhs_class.table_name, klass.table_name].sort.join("\0").gsub(/^(.*[._])(.+)\0\1(.+)/, '\1\2_\3').gsub("\0", "_")
+          @join_table ||= [@lhs_class.table_name, klass.table_name].sort.join("\0").gsub(/^(.*[._])(.+)\0\1(.+)/, '\1\2_\3').tr("\0", "_")
         end
 
         private

data/lib/active_record/associations/collection_association.rb

@@ -407,7 +407,12 @@ module ActiveRecord
 
       private
       def get_records
-        return scope.to_a if reflection.scope_chain.any?(&:any?) || scope.eager_loading?
+        if reflection.scope_chain.any?(&:any?) ||
+          scope.eager_loading? ||
+          klass.current_scope
+
+          return scope.to_a
+        end
 
         conn = klass.connection
         sc = reflection.association_scope_cache(conn, owner) do

data/lib/active_record/associations/collection_proxy.rb

@@ -355,14 +355,15 @@ module ActiveRecord
         @association.replace(other_array)
       end
 
-      # Deletes all the records from the collection. For +has_many+ associations,
-      # the deletion is done according to the strategy specified by the <tt>:dependent</tt>
-      # option.
+      # Deletes all the records from the collection according to the strategy
+      # specified by the +:dependent+ option. If no +:dependent+ option is given,
+      # then it will follow the default strategy.
       #
-      # If no <tt>:dependent</tt> option is given, then it will follow the
-      # default strategy. The default strategy is <tt>:nullify</tt>. This
-      # sets the foreign keys to <tt>NULL</tt>. For, +has_many+ <tt>:through</tt>,
-      # the default strategy is +delete_all+.
+      # For +has_many :through+ associations, the default deletion strategy is
+      # +:delete_all+.
+      #
+      # For +has_many+ associations, the default deletion strategy is +:nullify+.
+      # This sets the foreign keys to +NULL+.
       #
       #   class Person < ActiveRecord::Base
       #     has_many :pets # dependent: :nullify option by default
@@ -393,9 +394,9 @@ module ActiveRecord
       #   #       #<Pet id: 3, name: "Choo-Choo", person_id: nil>
       #   #    ]
       #
-      # If it is set to <tt>:destroy</tt> all the objects from the collection
-      # are removed by calling their +destroy+ method. See +destroy+ for more
-      # information.
+      # Both +has_many+ and +has_many :through+ dependencies default to the
+      # +:delete_all+ strategy if the +:dependent+ option is set to +:destroy+.
+      # Records are not instantiated and callbacks will not be fired.
       #
       #   class Person < ActiveRecord::Base
       #     has_many :pets, dependent: :destroy
@@ -410,11 +411,6 @@ module ActiveRecord
       #   #    ]
       #
       #   person.pets.delete_all
-      #   # => [
-      #   #       #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>,
-      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
-      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
-      #   #    ]
       #
       #   Pet.find(1, 2, 3)
       #   # => ActiveRecord::RecordNotFound
@@ -443,8 +439,9 @@ module ActiveRecord
       end
 
       # Deletes the records of the collection directly from the database
-      # ignoring the +:dependent+ option. It invokes +before_remove+,
-      # +after_remove+ , +before_destroy+ and +after_destroy+ callbacks.
+      # ignoring the +:dependent+ option. Records are instantiated and it
+      # invokes +before_remove+, +after_remove+ , +before_destroy+ and
+      # +after_destroy+ callbacks.
       #
       #   class Person < ActiveRecord::Base
       #     has_many :pets

data/lib/active_record/associations/has_many_through_association.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/string/filters'
+
 module ActiveRecord
   # = Active Record Has Many Through Association
   module Associations
@@ -63,11 +65,12 @@ module ActiveRecord
 
         save_through_record(record)
         if has_cached_counter? && !through_reflection_updates_counter_cache?
-          ActiveSupport::Deprecation.warn \
-            "Automatic updating of counter caches on through associations has been " \
-            "deprecated, and will be removed in Rails 5.0. Instead, please set the " \
-            "appropriate counter_cache options on the has_many and belongs_to for " \
-            "your associations to #{through_reflection.name}."
+          ActiveSupport::Deprecation.warn(<<-MSG.squish)
+            Automatic updating of counter caches on through associations has been
+            deprecated, and will be removed in Rails 5. Instead, please set the
+            appropriate `counter_cache` options on the `has_many` and `belongs_to`
+            for your associations to #{through_reflection.name}.
+          MSG
 
           update_counter_in_database(1)
         end
@@ -159,7 +162,7 @@ module ActiveRecord
               count = scope.destroy_all.length
             else
               scope.to_a.each do |record|
-                record.run_callbacks :destroy
+                record._run_destroy_callbacks
               end
 
               arel = scope.arel

data/lib/active_record/associations/join_dependency.rb

@@ -142,11 +142,20 @@ module ActiveRecord
         parents = model_cache[join_root]
         column_aliases = aliases.column_aliases join_root
 
-        result_set.each { |row_hash|
-          parent = parents[row_hash[primary_key]] ||= join_root.instantiate(row_hash, column_aliases)
-          construct(parent, join_root, row_hash, result_set, seen, model_cache, aliases)
+        message_bus = ActiveSupport::Notifications.instrumenter
+
+        payload = {
+          record_count: result_set.length,
+          class_name: join_root.base_klass.name
         }
 
+        message_bus.instrument('instantiation.active_record', payload) do
+          result_set.each { |row_hash|
+            parent = parents[row_hash[primary_key]] ||= join_root.instantiate(row_hash, column_aliases)
+            construct(parent, join_root, row_hash, result_set, seen, model_cache, aliases)
+          }
+        end
+
         parents.values
       end
 

data/lib/active_record/associations/join_dependency/join_part.rb

@@ -19,7 +19,6 @@ module ActiveRecord
 
         def initialize(base_klass, children)
           @base_klass = base_klass
-          @column_names_with_alias = nil
           @children = children
         end
 

data/lib/active_record/associations/singular_association.rb

@@ -39,7 +39,12 @@ module ActiveRecord
         end
 
         def get_records
-          return scope.limit(1).to_a if reflection.scope_chain.any?(&:any?) || scope.eager_loading?
+          if reflection.scope_chain.any?(&:any?) ||
+              scope.eager_loading? ||
+              klass.current_scope
+
+            return scope.limit(1).to_a
+          end
 
           conn = klass.connection
           sc = reflection.association_scope_cache(conn, owner) do

data/lib/active_record/attribute_methods.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/enumerable'
+require 'active_support/core_ext/string/filters'
 require 'mutex_m'
 require 'thread_safe'
 
@@ -90,7 +91,7 @@ module ActiveRecord
 
       def undefine_attribute_methods # :nodoc:
         generated_attribute_methods.synchronize do
-          super if @attribute_methods_generated
+          super if defined?(@attribute_methods_generated) && @attribute_methods_generated
           @attribute_methods_generated = false
         end
       end
@@ -205,9 +206,11 @@ module ActiveRecord
       def column_for_attribute(name)
         column = columns_hash[name.to_s]
         if column.nil?
-          ActiveSupport::Deprecation.warn \
-            "`column_for_attribute` will return a null object for non-existent columns " \
-            "in Rails 5.0. Use `has_attribute?` if you need to check for an attribute's existence."
+          ActiveSupport::Deprecation.warn(<<-MSG.squish)
+            `#column_for_attribute` will return a null object for non-existent
+            columns in Rails 5. Use `#has_attribute?` if you need to check for
+            an attribute's existence.
+          MSG
         end
         column
       end

data/lib/active_record/attribute_methods/serialization.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/string/filters'
+
 module ActiveRecord
   module AttributeMethods
     module Serialization
@@ -8,11 +10,8 @@ module ActiveRecord
         # object, and retrieved as the same object, then specify the name of that
         # attribute using this method and it will be handled automatically. The
         # serialization is done through YAML. If +class_name+ is specified, the
-        # serialized object must be of that class on retrieval or
-        # <tt>SerializationTypeMismatch</tt> will be raised.
-        #
-        # A notable side effect of serialized attributes is that the model will
-        # be updated on every save, even if it is not dirty.
+        # serialized object must be of that class on assignment and retrieval.
+        # Otherwise <tt>SerializationTypeMismatch</tt> will be raised.
         #
         # ==== Parameters
         #
@@ -54,8 +53,10 @@ module ActiveRecord
         end
 
         def serialized_attributes
-          ActiveSupport::Deprecation.warn "`serialized_attributes` is deprecated " \
-            "without replacement, and will be removed in Rails 5.0."
+          ActiveSupport::Deprecation.warn(<<-MSG.squish)
+            `serialized_attributes` is deprecated without replacement, and will
+            be removed in Rails 5.0.
+          MSG
 
           @serialized_attributes ||= Hash[
             columns.select { |t| t.cast_type.is_a?(Type::Serialized) }.map { |c|

data/lib/active_record/attribute_set/builder.rb

@@ -23,8 +23,11 @@ module ActiveRecord
       end
 
       def add_uninitialized_attributes(attributes)
-        types.except(*attributes.keys).each do |name, type|
-          attributes[name] = Attribute.uninitialized(name, type)
+        types.each_key do |name|
+          next if attributes.key? name
+          type = types[name]
+          attributes[name] =
+            Attribute.uninitialized(name, type)
         end
       end
     end

data/lib/active_record/autosave_association.rb

@@ -184,7 +184,9 @@ module ActiveRecord
             before_save :before_save_collection_association
 
             define_non_cyclic_method(save_method) { save_collection_association(reflection) }
-            after_save save_method
+            # Doesn't use after_save as that would save associations added in after_create/after_update twice
+            after_create save_method
+            after_update save_method
           elsif reflection.has_one?
             define_method(save_method) { save_has_one_association(reflection) } unless method_defined?(save_method)
             # Configures two callbacks instead of a single after_save so that

data/lib/active_record/callbacks.rb

@@ -289,25 +289,25 @@ module ActiveRecord
     end
 
     def destroy #:nodoc:
-      run_callbacks(:destroy) { super }
+      _run_destroy_callbacks { super }
     end
 
     def touch(*) #:nodoc:
-      run_callbacks(:touch) { super }
+      _run_touch_callbacks { super }
     end
 
   private
 
     def create_or_update #:nodoc:
-      run_callbacks(:save) { super }
+      _run_save_callbacks { super }
     end
 
     def _create_record #:nodoc:
-      run_callbacks(:create) { super }
+      _run_create_callbacks { super }
     end
 
     def _update_record(*) #:nodoc:
-      run_callbacks(:update) { super }
+      _run_update_callbacks { super }
     end
   end
 end

data/lib/active_record/connection_adapters/abstract/connection_pool.rb

@@ -2,6 +2,7 @@ require 'thread'
 require 'thread_safe'
 require 'monitor'
 require 'set'
+require 'active_support/core_ext/string/filters'
 
 module ActiveRecord
   # Raised when a connection could not be obtained within the connection
@@ -360,7 +361,7 @@ module ActiveRecord
         synchronize do
           owner = conn.owner
 
-          conn.run_callbacks :checkin do
+          conn._run_checkin_callbacks do
             conn.expire
           end
 
@@ -449,7 +450,7 @@ module ActiveRecord
       end
 
       def checkout_and_verify(c)
-        c.run_callbacks :checkout do
+        c._run_checkout_callbacks do
           c.verify!
         end
         c
@@ -518,10 +519,11 @@ module ActiveRecord
       end
 
       def connection_pools
-        ActiveSupport::Deprecation.warn(
-          "In the next release, this will return the same as #connection_pool_list. " \
-          "(An array of pools, rather than a hash mapping specs to pools.)"
-        )
+        ActiveSupport::Deprecation.warn(<<-MSG.squish)
+          In the next release, this will return the same as `#connection_pool_list`.
+          (An array of pools, rather than a hash mapping specs to pools.)
+        MSG
+
         Hash[connection_pool_list.map { |pool| [pool.spec, pool] }]
       end
 

data/lib/active_record/connection_adapters/abstract/database_statements.rb

@@ -337,8 +337,9 @@ module ActiveRecord
 
         # Returns an ActiveRecord::Result instance.
         def select(sql, name = nil, binds = [])
+          exec_query(sql, name, binds)
         end
-        undef_method :select
+
 
         # Returns the last auto-generated ID from the affected table.
         def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)

data/lib/active_record/connection_adapters/abstract/quoting.rb

@@ -108,7 +108,7 @@ module ActiveRecord
         when Numeric, ActiveSupport::Duration then value.to_s
         when Date, Time then "'#{quoted_date(value)}'"
         when Symbol     then "'#{quote_string(value.to_s)}'"
-        when Class      then "'#{value.to_s}'"
+        when Class      then "'#{value}'"
         else
           "'#{quote_string(YAML.dump(value))}'"
         end

data/lib/active_record/connection_adapters/abstract/schema_definitions.rb

@@ -60,11 +60,11 @@ module ActiveRecord
       def emit_warning_if_null_unspecified(options)
         return if options.key?(:null)
 
-        ActiveSupport::Deprecation.warn \
-          "`timestamp` was called without specifying an option for `null`. In Rails " \
-          "5.0, this behavior will change to `null: false`. You should manually " \
-          "specify `null: true` to prevent the behavior of your existing migrations " \
-          "from changing."
+        ActiveSupport::Deprecation.warn(<<-MSG.squish)
+          `#timestamp` was called without specifying an option for `null`. In Rails 5,
+          this behavior will change to `null: false`. You should manually specify
+         `null: true` to prevent the behavior of your existing migrations from changing.
+        MSG
       end
     end
 
@@ -256,7 +256,7 @@ module ActiveRecord
         name = name.to_s
         type = type.to_sym
 
-        if primary_key_column_name == name
+        if @columns_hash[name] && @columns_hash[name].primary_key?
           raise ArgumentError, "you can't redefine the primary key column '#{name}'. To define a custom primary key, pass { id: false } to create_table."
         end
 
@@ -270,7 +270,7 @@ module ActiveRecord
         @columns_hash.delete name.to_s
       end
 
-      [:string, :text, :integer, :float, :decimal, :datetime, :timestamp, :time, :date, :binary, :boolean].each do |column_type|
+      [:string, :text, :integer, :bigint, :float, :decimal, :datetime, :timestamp, :time, :date, :binary, :boolean].each do |column_type|
         define_method column_type do |*args|
           options = args.extract_options!
           column_names = args
@@ -312,13 +312,13 @@ module ActiveRecord
         args.each do |col|
           column("#{col}_id", type, options)
           column("#{col}_type", :string, polymorphic.is_a?(Hash) ? polymorphic : options) if polymorphic
-          index(polymorphic ? %w(id type).map { |t| "#{col}_#{t}" } : "#{col}_id", index_options.is_a?(Hash) ? index_options : {}) if index_options
+          index(polymorphic ? %w(type id).map { |t| "#{col}_#{t}" } : "#{col}_id", index_options.is_a?(Hash) ? index_options : {}) if index_options
         end
       end
       alias :belongs_to :references
 
       def new_column_definition(name, type, options) # :nodoc:
-        type = aliased_types[type] || type
+        type = aliased_types(type.to_s, type)
         column = create_column_definition name, type
         limit = options.fetch(:limit) do
           native[type][:limit] if native[type].is_a?(Hash)
@@ -340,19 +340,12 @@ module ActiveRecord
         ColumnDefinition.new name, type
       end
 
-      def primary_key_column_name
-        primary_key_column = columns.detect { |c| c.primary_key? }
-        primary_key_column && primary_key_column.name
-      end
-
       def native
         @native
       end
 
-      def aliased_types
-        HashWithIndifferentAccess.new(
-          timestamp: :datetime,
-        )
+      def aliased_types(name, fallback)
+        'timestamp' == name ? :datetime : fallback
       end
     end