activerecord 5.2.0.rc1 → 5.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93d18124cf004be27375ca0f77a70d56b880796ee10d10dada17e2fe8db884e4
-  data.tar.gz: d8a7fbd5fd738a36fb7bbbbddebeb4f1e3ceec661f81fa31a545decd3c30b19c
+  metadata.gz: eb425b995eed9a7eaf3b93644266bdd4a88f49f95b26edaf134ecf57b5e021fd
+  data.tar.gz: 8aa207b5a556cfe2d3436db7b727a19dde4b23bbfa1ab5dde6488b29599f5bcb
 SHA512:
-  metadata.gz: 4b80509910c2c049cbdb41b24babb91bd0562709e4939894b9686d0516fd38e2ab30f0e009cb38205d57e19ab83952b53e1ab1f8e7b8741a4c552e416c1025b9
-  data.tar.gz: 6d848c3decb422926c55d2d9102c2d1e7d5d36c27d0d3b39b0fb6973533283e1e051a687f0da141c2ab8d3b1958b01d1e98c362b56f8455883a6366f7a08bd97
+  metadata.gz: aa5cfa06bf456169fd76770101a51d1674c5178aba4cbed99000f1c9e4ee5dd7b2da131d3f3d252f21d904c31d8669fcf38977f7c9808d02b403c54510ef721b
+  data.tar.gz: 653ad19017c710263edbe37f20fcf6fbf819e6585ea6ef3ce1a70041e6464201b4dea9166d5cff703384f063dabb33033125dbb7e9101886312bf7f06beec32e

data/CHANGELOG.md

@@ -1,5 +1,68 @@
+## Rails 5.2.0.rc2 (March 20, 2018) ##
+
+*   Apply time column precision on assignment.
+
+    PR #20317 changed the behavior of datetime columns so that when they
+    have a specified precision then on assignment the value is rounded to
+    that precision. This behavior is now applied to time columns as well.
+
+    Fixes #30301.
+
+    *Andrew White*
+
+*   Normalize time column values for SQLite database.
+
+    For legacy reasons, time columns in SQLite are stored as full datetimes
+    because until #24542 the quoting for time columns didn't remove the date
+    component. To ensure that values are consistent we now normalize the
+    date component to 2001-01-01 on reading and writing.
+
+    *Andrew White*
+
+*   Ensure that the date component is removed when quoting times.
+
+    PR #24542 altered the quoting for time columns so that the date component
+    was removed however it only removed it when it was 2001-01-01. Now the
+    date component is removed irrespective of what the date is.
+
+    *Andrew White*
+
+*   Fix `dependent: :destroy` issue for has_one/belongs_to relationship where
+    the parent class was getting deleted when the child was not.
+
+    Fixes #32022.
+
+    *Fernando Gorodscy*
+
+*   Whitelist `NULLS FIRST` and `NULLS LAST` in order clauses too.
+
+    *Xavier Noria*
+
+*   Fix that after commit callbacks on update does not triggered when optimistic locking is enabled.
+
+    *Ryuta Kamizono*
+
+*   Fix `#columns_for_distinct` of MySQL and PostgreSQL to make
+    `ActiveRecord::FinderMethods#limited_ids_for` use correct primary key values
+    even if `ORDER BY` columns include other table's primary key.
+
+    Fixes #28364.
+
+    *Takumi Kagiyama*
+
+*   Make `reflection.klass` raise if `polymorphic?` not to be misused.
+
+    Fixes #31876.
+
+    *Ryuta Kamizono*
+
+
 ## Rails 5.2.0.rc1 (January 30, 2018) ##
 
+*   PostgreSQL: Allow pg-1.0 gem to be used with Active Record.
+
+    *Lars Kanis*
+
 *   Deprecate `expand_hash_conditions_for_aggregates` without replacement.
     Using a `Relation` for performing queries is the prefered API.
 
@@ -117,7 +180,7 @@
 
     *Chris Salzberg*
 
-*   Log database query callers
+*   Log database query callers.
 
     Add `verbose_query_logs` configuration option to display the caller
     of database queries in the log to facilitate N+1 query resolution
@@ -352,7 +415,7 @@
 
     *Rafael Mendonça França*
 
-*   Fix `bin/rails db:setup` and `bin/rails db:test:prepare` create  wrong
+*   Fix `bin/rails db:setup` and `bin/rails db:test:prepare` create wrong
     ar_internal_metadata's data for a test database.
 
     Before:
@@ -444,7 +507,7 @@
 
     *Yuichiro Kaneko*
 
-*   Ensure `sum` honors `distinct` on `has_many :through` associations
+*   Ensure `sum` honors `distinct` on `has_many :through` associations.
 
     Fixes #16791.
 
@@ -480,7 +543,7 @@
 
     *Lisa Ugray*
 
-*   Fix `unscoped(where: [columns])` removing the wrong bind values
+*   Fix `unscoped(where: [columns])` removing the wrong bind values.
 
     When the `where` is called on a relation after a `or`, unscoping the column of that later `where` removed
     bind values used by the `or` instead. (possibly other cases too)
@@ -507,7 +570,7 @@
 
     *Sean Griffin*
 
-*   Change sqlite3 boolean serialization to use 1 and 0
+*   Change sqlite3 boolean serialization to use 1 and 0.
 
     SQLite natively recognizes 1 and 0 as true and false, but does not natively
     recognize 't' and 'f' as was previously serialized.
@@ -537,7 +600,7 @@
 
     *Ryuta Kamizono*
 
-*   Fix transactions to apply state to child transactions
+*   Fix transactions to apply state to child transactions.
 
     Previously, if you had a nested transaction and the outer transaction was rolledback, the record from the
     inner transaction would still be marked as persisted.
@@ -547,7 +610,7 @@
 
     *Eileen M. Uchitelle*, *Aaron Patterson*
 
-*   Deprecate `set_state` method in `TransactionState`
+*   Deprecate `set_state` method in `TransactionState`.
 
     Deprecated the `set_state` method in favor of setting the state via specific methods. If you need to mark the
     state of the transaction you can now use `rollback!`, `commit!` or `nullify!` instead of
@@ -559,10 +622,6 @@
 
     *Ryuta Kamizono*
 
-*   Fix eager loading to respect `store_full_sti_class` setting.
-
-    *Ryuta Kamizono*
-
 *   Query cache was unavailable when entering the `ActiveRecord::Base.cache` block
     without being connected.
 
@@ -576,7 +635,9 @@
     *Tobias Kraze*
 
 *   Merging two relations representing nested joins no longer transforms the joins of
-    the merged relation into LEFT OUTER JOIN. Example to clarify:
+    the merged relation into LEFT OUTER JOIN.
+
+    Example:
 
     ```
     Author.joins(:posts).merge(Post.joins(:comments))
@@ -587,8 +648,6 @@
     #=> SELECT ... FROM authors INNER JOIN posts ON ... INNER JOIN comments ON...
     ```
 
-    TODO: Add to the Rails 5.2 upgrade guide
-
     *Maxime Handfield Lapointe*
 
 *   `ActiveRecord::Persistence#touch` does not work well when optimistic locking enabled and
@@ -628,11 +687,11 @@
 
     *DHH*
 
-*   Respect `SchemaDumper.ignore_tables` in rake tasks for databases structure dump
+*   Respect `SchemaDumper.ignore_tables` in rake tasks for databases structure dump.
 
     *Rusty Geldmacher*, *Guillermo Iguaran*
 
-*   Add type caster to `RuntimeReflection#alias_name`
+*   Add type caster to `RuntimeReflection#alias_name`.
 
     Fixes #28959.
 

data/README.rdoc

@@ -192,7 +192,7 @@ The latest version of Active Record can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub:
 
-* https://github.com/rails/rails/tree/master/activerecord
+* https://github.com/rails/rails/tree/5-2-stable/activerecord
 
 
 == License

data/lib/active_record/associations/association.rb

@@ -156,9 +156,9 @@ module ActiveRecord
         reset
       end
 
-      # We can't dump @reflection since it contains the scope proc
+      # We can't dump @reflection and @through_reflection since it contains the scope proc
       def marshal_dump
-        ivars = (instance_variables - [:@reflection]).map { |name| [name, instance_variable_get(name)] }
+        ivars = (instance_variables - [:@reflection, :@through_reflection]).map { |name| [name, instance_variable_get(name)] }
         [@reflection.name, ivars]
       end
 
@@ -201,8 +201,8 @@ module ActiveRecord
           if (reflection.has_one? || reflection.collection?) && !options[:through]
             attributes[reflection.foreign_key] = owner[reflection.active_record_primary_key]
 
-            if reflection.options[:as]
-              attributes[reflection.type] = owner.class.base_class.name
+            if reflection.type
+              attributes[reflection.type] = owner.class.polymorphic_name
             end
           end
 

