activerecord 4.1.9 → 4.1.10.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fefe42490f697250635bb596a1cc5f10981a13f
-  data.tar.gz: 978502842819d7e7c43da979feb6759cd8332bd8
+  metadata.gz: e329025c048dbd366e2fca4091303d14803fef0f
+  data.tar.gz: 2fb5d5bdb86e35ee822fe7bd36923913dfc22dc9
 SHA512:
-  metadata.gz: 96218532f5abd1a52c878f7cbd3bb566a5c96f51aac50072fca2dcc204fdf709aebb0b5be216bd829ef4ae8d6c5dea8057f06fc01f25ab329dbaf9ab7f7828c9
-  data.tar.gz: ad46a3a1d6a43b0bcd3330502998b69cd9f0f8ddc83c589fdb5d64cf663347765a9b9ec0d34b1080be6c8203baeea63dcd4f60459213e6888a29fc9f4c6005d5
+  metadata.gz: 59ceda382ce5783d72da28327e6981431f7251db2b947a3421182850f345503e751698847a2b09f45a228cac3dff48f9cd4110a673e752defc00866ee9ad05a6
+  data.tar.gz: 844e1f73eda741d030d66af1f56abdc261effa32bf86e2173034381e85c6131230204a78246d15f2eed7dba7c7d2e0c50f451608a87443b1a85d7b6350a8739e

data/CHANGELOG.md

@@ -1,3 +1,46 @@
+*   Fixed ActiveRecord::Relation#becomes! and changed_attributes issues for type column
+
+    Fixes #17139.
+
+    *Miklos Fazekas*
+
+*   A `NullRelation` should represent nothing. This fixes a bug where
+    `Comment.where(post_id: Post.none)` returned a non-empty result.
+
+    Closes #15176.
+
+    *Matthew Draper*, *Yves Senn*
+
+*   Respect custom primary keys for associations when calling `Relation#where`
+
+    Fixes #18813.
+
+    *Sean Griffin*
+
+*   Fixed ActiveRecord::Relation#group method when argument is SQL reserved key word:
+
+      SplitTest.group(:key).count
+      Property.group(:value).count
+
+    *Bogdan Gusiev*
+
+*   Fixed setting of foreign_key for through associations while building of new record.
+
+    Fixes #12698.
+
+    *Ivan Antropov*
+
+*   Fixed automatic inverse_of for models nested in module.
+
+    *Andrew McCloud*
+
+*   Fix `reaping_frequency` option when the value is a string.
+
+    This usually happens when it is configured using `DATABASE_URL`.
+
+    *korbin*
+
+
 ## Rails 4.1.9 (January 6, 2015) ##
 
 *   `db:schema:load` and `db:structure:load` no longer purge the database

data/lib/active_record/associations/collection_association.rb

@@ -129,6 +129,16 @@ module ActiveRecord
         first_nth_or_last(:last, *args)
       end
 
+      def take
+        if loaded?
+          target.first
+        else
+          scope.take.tap do |record|
+            set_inverse_instance record if record.is_a? ActiveRecord::Base
+          end
+        end
+      end
+
       def build(attributes = {}, &block)
         if attributes.is_a?(Array)
           attributes.collect { |attr| build(attr, &block) }

data/lib/active_record/associations/collection_proxy.rb

@@ -226,6 +226,10 @@ module ActiveRecord
         @association.last(*args)
       end
 
+      def take
+        @association.take
+      end
+
       # Returns a new object of the collection type that has been instantiated
       # with +attributes+ and linked to this object, but have not yet been saved.
       # You can pass an array of attributes hashes, this will return an array

data/lib/active_record/associations/through_association.rb

@@ -92,6 +92,17 @@ module ActiveRecord
             raise HasManyThroughNestedAssociationsAreReadonly.new(owner, reflection)
           end
         end
+
+        def build_record(attributes)
+          inverse = source_reflection.inverse_of
+          target = through_association.target
+
+          if inverse && target && !target.is_a?(Array)
+            attributes[inverse.foreign_key] = target.id
+          end
+
+          super(attributes)
+        end
     end
   end
 end

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

@@ -238,7 +238,7 @@ module ActiveRecord
 
         @checkout_timeout = (spec.config[:checkout_timeout] && spec.config[:checkout_timeout].to_f) || 5
         @dead_connection_timeout = (spec.config[:dead_connection_timeout] && spec.config[:dead_connection_timeout].to_f) || 5
-        @reaper  = Reaper.new self, spec.config[:reaping_frequency]
+        @reaper = Reaper.new(self, (spec.config[:reaping_frequency] && spec.config[:reaping_frequency].to_f))
         @reaper.run
 
         # default max pool size to 5

data/lib/active_record/connection_adapters/abstract_adapter.rb

@@ -356,7 +356,12 @@ module ActiveRecord
       protected
 
       def translate_exception_class(e, sql)
-        message = "#{e.class.name}: #{e.message}: #{sql}"
+        begin
+          message = "#{e.class.name}: #{e.message}: #{sql}"
+        rescue Encoding::CompatibilityError
+          message = "#{e.class.name}: #{e.message.force_encoding sql.encoding}: #{sql}"
+        end
+
         @logger.error message if @logger
         exception = translate_exception(e, message)
         exception.set_backtrace e.backtrace

data/lib/active_record/gem_version.rb

@@ -7,8 +7,8 @@ module ActiveRecord
   module VERSION
     MAJOR = 4
     MINOR = 1
-    TINY  = 9
-    PRE   = nil
+    TINY  = 10
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_record/persistence.rb

