activerecord 5.0.0.beta2 → 5.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1253c6d369c65fef25582c1db08ce74b101c9ca2
-  data.tar.gz: 15c25783b7d09e51ce7a1cffd4195b146d3c4135
+  metadata.gz: 8926929a6df7248ea130b2445de91ba4e4933fb2
+  data.tar.gz: e25e460b0ff4541594badc944391f6a90b2d4c9f
 SHA512:
-  metadata.gz: 9ea8bb7f465a0a0f88233fb05a70d5a7ab3ae100e928e831ea7813385537718d9907981fb7dfa51beb2eaa1b4a1726d9927c72b47562504c0cb083e4f7942ef2
-  data.tar.gz: 86360455da6ca811777f4288ac4d18051ad86c308ae7a2d53d1f527b0db19a0bf5f6e5d5c589f8b825e94886e03e51b0a854fc2137ab02929cd2309e685b67d2
+  metadata.gz: baf2428151cb30e7a384a1a7a63fbb9da784c9a4fe23b8900ee9dc0ba7735baed85ca24b5e1dd2a75d1625e6b6e0b6378764e1694623cf292d66cc189f0fe373
+  data.tar.gz: 1069aa6eb655e0ee291af703e6d49785603662274d42cc632d95d9b39e37f2facc5d79aa4a25dd24103bd7268ba40a8c5f2af8cc1ece4e7c9d437ff584313439

data/CHANGELOG.md

@@ -1,3 +1,85 @@
+## Rails 5.0.0.beta3 (February 24, 2016) ##
+
+*   Ensure that mutations of the array returned from `ActiveRecord::Relation#to_a`
+    do not affect the original relation, by returning a duplicate array each time.
+
+    This brings the behavior in line with `CollectionProxy#to_a`, which was
+    already more careful.
+
+    *Matthew Draper*
+
+*   Fixed `where` for polymorphic associations when passed an array containing different types.
+
+    Fixes #17011.
+
+    Example:
+
+        PriceEstimate.where(estimate_of: [Treasure.find(1), Car.find(2)])
+        # => SELECT "price_estimates".* FROM "price_estimates"
+             WHERE (("price_estimates"."estimate_of_type" = 'Treasure' AND "price_estimates"."estimate_of_id" = 1)
+             OR ("price_estimates"."estimate_of_type" = 'Car' AND "price_estimates"."estimate_of_id" = 2))
+
+    *Philippe Huibonhoa*
+
+*   Fix a bug where using `t.foreign_key` twice with the same `to_table` within
+    the same table definition would only create one foreign key.
+
+    *George Millo*
+
+*   Fix a regression on has many association, where calling a child from parent in child's callback
+    results in same child records getting added repeatedly to target.
+
+    Fixes #13387.
+
+    *Bogdan Gusiev*, *Jon Hinson*
+
+*   Rework `ActiveRecord::Relation#last`.
+
+    1. Never perform additional SQL on loaded relation
+    2. Use SQL reverse order instead of loading relation if relation doesn't have limit
+    3. Deprecated relation loading when SQL order can not be automatically reversed
+
+        Topic.order("title").load.last(3)
+          # before: SELECT ...
+          # after: No SQL
+
+        Topic.order("title").last
+          # before: SELECT * FROM `topics`
+          # after:  SELECT * FROM `topics` ORDER BY `topics`.`title` DESC LIMIT 1
+
+        Topic.order("coalesce(author, title)").last
+          # before: SELECT * FROM `topics`
+          # after:  Deprecation Warning for irreversible order
+
+    *Bogdan Gusiev*
+
+
+*   Allow `joins` to be unscoped.
+
+    Fixes #13775.
+
+    *Takashi Kokubun*
+
+*   Add ActiveRecord `#second_to_last` and `#third_to_last` methods.
+
+    *Brian Christian*
+
+*   Added `numeric` helper into migrations.
+
+    Example:
+
+        create_table(:numeric_types) do |t|
+          t.numeric :numeric_type, precision: 10, scale: 2
+        end
+
+    *Mehmet Emin İNAÇ*
+
+*   Bumped the minimum supported version of PostgreSQL to >= 9.1.
+    Both PG 9.0 and 8.4 are past their end of life date:
+    http://www.postgresql.org/support/versioning/
+
+    *Remo Mueller*
+
 ## Rails 5.0.0.beta2 (February 01, 2016) ##
 
 *   `ActiveRecord::Relation#reverse_order` throws `ActiveRecord::IrreversibleOrderError`
