activerecord 4.2.0.beta4 → 4.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce2a22714e7ecce16ad964d1f2f3725feb2b1920
-  data.tar.gz: 8812b21dadc7a62d5ff64a05ebec8fa8edc31558
+  metadata.gz: e36df2e99fc4c9ad7289fa8fd6a11f85a5933267
+  data.tar.gz: 181f2f79748d0e92fb6a0e3c253dce3d08332577
 SHA512:
-  metadata.gz: 907e24f6a9edc6d5ce51166fc225c3cd033cf00d0405e4e247aa0bf2721e9c4032a1708a7bc887d4109acdb3cd96dce5b37698985b9993d25d9d405785323f3c
-  data.tar.gz: 547b9bb76efcdb0cb6b56ab8ae31f17ee528a053ee593b2e041406a11edbba209a1cef87ff539863544e840a542f5474274d2448b6bbeb448b9e4f7ffcf38721
+  metadata.gz: 2450da5cfc14bdaea3914cb83a0f53193b26eb6600b1de7353901ba92edf085ff1437f970f6546b1701e28ba5f369747315e75a9692be14dccd6169f273ade26
+  data.tar.gz: 082d7b0fc38bbea2ba4591d8d14c2ac196de1c057e5710e6fac6e286c6e5ab494b760de8563f0570ee3daae96ef8274cd0e1c7fd7430c7c3cf3d630e6482c447

data/CHANGELOG.md

@@ -1,3 +1,73 @@
+*   Bring back `db:test:prepare` to synchronize the test database schema.
+
+    Manual synchronization using `bin/rake db:test:prepare` is required
+    when a migration is rolled-back, edited and reapplied.
+
+    `ActiveRecord::Base.maintain_test_schema` now uses `db:test:prepare`
+    to synchronize the schema. Plugins can use this task as a hook to
+    provide custom behavior after the schema has been loaded.
+
+    NOTE: `test:prepare` runs before the schema is synchronized.
+
+    Fixes #17171, #15787.
+
+    *Yves Senn*
+
+*   Change `reflections` public api to return the keys as String objects.
+
+    Fixes #16928.
+
+    *arthurnn*
+
+*   Renaming a table in pg also renames the primary key index.
+
+    Fixes #12856
+
+    *Sean Griffin*
+
+*   Make it possible to access fixtures excluded by a `default_scope`.
+
+    *Yves Senn*
+
+*   Fix preloading of associations with a scope containing joins along with
+    conditions on the joined association.
+
+    *Siddharth Sharma*
+
+*   Add `Table#name` to match `TableDefinition#name`.
+
+    *Cody Cutrer*
+
+*   Cache `CollectionAssociation#reader` proxies separately before and after
+    the owner has been saved so that the proxy is not cached without the
+    owner's id.
+
+    *Ben Woosley*
+
+*   `ActiveRecord::ReadOnlyRecord` now has a descriptive message.
+
+    *Franky W.*
+
+*   Fix preloading of associations which unscope a default scope.
+
+    Fixes #11036.
+
+    *Byron Bischoff*
+
+*   Added SchemaDumper support for tables with jsonb columns.
+
+    *Ted O'Meara*
+
+*   Deprecate `sanitize_sql_hash_for_conditions` without replacement. Using a
+    `Relation` for performing queries and updates is the prefered API.
+
+    *Sean Griffin*
+
+*   Queries now properly type cast values that are part of a join statement,
+    even when using type decorators such as `serialize`.
+
+    *Melanie Gilman & Sean Griffin*
+
 *   MySQL enum type lookups, with values matching another type, no longer result
     in an endless loop.
 
@@ -24,7 +94,7 @@
 
     *Yuki Nishijima*
 
-*   Fix regression causing `after_create` callbacks to run before associated
+*   Fix a regression causing `after_create` callbacks to run before associated
     records are autosaved.
 
     Fixes #17209.
@@ -121,7 +191,7 @@
 
     *Yves Senn*
 
-*   Fixed a regression where whitespaces were stripped from DISTINCT queries in
+*   Fix a regression where whitespaces were stripped from DISTINCT queries in
     PostgreSQL.
 
     *Agis Anastasopoulos*
@@ -135,7 +205,7 @@
 
     *Agis Anastasopoulos*
 
-*   Fixed `Relation#exists?` to work with polymorphic associations.
+*   Fix `Relation#exists?` to work with polymorphic associations.
 
     Fixes #15821.
 