@@ -181,7 +181,8 @@ module ActiveRecord
       became = klass.new
       became.instance_variable_set("@attributes", @attributes)
       became.instance_variable_set("@attributes_cache", @attributes_cache)
-      became.instance_variable_set("@changed_attributes", @changed_attributes) if defined?(@changed_attributes)
+      changed_attributes = @changed_attributes if defined?(@changed_attributes)
+      became.instance_variable_set("@changed_attributes", changed_attributes || {})
       became.instance_variable_set("@new_record", new_record?)
       became.instance_variable_set("@destroyed", destroyed?)
       became.instance_variable_set("@errors", errors)

data/lib/active_record/reflection.rb

@@ -432,7 +432,7 @@ module ActiveRecord
         # returns either nil or the inverse association name that it finds.
         def automatic_inverse_of
           if can_find_inverse_of_automatically?(self)
-            inverse_name = ActiveSupport::Inflector.underscore(options[:as] || active_record.name).to_sym
+            inverse_name = ActiveSupport::Inflector.underscore(options[:as] || active_record.name.demodulize).to_sym
 
             begin
               reflection = klass._reflect_on_association(inverse_name)

data/lib/active_record/relation/batches.rb

@@ -115,6 +115,7 @@ module ActiveRecord
       end
 
       relation = relation.reorder(batch_order).limit(batch_size)
+      relation.reverse_order_value = false
       records = start ? relation.where(table[primary_key].gteq(start)).to_a : relation.to_a
 
       while records.any?

data/lib/active_record/relation/predicate_builder.rb

@@ -61,6 +61,8 @@ module ActiveRecord
         end
 
         column = reflection.foreign_key
+        primary_key = reflection.association_primary_key(base_class)
+        value = convert_value_to_association_ids(value, primary_key)
       end
 
       queries << build(table[column], value)
@@ -114,12 +116,28 @@ module ActiveRecord
     register_handler(Array, ArrayHandler.new)
 
     private
-      def self.build(attribute, value)
-        handler_for(value).call(attribute, value)
-      end
 
-      def self.handler_for(object)
-        @handlers.detect { |klass, _| klass === object }.last
+    def self.build(attribute, value)
+      handler_for(value).call(attribute, value)
+    end
+    private_class_method :build
+
+    def self.handler_for(object)
+      @handlers.detect { |klass, _| klass === object }.last
+    end
+    private_class_method :handler_for
+
+    def self.convert_value_to_association_ids(value, primary_key)
+      case value
+      when Relation
+        value.select(primary_key)
+      when Array
+        value.map { |v| convert_value_to_association_ids(v, primary_key) }
+      when Base
+        value.read_attribute(primary_key)
+      else
+        value
       end
+    end
   end
 end

data/lib/active_record/relation/predicate_builder/relation_handler.rb

@@ -6,6 +6,10 @@ module ActiveRecord
           value = value.select(value.klass.arel_table[value.klass.primary_key])
         end
 
+        value = value.dup
+        value.where_values = value.where_values.map do |node|
+          node.dup rescue node
+        end
         attribute.in(value.arel.ast)
       end
     end

data/lib/active_record/relation/query_methods.rb

@@ -677,11 +677,11 @@ module ActiveRecord
     #   end
     #
     def none
-      extending(NullRelation)
+      where("1=0").extending!(NullRelation)
     end
 
     def none! # :nodoc:
-      extending!(NullRelation)
+      where!("1=0").extending!(NullRelation)
     end
 
     # Sets readonly attributes for the returned relation. If value is
@@ -855,12 +855,11 @@ module ActiveRecord
 
       arel.take(connection.sanitize_limit(limit_value)) if limit_value
       arel.skip(offset_value.to_i) if offset_value
-
-      arel.group(*group_values.uniq.reject(&:blank?)) unless group_values.empty?
+      arel.group(*arel_columns(group_values.uniq.reject(&:blank?))) unless group_values.empty?
 
       build_order(arel)
 
-      build_select(arel, select_values.uniq)
+      build_select(arel)
 
       arel.distinct(distinct_value)
       arel.from(build_from) if from_value
@@ -1008,17 +1007,24 @@ module ActiveRecord
       manager
     end
 
-    def build_select(arel, selects)
-      if !selects.empty?
-        expanded_select = selects.map do |field|
-          columns_hash.key?(field.to_s) ? arel_table[field] : field
-        end
-        arel.project(*expanded_select)
+    def build_select(arel)
+      if select_values.any?
+        arel.project(*arel_columns(select_values.uniq))
       else
         arel.project(@klass.arel_table[Arel.star])
       end
     end
 
+    def arel_columns(columns)
+      columns.map do |field|
+        if columns_hash.key?(field.to_s)
+          arel_table[field]
+        else
+          field
+        end
+      end
+    end
+
     def reverse_sql_order(order_query)
       order_query = ["#{quoted_table_name}.#{quoted_primary_key} ASC"] if order_query.empty?
 

data/lib/active_record/validations/uniqueness.rb

@@ -81,7 +81,13 @@ module ActiveRecord
           else
             scope_value = record.read_attribute(scope_item)
           end
-          relation = relation.and(table[scope_item].eq(scope_value))
+
+          # This is basically emulating an Arel::Nodes::Casted
+          column = record.class.columns_hash[scope_item.to_s]
+          quoted_value = record.class.connection.quote(scope_value, column)
+          node = Arel::Nodes::SqlLiteral.new(quoted_value)
+
+          relation = relation.and(table[scope_item].eq(node))
         end
 
         relation

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 4.1.9
+  version: 4.1.10.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.1.10.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.1.10.rc1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.1.10.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.1.10.rc1
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
@@ -243,9 +243,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5