@@ -596,7 +678,7 @@
 
     *Ben Murphy*, *Matthew Draper*
 
-*   `bin/rake db:migrate` uses
+*   `bin/rails db:migrate` uses
     `ActiveRecord::Tasks::DatabaseTasks.migrations_paths` instead of
     `Migrator.migrations_paths`.
 
@@ -998,13 +1080,6 @@
 
     *Alex Coomans*
 
-*   Dump indexes in `create_table` instead of `add_index`.
-
-    If the adapter supports indexes in `create_table`, generated SQL is
-    slightly more efficient.
-
-    *Ryuta Kamizono*
-
 *   Correctly dump `:options` on `create_table` for MySQL.
 
     *Ryuta Kamizono*
@@ -1379,18 +1454,6 @@
 
     *Chris Sinjakli*
 
-*   Validation errors would be raised for parent records when an association
-    was saved when the parent had `validate: false`. It should not be the
-    responsibility of the model to validate an associated object unless the
-    object was created or modified by the parent.
-
-    This fixes the issue by skipping validations if the parent record is
-    persisted, not changed, and not marked for destruction.
-
-    Fixes #17621.
-
-    *Eileen M. Uchitelle*, *Aaron Patterson*
-
 *   Fix n+1 query problem when eager loading nil associations (fixes #18312)
 
     *Sammy Larbi*

data/lib/active_record/association_relation.rb

@@ -10,7 +10,7 @@ module ActiveRecord
     end
 
     def ==(other)
-      other == to_a
+      other == records
     end
 
     def build(*args, &block)

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

@@ -76,6 +76,9 @@ module ActiveRecord::Associations::Builder # :nodoc:
           left_model.retrieve_connection
         end
 
+        def self.primary_key
+          false
+        end
       }
 
       join_model.name                = "HABTM_#{association_name.to_s.camelize}"

data/lib/active_record/associations/collection_association.rb

@@ -72,7 +72,10 @@ module ActiveRecord
         pk_type = reflection.primary_key_type
         ids = Array(ids).reject(&:blank?)
         ids.map! { |i| pk_type.cast(i) }
-        replace(klass.find(ids).index_by(&:id).values_at(*ids))
+        records = klass.where(reflection.association_primary_key => ids).index_by do |r|
+          r.send(reflection.association_primary_key)
+        end.values_at(*ids)
+        replace(records)
       end
 
       def reset
@@ -133,6 +136,14 @@ module ActiveRecord
         first_nth_or_last(:forty_two, *args)
       end
 
+      def third_to_last(*args)
+        first_nth_or_last(:third_to_last, *args)
+      end
+
+      def second_to_last(*args)
+        first_nth_or_last(:second_to_last, *args)
+      end
+
       def last(*args)
         first_nth_or_last(:last, *args)
       end

data/lib/active_record/associations/collection_proxy.rb

@@ -197,6 +197,16 @@ module ActiveRecord
         @association.forty_two(*args)
       end
 
+      # Same as #first except returns only the third-to-last record.
+      def third_to_last(*args)
+        @association.third_to_last(*args)
+      end
+
+      # Same as #first except returns only the second-to-last record.
+      def second_to_last(*args)
+        @association.second_to_last(*args)
+      end
+
       # Returns the last record, or the last +n+ records, from the collection.
       # If the collection is empty, the first form returns +nil+, and the second
       # form returns an empty array.
@@ -969,6 +979,10 @@ module ActiveRecord
       end
       alias_method :to_a, :to_ary
 
+      def records # :nodoc:
+        load_target
+      end
+
       # Adds one or more +records+ to the collection by setting their foreign keys
       # to the association's primary key. Returns +self+, so several appends may be
       # chained together.

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

@@ -54,12 +54,18 @@ module ActiveRecord
             end
             scope_chain_index += 1
 
