activerecord 4.2.0.rc2 → 4.2.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28b61291529e1647dc68f482c67cb982f1412b58
-  data.tar.gz: 5d284927108612f0bba531978c77f77ecb2ab173
+  metadata.gz: 4eebcaeb54fa1c3d319396f193586f7e8f27a937
+  data.tar.gz: a6385ce2b23243350456c81b6ab7c399efa239cf
 SHA512:
-  metadata.gz: 53fae71b52ab612485bba69f354387d78b0a79cd5358488c3322f6e6efe38812b3467f903ba2b71c87774d7922a40935b8cd7a457423ec827cf288669a752fa7
-  data.tar.gz: bb77f7468870ad4497ddc1f42cf0a85ef38036a60297a80af4c506899fb28aa124cb87cc679b70d1bfd73d23e87791f1c03729a7bbc0b2e011707d4ba22db6cb
+  metadata.gz: 90b3fbfb30d4c7854112da41d68e4f09dddff20eeb85b0c464d34916d5b0532645c7ad359a02527c88f7f29b1eec04f4241af642f58db836f56a3943099226a2
+  data.tar.gz: 3fca47c68e6dba5ce6fc8addcf8eff8a678f16be26f51ea9ae8dbfdc7009ab54b0a82e69480c506b9d2e422f7ae3bca41d6620842b20f0f7d2a120526be93f2c

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+*   Fix undesirable RangeError by Type::Integer. Add Type::UnsignedInteger.
+
+    *Ryuta Kamizono*
+
+*   Add `foreign_type` option to `has_one` and `has_many` association macros.
+
+    This option enables to define the column name of associated object's type for polymorphic associations.
+
+    *Ulisses Almeida, Kassio Borges*
+
 *   `add_timestamps` and `remove_timestamps` now properly reversible with
     options.
 

data/lib/active_record/associations.rb

@@ -1176,6 +1176,12 @@ module ActiveRecord
       #   Specify the foreign key used for the association. By default this is guessed to be the name
       #   of this class in lower-case and "_id" suffixed. So a Person class that makes a +has_many+
       #   association will use "person_id" as the default <tt>:foreign_key</tt>.
+      # [:foreign_type]
+      #   Specify the column used to store the associated object's type, if this is a polymorphic
+      #   association. By default this is guessed to be the name of the polymorphic association
+      #   specified on "as" option with a "_type" suffix. So a class that defines a
+      #   <tt>has_many :tags, as: :taggable</tt> association will use "taggable_type" as the
+      #   default <tt>:foreign_type</tt>.
       # [:primary_key]
       #   Specify the name of the column to use as the primary key for the association. By default this is +id+.
       # [:dependent]
@@ -1323,6 +1329,12 @@ module ActiveRecord
       #   Specify the foreign key used for the association. By default this is guessed to be the name
       #   of this class in lower-case and "_id" suffixed. So a Person class that makes a +has_one+ association
       #   will use "person_id" as the default <tt>:foreign_key</tt>.
+      # [:foreign_type]
+      #   Specify the column used to store the associated object's type, if this is a polymorphic
+      #   association. By default this is guessed to be the name of the polymorphic association
+      #   specified on "as" option with a "_type" suffix. So a class that defines a
+      #   <tt>has_one :tag, as: :taggable</tt> association will use "taggable_type" as the
+      #   default <tt>:foreign_type</tt>.
       # [:primary_key]
       #   Specify the method that returns the primary key used for the association. By default this is +id+.
       # [:as]

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

@@ -5,7 +5,7 @@ module ActiveRecord::Associations::Builder
     end
 
     def valid_options
-      super + [:primary_key, :dependent, :as, :through, :source, :source_type, :inverse_of, :counter_cache, :join_table]
+      super + [:primary_key, :dependent, :as, :through, :source, :source_type, :inverse_of, :counter_cache, :join_table, :foreign_type]
     end
 
     def self.valid_dependent_options

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

@@ -5,7 +5,7 @@ module ActiveRecord::Associations::Builder
     end
 
     def valid_options
-      valid = super + [:as]
+      valid = super + [:as, :foreign_type]
       valid += [:through, :source, :source_type] if options[:through]
       valid
     end

data/lib/active_record/attribute_methods/time_zone_conversion.rb

@@ -12,7 +12,7 @@ module ActiveRecord
           if value.is_a?(Array)
             value.map { |v| type_cast_from_user(v) }
           elsif value.respond_to?(:in_time_zone)
-            value.in_time_zone
+            value.in_time_zone || super
           end
         end
 

data/lib/active_record/attribute_set/builder.rb

@@ -76,7 +76,9 @@ module ActiveRecord
       unless @materialized
         values.each_key { |key| self[key] }
         types.each_key { |key| self[key] }
-        @materialized = true
+        unless frozen?
+          @materialized = true
+        end
       end
       delegate_hash
     end

data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb

@@ -656,14 +656,15 @@ module ActiveRecord
         m.register_type %r(mediumblob)i, Type::Binary.new(limit: 2**24 - 1)
         m.register_type %r(longtext)i,   Type::Text.new(limit: 2**32 - 1)
         m.register_type %r(longblob)i,   Type::Binary.new(limit: 2**32 - 1)
-        m.register_type %r(^bigint)i,    Type::Integer.new(limit: 8)
-        m.register_type %r(^int)i,       Type::Integer.new(limit: 4)
-        m.register_type %r(^mediumint)i, Type::Integer.new(limit: 3)
-        m.register_type %r(^smallint)i,  Type::Integer.new(limit: 2)
-        m.register_type %r(^tinyint)i,   Type::Integer.new(limit: 1)
         m.register_type %r(^float)i,     Type::Float.new(limit: 24)
         m.register_type %r(^double)i,    Type::Float.new(limit: 53)
 