data/lib/active_record/associations/association_scope.rb

@@ -35,12 +35,12 @@ module ActiveRecord
 
         binds << last_reflection.join_id_for(owner)
         if last_reflection.type
-          binds << owner.class.base_class.name
+          binds << owner.class.polymorphic_name
         end
 
         chain.each_cons(2).each do |reflection, next_reflection|
           if reflection.type
-            binds << next_reflection.klass.base_class.name
+            binds << next_reflection.klass.polymorphic_name
           end
         end
         binds
@@ -67,7 +67,7 @@ module ActiveRecord
           scope = apply_scope(scope, table, key, value)
 
           if reflection.type
-            polymorphic_type = transform_value(owner.class.base_class.name)
+            polymorphic_type = transform_value(owner.class.polymorphic_name)
             scope = apply_scope(scope, table, reflection.type, polymorphic_type)
           end
 
@@ -88,7 +88,7 @@ module ActiveRecord
           constraint = table[key].eq(foreign_table[foreign_key])
 
           if reflection.type
-            value = transform_value(next_reflection.klass.base_class.name)
+            value = transform_value(next_reflection.klass.polymorphic_name)
             scope = apply_scope(scope, table, reflection.type, value)
           end
 
@@ -135,7 +135,7 @@ module ActiveRecord
               item = eval_scope(reflection, scope_chain_item, owner)
 
               if scope_chain_item == chain_head.scope
-                scope.merge! item.except(:where, :includes)
+                scope.merge! item.except(:where, :includes, :unscope, :order)
               end
 
               reflection.all_includes do
@@ -144,7 +144,7 @@ module ActiveRecord
 
               scope.unscope!(*item.unscope_values)
               scope.where_clause += item.where_clause
-              scope.order_values |= item.order_values
+              scope.order_values = item.order_values | scope.order_values
             end
           end
 

data/lib/active_record/associations/belongs_to_association.rb

@@ -5,7 +5,15 @@ module ActiveRecord
     # = Active Record Belongs To Association
     class BelongsToAssociation < SingularAssociation #:nodoc:
       def handle_dependency
-        target.send(options[:dependent]) if load_target
+        return unless load_target
+
+        case options[:dependent]
+        when :destroy
+          target.destroy
+          raise ActiveRecord::Rollback unless target.destroyed?
+        else
+          target.send(options[:dependent])
+        end
       end
 
       def replace(record)

data/lib/active_record/associations/belongs_to_polymorphic_association.rb

@@ -13,7 +13,7 @@ module ActiveRecord
 
         def replace_keys(record)
           super
-          owner[reflection.foreign_type] = record ? record.class.base_class.name : nil
+          owner[reflection.foreign_type] = record ? record.class.polymorphic_name : nil
         end
 
         def different_target?(record)

data/lib/active_record/associations/has_one_association.rb

@@ -60,6 +60,7 @@ module ActiveRecord
           when :destroy
             target.destroyed_by_association = reflection
             target.destroy
+            throw(:abort) unless target.destroyed?
           when :nullify
             target.update_columns(reflection.foreign_key => nil) if target.persisted?
           end

data/lib/active_record/associations/join_dependency.rb

@@ -88,9 +88,8 @@ module ActiveRecord
       #    associations # => [:appointments]
       #    joins # =>  []
       #
-      def initialize(base, table, associations, alias_tracker, eager_loading: true)
+      def initialize(base, table, associations, alias_tracker)
         @alias_tracker = alias_tracker
-        @eager_loading = eager_loading
         tree = self.class.make_tree associations
         @join_root = JoinBase.new(base, table, build(tree, base))
         @join_root.children.each { |child| construct_tables! @join_root, child }
@@ -221,12 +220,11 @@ module ActiveRecord
             reflection.check_eager_loadable!
 
             if reflection.polymorphic?
-              next unless @eager_loading
               raise EagerLoadPolymorphicError.new(reflection)
             end
 
             JoinAssociation.new(reflection, build(right, reflection.klass), alias_tracker)
-          end.compact
+          end
         end
 
         def construct(ar_parent, parent, row, rs, seen, model_cache, aliases)

data/lib/active_record/associations/preloader/association.rb

@@ -118,7 +118,7 @@ module ActiveRecord
             scope = klass.scope_for_association
 
             if reflection.type
-              scope.where!(reflection.type => model.base_class.sti_name)
+              scope.where!(reflection.type => model.polymorphic_name)
             end
 
             scope.merge!(reflection_scope) if reflection.scope