-            relation = ActiveRecord::Relation.create(
-              klass,
-              table,
-              predicate_builder,
-            )
-            scope_chain_items.concat [klass.send(:build_default_scope, relation)].compact
+            klass_scope =
+              if klass.current_scope
+                klass.current_scope.clone
+              else
+                relation = ActiveRecord::Relation.create(
+                  klass,
+                  table,
+                  predicate_builder,
+                )
+                klass.send(:build_default_scope, relation)
+              end
+            scope_chain_items.concat [klass_scope].compact
 
             rel = scope_chain_items.inject(scope_chain_items.shift) do |left, right|
               left.merge right
@@ -75,7 +81,7 @@ module ActiveRecord
               column = klass.columns_hash[reflection.type.to_s]
 
               binds << Relation::QueryAttribute.new(column.name, value, klass.type_for_attribute(column.name))
-              constraint = constraint.and table[reflection.type].eq(Arel::Nodes::BindParam.new)
+              constraint = constraint.and klass.arel_attribute(reflection.type, table).eq(Arel::Nodes::BindParam.new)
             end
 
             joins << table.create_join(table, table.create_on(constraint), join_type)

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

@@ -47,7 +47,7 @@ module ActiveRecord
         # This is overridden by HABTM as the condition should be on the foreign_key column in
         # the join table
         def association_key
-          table[association_key_name]
+          klass.arel_attribute(association_key_name, table)
         end
 
         # The name of the key on the model which declares the association

data/lib/active_record/associations/singular_association.rb

@@ -45,7 +45,7 @@ module ActiveRecord
         end
 
         def get_records
-          return scope.limit(1).to_a if skip_statement_cache?
+          return scope.limit(1).records if skip_statement_cache?
 
           conn = klass.connection
           sc = reflection.association_scope_cache(conn, owner) do

data/lib/active_record/attribute_assignment.rb

@@ -29,14 +29,6 @@ module ActiveRecord
       assign_multiparameter_attributes(multi_parameter_attributes) unless multi_parameter_attributes.empty?
     end
 
-    # Tries to assign given value to given attribute.
-    # In case of an error, re-raises with the ActiveRecord constant.
-    def _assign_attribute(k, v) # :nodoc:
-      super
-    rescue ActiveModel::UnknownAttributeError
-      raise UnknownAttributeError.new(self, k)
-    end
-
     # Assign any deferred nested attributes after the base attributes have been set.
     def assign_nested_parameter_attributes(pairs)
       pairs.each { |k, v| _assign_attribute(k, v) }

data/lib/active_record/attribute_methods.rb

@@ -34,30 +34,6 @@ module ActiveRecord
 
     BLACKLISTED_CLASS_METHODS = %w(private public protected allocate new name parent superclass)
 
-    class AttributeMethodCache
-      def initialize
-        @module = Module.new
-        @method_cache = Concurrent::Map.new
-      end
-
-      def [](name)
-        @method_cache.compute_if_absent(name) do
-          safe_name = name.unpack('h*'.freeze).first
-          temp_method = "__temp__#{safe_name}"
-          ActiveRecord::AttributeMethods::AttrNames.set_name_cache safe_name, name
-          @module.module_eval method_body(temp_method, safe_name), __FILE__, __LINE__
-          @module.instance_method temp_method
-        end
-      end
-
-      private
-
-      # Override this method in the subclasses for method body.
-      def method_body(method_name, const_name)
-        raise NotImplementedError, "Subclasses must implement a method_body(method_name, const_name) method."
-      end
-    end
-
     class GeneratedAttributeMethods < Module; end # :nodoc:
 
     module ClassMethods

data/lib/active_record/attribute_methods/read.rb

@@ -1,8 +1,11 @@
 module ActiveRecord
   module AttributeMethods
     module Read
-      ReaderMethodCache = Class.new(AttributeMethodCache) {
-        private
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        protected
+
         # We want to generate the methods via module_eval rather than
         # define_method, because define_method is slower on dispatch.
         # Evaluating many similar methods may use more memory as the instruction
@@ -21,21 +24,6 @@ module ActiveRecord
         # to allocate an object on each call to the attribute method.
         # Making it frozen means that it doesn't get duped when used to
         # key the @attributes in read_attribute.
-        def method_body(method_name, const_name)
-          <<-EOMETHOD
-          def #{method_name}
-            name = ::ActiveRecord::AttributeMethods::AttrNames::ATTR_#{const_name}
-            _read_attribute(name) { |n| missing_attribute(n, caller) }
-          end
-          EOMETHOD
-        end
-      }.new
-
-      extend ActiveSupport::Concern
-
-      module ClassMethods
-        protected
-
         def define_method_attribute(name)
           safe_name = name.unpack('h*'.freeze).first
           temp_method = "__temp__#{safe_name}"