@@ -157,7 +227,7 @@
 
     *arthurnn*
 
-*   Fixed an issue where custom accessor methods (such as those generated by
+*   Fix an issue where custom accessor methods (such as those generated by
     `enum`) with the same name as a global method are incorrectly overridden
     when subclassing.
 
@@ -221,7 +291,7 @@
 
     *Yves Senn*
 
-*   Fixed automatic maintaining test schema to properly handle sql structure
+*   Fix automatic maintaining test schema to properly handle sql structure
     schema format.
 
     Fixes #15394.
@@ -384,8 +454,8 @@
 
     *Sean Griffin*
 
-*   Fixed error in `reset_counters` when associations have `select` scope.
-    (Call to `count` generates invalid SQL.)
+*   Fix an error in `reset_counters` when associations have `select` scope.
+    (Call to `count` generated invalid SQL.)
 
     *Cade Truitt*
 
@@ -610,7 +680,7 @@
 
     *Yves Senn*
 
-*   Fixed `columns_for_distinct` of postgresql adapter to work correctly
+*   Fix `columns_for_distinct` of PostgreSQL adapter to work correctly
     with orders without sort direction modifiers.
 
     *Nikolay Kondratyev*
@@ -646,7 +716,7 @@
 
     *arthurnn*
 
-*   Fixed serialization for records with an attribute named `format`.
+*   Fix serialization for records with an attribute named `format`.
 
     Fixes #15188.
 
@@ -657,12 +727,12 @@
 
     *Kuldeep Aggarwal*
 
-*   Fixed serialized fields returning serialized data after being updated with
+*   Fix serialized fields returning serialized data after being updated with
     `update_column`.
 
     *Simon Hørup Eskildsen*
 
-*   Fixed polymorphic eager loading when using a String as foreign key.
+*   Fix polymorphic eager loading when using a String as foreign key.
 
     Fixes #14734.
 
@@ -676,7 +746,7 @@
 
     *Brock Trappitt*
 
-*   Fixed the inferred table name of a `has_and_belongs_to_many` auxiliar
+*   Fix the inferred table name of a `has_and_belongs_to_many` auxiliary
     table inside a schema.
 
     Fixes #14824.
@@ -788,7 +858,7 @@
 
     *Yves Senn*
 
-*   Fixed has_and_belongs_to_many's CollectionAssociation size calculation.
+*   Fix `has_and_belongs_to_many` CollectionAssociation size calculations.
 
     `has_and_belongs_to_many` should fall back to using the normal CollectionAssociation's
     size calculation if the collection is not cached or loaded.
@@ -893,10 +963,12 @@
 
     *Earl St Sauver*
 
-*   Fixed unexpected behavior for `has_many :through` associations going through a scoped `has_many`.
+*   Fix unexpected behavior for `has_many :through` associations going through
+    a scoped `has_many`.
 
-    If a `has_many` association is adjusted using a scope, and another `has_many :through`
-    uses this association, then the scope adjustment is unexpectedly neglected.
+    If a `has_many` association is adjusted using a scope, and another
+    `has_many :through` uses this association, then the scope adjustment is
+    unexpectedly neglected.
 
     Fixes #14537.
 
@@ -906,13 +978,13 @@
 
     *Kuldeep Aggarwal*
 
-*   Fixed `has_many` association to make it support irregular inflections.
+*   Enable `has_many` associations to support irregular inflections.
 
     Fixes #8928.
 
     *arthurnn*, *Javier Goizueta*
 
-*   Fixed a problem where count used with a grouping was not returning a Hash.
+*   Fix `count` used with a grouping not returning a Hash.
 
     Fixes #14721.
 
@@ -967,8 +1039,8 @@
 
     *Eileen M. Uchitelle*, *Aaron Patterson*
 
-*   Fixed error for aggregate methods (`empty?`, `any?`, `count`) with `select`
-    which created invalid SQL.
+*   Fix invalid SQL when aggregate methods (`empty?`, `any?`, `count`) used
+    with `select`.
 
     Fixes #13648.
 
@@ -999,8 +1071,8 @@
 
     *Roderick van Domburg*
 
-*   Fixed a problem where an enum would overwrite values of another enum
-    with the same name in an unrelated class.
+*   Fix a problem where an enum would overwrite values of another enum with the
+    same name in an unrelated class.
 
     Fixes #14607.
 
@@ -1035,7 +1107,7 @@
 
     *arthurnn*
 
-*   Fixed error when using `with_options` with lambda.
+*   Fix error when using `with_options` with lambda.
 
     Fixes #9805.
 
@@ -1073,14 +1145,15 @@
 
     *Yves Senn*
 
-*   Fixed error when specifying a non-empty default value on a PostgreSQL array column.
+*   Fix error when specifying a non-empty default value on a PostgreSQL array
+    column.
 
     Fixes #10613.
 
     *Luke Steensen*
 
-*   Fixed error where .persisted? throws SystemStackError for an unsaved model with a
-    custom primary key that didn't save due to validation error.
+*   Fix error where `.persisted?` throws SystemStackError for an unsaved model with a
+    custom primary key that did not save due to validation error.
 
     Fixes #14393.
 
@@ -1173,7 +1246,8 @@
 
     *Aaron Patterson*
 
-*   Only use BINARY for MySQL case sensitive uniqueness check when column has a case insensitive collation.
+*   Only use BINARY for MySQL case sensitive uniqueness check when column
+    has a case insensitive collation.
 
     *Ryuta Kamizono*
 
@@ -1181,8 +1255,8 @@
 
     *arthurnn*, *Tatsuhiko Miyagawa*
 
-*   Support for Postgres `citext` data type enabling case-insensitive where
-    values without needing to wrap in UPPER/LOWER sql functions.
+*   Support for PostgreSQL `citext` data type enabling case-insensitive
+   `where` values without needing to wrap in UPPER/LOWER sql functions.
 
     *Troy Kruthoff*, *Lachlan Sylvester*
 
@@ -1212,9 +1286,8 @@
 
     *Aaron Patterson*, *Yves Senn*
 
-*   Fixed error with validation with enum fields for records where the
-    value for any enum attribute is always evaluated as 0 during
-    uniqueness validation.
+*   Fix error with validation with enum fields for records where the value for
+    any enum attribute is always evaluated as 0 during uniqueness validation.
 
     Fixes #14172.
 
@@ -1228,8 +1301,8 @@
 
     Fixes #14144.
 
-*   Fixed STI classes not defining an attribute method if there is a
-    conflicting private method defined on its ancestors.
+*   Fix STI classes not defining an attribute method if there is a conflicting
+    private method defined on its ancestors.
 
     Fixes #11569.
 

data/lib/active_record/aggregations.rb

@@ -230,8 +230,8 @@ module ActiveRecord
       private
         def reader_method(name, class_name, mapping, allow_nil, constructor)
           define_method(name) do
-            if @aggregation_cache[name].nil? && (!allow_nil || mapping.any? {|key, _| !read_attribute(key).nil? })
-              attrs = mapping.collect {|key, _| read_attribute(key)}
+            if @aggregation_cache[name].nil? && (!allow_nil || mapping.any? {|key, _| !_read_attribute(key).nil? })
+              attrs = mapping.collect {|key, _| _read_attribute(key)}
               object = constructor.respond_to?(:call) ?
                 constructor.call(*attrs) :
                 class_name.constantize.send(constructor, *attrs)

data/lib/active_record/associations.rb

@@ -1700,7 +1700,7 @@ module ActiveRecord
         hm_options[:through] = middle_reflection.name
         hm_options[:source] = join_model.right_reflection.name
 
-        [:before_add, :after_add, :before_remove, :after_remove, :autosave, :validate, :join_table].each do |k|
+        [:before_add, :after_add, :before_remove, :after_remove, :autosave, :validate, :join_table, :class_name].each do |k|
           hm_options[k] = options[k] if options.key? k
         end
 

data/lib/active_record/associations/alias_tracker.rb

@@ -57,20 +57,10 @@ module ActiveRecord
       end
 
       def aliased_table_for(table_name, aliased_name)
-        table_alias = aliased_name_for(table_name, aliased_name)
-
-        if table_alias == table_name
-          Arel::Table.new(table_name)
-        else
-          Arel::Table.new(table_name).alias(table_alias)
-        end
-      end
-
-      def aliased_name_for(table_name, aliased_name)
         if aliases[table_name].zero?
           # If it's zero, we can have our table_name
           aliases[table_name] = 1
-          table_name
+          Arel::Table.new(table_name)
         else
           # Otherwise, we need to use an alias
           aliased_name = connection.table_alias_for(aliased_name)
@@ -78,11 +68,12 @@ module ActiveRecord
           # Update the count
           aliases[aliased_name] += 1
 
-          if aliases[aliased_name] > 1
+          table_alias = if aliases[aliased_name] > 1
             "#{truncate(aliased_name)}_#{aliases[aliased_name]}"
           else
             aliased_name
           end
+          Arel::Table.new(table_name).alias(table_alias)
         end
       end
 

data/lib/active_record/associations/association_scope.rb

@@ -11,8 +11,7 @@ module ActiveRecord
         end
 
         def bind_value(scope, column, value, alias_tracker)
-          substitute = alias_tracker.connection.substitute_at(
-            column, scope.bind_values.length)
+          substitute = alias_tracker.connection.substitute_at(column)
           scope.bind_values += [[column, @block.call(value)]]
           substitute
         end

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

@@ -98,7 +98,7 @@ module ActiveRecord::Associations::Builder
 
     def middle_options(join_model)
       middle_options = {}
-      middle_options[:class] = join_model
+      middle_options[:class_name] = "#{lhs_model.name}::#{join_model.name}"
       middle_options[:source] = join_model.left_reflection.name
       if options.key? :foreign_key
         middle_options[:foreign_key] = options[:foreign_key]
@@ -110,7 +110,7 @@ module ActiveRecord::Associations::Builder
       rhs_options = {}
 
       if options.key? :class_name
-        rhs_options[:foreign_key] = options[:class_name].foreign_key
+        rhs_options[:foreign_key] = options[:class_name].to_s.foreign_key
         rhs_options[:class_name] = options[:class_name]
       end
 

data/lib/active_record/associations/collection_association.rb

@@ -33,7 +33,13 @@ module ActiveRecord
           reload
         end
 
-        @proxy ||= CollectionProxy.create(klass, self)
+        if owner.new_record?
+          # Cache the proxy separately before the owner has an id
+          # or else a post-save proxy will still lack the id
+          @new_record_proxy ||= CollectionProxy.create(klass, self)
+        else
+          @proxy ||= CollectionProxy.create(klass, self)
+        end
       end
 
       # Implements the writer method, e.g. foo.items= for Foo.has_many :items
@@ -169,8 +175,8 @@ module ActiveRecord
       end
 
       # Removes all records from the association without calling callbacks
-      # on the associated records. It honors the `:dependent` option. However
-      # if the `:dependent` value is `:destroy` then in that case the `:delete_all`
+      # on the associated records. It honors the +:dependent+ option. However
+      # if the +:dependent+ value is +:destroy+ then in that case the +:delete_all+
       # deletion strategy for the association is applied.
       #
       # You can force a particular deletion strategy by passing a parameter.
@@ -352,6 +358,7 @@ module ActiveRecord
         if owner.new_record?
           replace_records(other_array, original_target)
         else
+          replace_common_records_in_memory(other_array, original_target)
           if other_array != original_target
             transaction { replace_records(other_array, original_target) }
           end
@@ -379,11 +386,18 @@ module ActiveRecord
         target
       end
 
-      def add_to_target(record, skip_callbacks = false)
+      def add_to_target(record, skip_callbacks = false, &block)
+        if association_scope.distinct_value
+          index = @target.index(record)
+        end
+        replace_on_target(record, index, skip_callbacks, &block)
+      end
+
+      def replace_on_target(record, index, skip_callbacks)
         callback(:before_add, record) unless skip_callbacks
         yield(record) if block_given?
 
-        if association_scope.distinct_value && index = @target.index(record)
+        if index
           @target[index] = record
         else
           @target << record
@@ -409,7 +423,8 @@ module ActiveRecord
       def get_records
         if reflection.scope_chain.any?(&:any?) ||
           scope.eager_loading? ||
-          klass.current_scope
+          klass.current_scope ||
+          klass.default_scopes.any?
 
           return scope.to_a
         end
@@ -527,6 +542,14 @@ module ActiveRecord
           target
         end
 
+        def replace_common_records_in_memory(new_target, original_target)
+          common_records = new_target & original_target
+          common_records.each do |record|
+            skip_callbacks = true
+            replace_on_target(record, @target.index(record), skip_callbacks)
+          end
+        end
+
         def concat_records(records, should_raise = false)
           result = true