data/lib/active_record/attribute_assignment.rb

@@ -7,11 +7,6 @@ module ActiveRecord
     extend ActiveSupport::Concern
     include ActiveModel::AttributeAssignment
 
-    # Alias for ActiveModel::AttributeAssignment#assign_attributes. See ActiveModel::AttributeAssignment.
-    def attributes=(attributes)
-      assign_attributes(attributes)
-    end
-
     private
 
       def _assign_attributes(attributes)

data/lib/active_record/attribute_methods.rb

@@ -175,9 +175,20 @@ module ActiveRecord
       # Regexp whitelist. Matches the following:
       #   "#{table_name}.#{column_name}"
       #   "#{table_name}.#{column_name} #{direction}"
+      #   "#{table_name}.#{column_name} #{direction} NULLS FIRST"
+      #   "#{table_name}.#{column_name} NULLS LAST"
       #   "#{column_name}"
       #   "#{column_name} #{direction}"
-      COLUMN_NAME_ORDER_WHITELIST = /\A(?:\w+\.)?\w+(?:\s+asc|\s+desc)?\z/i
+      #   "#{column_name} #{direction} NULLS FIRST"
+      #   "#{column_name} NULLS LAST"
+      COLUMN_NAME_ORDER_WHITELIST = /
+        \A
+        (?:\w+\.)?
+        \w+
+        (?:\s+asc|\s+desc)?
+        (?:\s+nulls\s+(?:first|last))?
+        \z
+      /ix
 
       def enforce_raw_sql_whitelist(args, whitelist: COLUMN_NAME_WHITELIST) # :nodoc:
         unexpected = args.reject do |arg|
@@ -441,24 +452,18 @@ module ActiveRecord
 
     private
 
-      def arel_attributes_with_values_for_create(attribute_names)
-        arel_attributes_with_values(attributes_for_create(attribute_names))
+      def attributes_with_values_for_create(attribute_names)
+        attributes_with_values(attributes_for_create(attribute_names))
       end
 
-      def arel_attributes_with_values_for_update(attribute_names)
-        arel_attributes_with_values(attributes_for_update(attribute_names))
+      def attributes_with_values_for_update(attribute_names)
+        attributes_with_values(attributes_for_update(attribute_names))
       end
 
-      # Returns a Hash of the Arel::Attributes and attribute values that have been
-      # typecasted for use in an Arel insert/update method.
-      def arel_attributes_with_values(attribute_names)
-        attrs = {}
-        arel_table = self.class.arel_table
-
-        attribute_names.each do |name|
-          attrs[arel_table[name]] = _read_attribute(name)
+      def attributes_with_values(attribute_names)
+        attribute_names.each_with_object({}) do |name, attrs|
+          attrs[name] = _read_attribute(name)
         end
-        attrs
       end
 
       # Filters the primary keys and readonly attributes from the attribute names.

data/lib/active_record/attribute_methods/dirty.rb

@@ -32,7 +32,9 @@ module ActiveRecord
       # <tt>reload</tt> the record and clears changed attributes.
       def reload(*)
         super.tap do
+          @previously_changed = ActiveSupport::HashWithIndifferentAccess.new
           @mutations_before_last_save = nil
+          @attributes_changed_by_setter = ActiveSupport::HashWithIndifferentAccess.new
           @mutations_from_database = nil
         end
       end
@@ -112,12 +114,12 @@ module ActiveRecord
 
       # Alias for +changed+
       def changed_attribute_names_to_save
-        mutations_from_database.changed_attribute_names
+        changes_to_save.keys
       end
 
       # Alias for +changed_attributes+
       def attributes_in_database
-        mutations_from_database.changed_values
+        changes_to_save.transform_values(&:first)
       end
 
       private

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

@@ -130,7 +130,7 @@ module ActiveRecord
       end
 
       def quoted_time(value) # :nodoc:
-        quoted_date(value).sub(/\A2000-01-01 /, "")
+        quoted_date(value).sub(/\A\d\d\d\d-\d\d-\d\d /, "")
       end
 
       def quoted_binary(value) # :nodoc:

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

@@ -406,7 +406,7 @@ module ActiveRecord
       #
       #   Defaults to false.
       #
-      #   Only supported on the MySQL adapter, ignored elsewhere.
+      #   Only supported on the MySQL and PostgreSQL adapter, ignored elsewhere.
       #
       # ====== Add a column
       #