data/lib/active_record/attribute_methods/time_zone_conversion.rb

@@ -20,7 +20,7 @@ module ActiveRecord
               nil
             end
           else
-            map(super) { |t| cast(t) }
+            map_avoiding_infinite_recursion(super) { |v| cast(v) }
           end
         end
 
@@ -34,13 +34,23 @@ module ActiveRecord
           elsif value.is_a?(::Float)
             value
           else
-            map(value) { |v| convert_time_to_time_zone(v) }
+            map_avoiding_infinite_recursion(value) { |v| convert_time_to_time_zone(v) }
           end
         end
 
         def set_time_zone_without_conversion(value)
           ::Time.zone.local_to_utc(value).in_time_zone
         end
+
+        def map_avoiding_infinite_recursion(value)
+          map(value) do |v|
+            if value.equal?(v)
+              nil
+            else
+              yield(v)
+            end
+          end
+        end
       end
 
       extend ActiveSupport::Concern

data/lib/active_record/attribute_methods/write.rb

@@ -1,19 +1,6 @@
 module ActiveRecord
   module AttributeMethods
     module Write
-      WriterMethodCache = Class.new(AttributeMethodCache) {
-        private
-
-        def method_body(method_name, const_name)
-          <<-EOMETHOD
-          def #{method_name}(value)
-            name = ::ActiveRecord::AttributeMethods::AttrNames::ATTR_#{const_name}
-            write_attribute(name, value)
-          end
-          EOMETHOD
-        end
-      }.new
-
       extend ActiveSupport::Concern
 
       included do

data/lib/active_record/base.rb

@@ -13,7 +13,6 @@ require 'active_support/core_ext/kernel/singleton_class'
 require 'active_support/core_ext/module/introspection'
 require 'active_support/core_ext/object/duplicable'
 require 'active_support/core_ext/class/subclasses'
-require 'arel'
 require 'active_record/attribute_decorators'
 require 'active_record/errors'
 require 'active_record/log_subscriber'

data/lib/active_record/callbacks.rb

@@ -179,7 +179,7 @@ module ActiveRecord
   #
   # If the +before_validation+ callback throws +:abort+, the process will be
   # aborted and {ActiveRecord::Base#save}[rdoc-ref:Persistence#save] will return +false+.
-  # If {ActiveRecord::Base#save!}[rdoc-ref:Persistence#save!] is called it will raise a ActiveRecord::RecordInvalid exception.
+  # If {ActiveRecord::Base#save!}[rdoc-ref:Persistence#save!] is called it will raise an ActiveRecord::RecordInvalid exception.
   # Nothing will be appended to the errors object.
   #
   # == Canceling callbacks

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

@@ -27,10 +27,10 @@ module ActiveRecord
       end
 
       # Returns an ActiveRecord::Result instance.
-      def select_all(arel, name = nil, binds = [])
+      def select_all(arel, name = nil, binds = [], preparable: nil)
         arel, binds = binds_from_relation arel, binds
         sql = to_sql(arel, binds)
-        if arel.is_a?(String)
+        if !prepared_statements || (arel.is_a?(String) && preparable.nil?)
           preparable = false
         else
           preparable = visitor.preparable

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

@@ -61,11 +61,11 @@ module ActiveRecord
         @query_cache.clear
       end
 
-      def select_all(arel, name = nil, binds = [])
+      def select_all(arel, name = nil, binds = [], preparable: nil)
         if @query_cache_enabled && !locked?(arel)
           arel, binds = binds_from_relation arel, binds
           sql = to_sql(arel, binds)
-          cache_sql(sql, binds) { super(sql, name, binds) }
+          cache_sql(sql, binds) { super(sql, name, binds, preparable: visitor.preparable) }
         else
           super
         end