+        register_integer_type m, %r(^bigint)i,    limit: 8
+        register_integer_type m, %r(^int)i,       limit: 4
+        register_integer_type m, %r(^mediumint)i, limit: 3
+        register_integer_type m, %r(^smallint)i,  limit: 2
+        register_integer_type m, %r(^tinyint)i,   limit: 1
+
         m.alias_type %r(tinyint\(1\))i,  'boolean' if emulate_booleans
         m.alias_type %r(set)i,           'varchar'
         m.alias_type %r(year)i,          'integer'
@@ -676,6 +677,16 @@ module ActiveRecord
         end
       end
 
+      def register_integer_type(mapping, key, options) # :nodoc:
+        mapping.register_type(key) do |sql_type|
+          if /unsigned/i =~ sql_type
+            Type::UnsignedInteger.new(options)
+          else
+            Type::Integer.new(options)
+          end
+        end
+      end
+
       # MySQL is too stupid to create a temporary table for use subquery, so we have
       # to give it some prompting in the form of a subsubquery. Ugh!
       def subquery_for(key, select)

data/lib/active_record/connection_adapters/postgresql/oid/array.rb

@@ -34,6 +34,9 @@ module ActiveRecord
           end
 
           def type_cast_from_user(value)
+            if value.is_a?(::String)
+              value = parse_pg_array(value)
+            end
             type_cast_array(value, :type_cast_from_user)
           end
 

data/lib/active_record/gem_version.rb

@@ -8,7 +8,7 @@ module ActiveRecord
     MAJOR = 4
     MINOR = 2
     TINY  = 0
-    PRE   = "rc2"
+    PRE   = "rc3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_record/reflection.rb

@@ -277,7 +277,7 @@ module ActiveRecord
       def initialize(name, scope, options, active_record)
         super
         @automatic_inverse_of = nil
-        @type         = options[:as] && "#{options[:as]}_type"
+        @type         = options[:as] && (options[:foreign_type] || "#{options[:as]}_type")
         @foreign_type = options[:foreign_type] || "#{name}_type"
         @constructable = calculate_constructable(macro, options)
         @association_scope_cache = {}

data/lib/active_record/relation/calculations.rb

@@ -177,7 +177,7 @@ module ActiveRecord
         relation.select_values = column_names.map { |cn|
           columns_hash.key?(cn) ? arel_table[cn] : cn
         }
-        result = klass.connection.select_all(relation.arel, nil, bind_values)
+        result = klass.connection.select_all(relation.arel, nil, relation.arel.bind_values + bind_values)
         result.cast_values(klass.column_types)
       end
     end
@@ -317,7 +317,7 @@ module ActiveRecord
       relation.group_values  = group
       relation.select_values = select_values
 
-      calculated_data = @klass.connection.select_all(relation, nil, bind_values)
+      calculated_data = @klass.connection.select_all(relation, nil, relation.arel.bind_values + bind_values)
 
       if association
         key_ids     = calculated_data.collect { |row| row[group_aliases.first] }

data/lib/active_record/transactions.rb

@@ -265,7 +265,7 @@ module ActiveRecord
 
       def assert_valid_transaction_action(actions)
         if (actions - ACTIONS).any?
-          raise ArgumentError, ":on conditions for after_commit and after_rollback callbacks have to be one of #{ACTIONS.join(",")}"
+          raise ArgumentError, ":on conditions for after_commit and after_rollback callbacks have to be one of #{ACTIONS}"
         end
       end
     end

data/lib/active_record/type.rb

@@ -17,6 +17,7 @@ require 'active_record/type/serialized'
 require 'active_record/type/string'
 require 'active_record/type/text'
 require 'active_record/type/time'
+require 'active_record/type/unsigned_integer'
 
 require 'active_record/type/type_map'
 require 'active_record/type/hash_lookup_type_map'

data/lib/active_record/type/integer.rb

@@ -5,7 +5,7 @@ module ActiveRecord
 
       def initialize(*)
         super
-        @range = -max_value...max_value
+        @range = min_value...max_value
       end
 
       def type
@@ -46,6 +46,10 @@ module ActiveRecord
         limit = self.limit || 4
         1 << (limit * 8 - 1) # 8 bits per byte with one bit for sign
       end
+
+      def min_value
+        -max_value
+      end
     end
   end
 end

data/lib/active_record/type/unsigned_integer.rb

@@ -0,0 +1,15 @@
+module ActiveRecord
+  module Type
+    class UnsignedInteger < Integer # :nodoc:
+      private
+
+      def max_value
+        super * 2
+      end
+
+      def min_value
+        0
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 4.2.0.rc2
+  version: 4.2.0.rc3
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc2
+        version: 4.2.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc2
+        version: 4.2.0.rc3
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc2
+        version: 4.2.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc2
+        version: 4.2.0.rc3
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
 description: Databases on Rails. Build a persistent domain model by mapping database
@@ -265,6 +265,7 @@ files:
 - lib/active_record/type/time.rb
 - lib/active_record/type/time_value.rb
 - lib/active_record/type/type_map.rb
+- lib/active_record/type/unsigned_integer.rb
 - lib/active_record/type/value.rb
 - lib/active_record/validations.rb
 - lib/active_record/validations/associated.rb
@@ -285,23 +286,23 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Object-relational mapper framework (part of Rails).