activerecord 4.1.15 → 4.2.11.3

data/lib/active_record/validations/associated.rb

@@ -29,9 +29,11 @@ module ActiveRecord
       # Configuration options:
       #
       # * <tt>:message</tt> - A custom error message (default is: "is invalid").
-      # * <tt>:on</tt> - Specifies when this validation is active. Runs in all
-      #   validation contexts by default (+nil+), other options are <tt>:create</tt>
-      #   and <tt>:update</tt>.
+      # * <tt>:on</tt> - Specifies the contexts where this validation is active.
+      #   Runs in all validation contexts by default (nil). You can pass a symbol
+      #   or an array of symbols. (e.g. <tt>on: :create</tt> or
+      #   <tt>on: :custom_validation_context</tt> or
+      #   <tt>on: [:create, :custom_validation_context]</tt>)
       # * <tt>:if</tt> - Specifies a method, proc or string to call to determine
       #   if the validation should occur (e.g. <tt>if: :allow_validation</tt>,
       #   or <tt>if: Proc.new { |user| user.signup_step > 2 }</tt>). The method,

data/lib/active_record/validations/presence.rb

@@ -44,9 +44,11 @@ module ActiveRecord
       #
       # Configuration options:
       # * <tt>:message</tt> - A custom error message (default is: "can't be blank").
-      # * <tt>:on</tt> - Specifies when this validation is active. Runs in all
-      #   validation contexts by default (+nil+), other options are <tt>:create</tt>
-      #   and <tt>:update</tt>.
+      # * <tt>:on</tt> - Specifies the contexts where this validation is active.
+      #   Runs in all validation contexts by default (nil). You can pass a symbol
+      #   or an array of symbols. (e.g. <tt>on: :create</tt> or
+      #   <tt>on: :custom_validation_context</tt> or
+      #   <tt>on: [:create, :custom_validation_context]</tt>)
       # * <tt>:if</tt> - Specifies a method, proc or string to call to determine if
       #   the validation should occur (e.g. <tt>if: :allow_validation</tt>, or
       #   <tt>if: Proc.new { |user| user.signup_step > 2 }</tt>). The method, proc

data/lib/active_record/validations/uniqueness.rb

@@ -13,14 +13,23 @@ module ActiveRecord
       def validate_each(record, attribute, value)
         finder_class = find_finder_class_for(record)
         table = finder_class.arel_table
-        value = map_enum_attribute(finder_class,attribute,value)
-        value = deserialize_attribute(record, attribute, value)
-
-        relation = build_relation(finder_class, table, attribute, value)
-        relation = relation.and(table[finder_class.primary_key.to_sym].not_eq(record.id)) if record.persisted?
-        relation = scope_relation(record, table, relation)
-        relation = finder_class.unscoped.where(relation)
-        relation = relation.merge(options[:conditions]) if options[:conditions]
+        value = map_enum_attribute(finder_class, attribute, value)
+
+        begin
+          relation = build_relation(finder_class, table, attribute, value)
+          if record.persisted?
+            if finder_class.primary_key
+              relation = relation.and(table[finder_class.primary_key.to_sym].not_eq(record.id))
+            else
+              raise UnknownPrimaryKey.new(finder_class, "Can not validate uniqueness for persisted record without primary key.")
+            end
+          end
+          relation = scope_relation(record, table, relation)
+          relation = finder_class.unscoped.where(relation)
+          relation = relation.merge(options[:conditions]) if options[:conditions]
+        rescue RangeError
+          relation = finder_class.none
+        end
 
         if relation.exists?
           error_options = options.except(:case_sensitive, :scope, :conditions)
@@ -49,7 +58,7 @@ module ActiveRecord
       def build_relation(klass, table, attribute, value) #:nodoc:
         if reflection = klass._reflect_on_association(attribute)
           attribute = reflection.foreign_key
-          value = value.attributes[reflection.primary_key_column.name] unless value.nil?
+          value = value.attributes[reflection.klass.primary_key] unless value.nil?
         end
 
         attribute_name = attribute.to_s
@@ -62,14 +71,15 @@ module ActiveRecord
 
         column = klass.columns_hash[attribute_name]
         value  = klass.connection.type_cast(value, column)
-        value  = value.to_s[0, column.limit] if value && column.limit && column.text?
+        if value.is_a?(String) && column.limit
+          value = value.to_s[0, column.limit]
+        end
 
         if !options[:case_sensitive] && value && column.text?
           # will use SQL LOWER function before comparison, unless it detects a case insensitive collation
           klass.connection.case_insensitive_comparison(table, attribute, column, value)
         else
-          value = klass.connection.case_sensitive_modifier(value) unless value.nil?
-          table[attribute].eq(value)
+          klass.connection.case_sensitive_comparison(table, attribute, column, value)
         end
       end
 
@@ -79,28 +89,14 @@ module ActiveRecord
             scope_value = record.send(reflection.foreign_key)
             scope_item  = reflection.foreign_key
           else
-            scope_value = record.read_attribute(scope_item)
-          end
-
-          # 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)
-          unless scope_value.nil?
-            node = Arel::Nodes::SqlLiteral.new(quoted_value)
+            scope_value = record._read_attribute(scope_item)
           end
-
-          relation = relation.and(table[scope_item].eq(node))
+          relation = relation.and(table[scope_item].eq(scope_value))
         end
 
         relation
       end
 
-      def deserialize_attribute(record, attribute, value)
-        coder = record.class.serialized_attributes[attribute.to_s]
-        value = coder.dump value if value && coder
-        value
-      end
-
       def map_enum_attribute(klass, attribute, value)
         mapping = klass.defined_enums[attribute.to_s]
         value = mapping[value] if value && mapping
@@ -166,7 +162,7 @@ module ActiveRecord
       #   or <tt>if: Proc.new { |user| user.signup_step > 2 }</tt>). The method,
       #   proc or string should return or evaluate to a +true+ or +false+ value.
       # * <tt>:unless</tt> - Specifies a method, proc or string to call to
-      #   determine if the validation should ot occur (e.g. <tt>unless: :skip_validation</tt>,
+      #   determine if the validation should not occur (e.g. <tt>unless: :skip_validation</tt>,
       #   or <tt>unless: Proc.new { |user| user.signup_step <= 2 }</tt>). The
       #   method, proc or string should return or evaluate to a +true+ or +false+
       #   value.

data/lib/rails/generators/active_record/migration/migration_generator.rb

@@ -23,16 +23,16 @@ module ActiveRecord
         case file_name
         when /^(add|remove)_.*_(?:to|from)_(.*)/
           @migration_action = $1
-          @table_name       = $2.pluralize
+          @table_name       = normalize_table_name($2)
         when /join_table/
           if attributes.length == 2
             @migration_action = 'join'
-            @join_tables      = attributes.map(&:plural_name)
+            @join_tables      = pluralize_table_names? ? attributes.map(&:plural_name) : attributes.map(&:singular_name)
 
             set_index_names
           end
         when /^create_(.+)/
-          @table_name = $1.pluralize
+          @table_name = normalize_table_name($1)
           @migration_template = "create_table_migration.rb"
         end
       end
@@ -55,12 +55,16 @@ module ActiveRecord
         def attributes_with_index
           attributes.select { |a| !a.reference? && a.has_index? }
         end
-        
+
         def validate_file_name!
           unless file_name =~ /^[_a-z0-9]+$/
             raise IllegalMigrationNameError.new(file_name)
           end
         end
+
+        def normalize_table_name(_table_name)
+          pluralize_table_names? ? _table_name.pluralize : _table_name.singularize
+        end
     end
   end
 end

data/lib/rails/generators/active_record/migration/templates/create_table_migration.rb

@@ -9,7 +9,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration
 <% end -%>
 <% end -%>
 <% if options[:timestamps] %>
-      t.timestamps
+      t.timestamps null: false
 <% end -%>
     end
 <% attributes_with_index.each do |attribute| -%>

data/lib/rails/generators/active_record/model/templates/model.rb

@@ -1,7 +1,7 @@
 <% module_namespacing do -%>
 class <%= class_name %> < <%= parent_class_name.classify %>
 <% attributes.select(&:reference?).each do |attribute| -%>
-  belongs_to :<%= attribute.name %><%= ', polymorphic: true' if attribute.polymorphic? %>
+  belongs_to :<%= attribute.name %><%= ', polymorphic: true' if attribute.polymorphic? %><%= ', required: true' if attribute.required? %>
 <% end -%>
 <% if attributes.any?(&:password_digest?) -%>
   has_secure_password

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 4.1.15
+  version: 4.2.11.3
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2020-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.15
+        version: 4.2.11.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.15
+        version: 4.2.11.3
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.15
+        version: 4.2.11.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.15
+        version: 4.2.11.3
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '6.0'
 description: Databases on Rails. Build a persistent domain model by mapping database
   tables to Ruby classes. Strong conventions for associations, validations, aggregations,
   migrations, and testing come baked-in.
@@ -84,6 +84,7 @@ files:
 - lib/active_record/associations/builder/singular_association.rb
 - lib/active_record/associations/collection_association.rb
 - lib/active_record/associations/collection_proxy.rb
+- lib/active_record/associations/foreign_association.rb
 - lib/active_record/associations/has_many_association.rb
 - lib/active_record/associations/has_many_through_association.rb
 - lib/active_record/associations/has_one_association.rb
@@ -104,7 +105,9 @@ files:
 - lib/active_record/associations/preloader/through_association.rb
 - lib/active_record/associations/singular_association.rb
 - lib/active_record/associations/through_association.rb
+- lib/active_record/attribute.rb
 - lib/active_record/attribute_assignment.rb
+- lib/active_record/attribute_decorators.rb
 - lib/active_record/attribute_methods.rb
 - lib/active_record/attribute_methods/before_type_cast.rb
 - lib/active_record/attribute_methods/dirty.rb
@@ -114,6 +117,9 @@ files:
 - lib/active_record/attribute_methods/serialization.rb
 - lib/active_record/attribute_methods/time_zone_conversion.rb
 - lib/active_record/attribute_methods/write.rb
+- lib/active_record/attribute_set.rb
+- lib/active_record/attribute_set/builder.rb
+- lib/active_record/attributes.rb
 - lib/active_record/autosave_association.rb
 - lib/active_record/base.rb
 - lib/active_record/callbacks.rb
@@ -137,12 +143,39 @@ files:
 - lib/active_record/connection_adapters/mysql2_adapter.rb
 - lib/active_record/connection_adapters/mysql_adapter.rb
 - lib/active_record/connection_adapters/postgresql/array_parser.rb
-- lib/active_record/connection_adapters/postgresql/cast.rb
+- lib/active_record/connection_adapters/postgresql/column.rb
 - lib/active_record/connection_adapters/postgresql/database_statements.rb
 - lib/active_record/connection_adapters/postgresql/oid.rb
+- lib/active_record/connection_adapters/postgresql/oid/array.rb
+- lib/active_record/connection_adapters/postgresql/oid/bit.rb
+- lib/active_record/connection_adapters/postgresql/oid/bit_varying.rb
+- lib/active_record/connection_adapters/postgresql/oid/bytea.rb
+- lib/active_record/connection_adapters/postgresql/oid/cidr.rb
+- lib/active_record/connection_adapters/postgresql/oid/date.rb
+- lib/active_record/connection_adapters/postgresql/oid/date_time.rb
+- lib/active_record/connection_adapters/postgresql/oid/decimal.rb
+- lib/active_record/connection_adapters/postgresql/oid/enum.rb
+- lib/active_record/connection_adapters/postgresql/oid/float.rb
+- lib/active_record/connection_adapters/postgresql/oid/hstore.rb
+- lib/active_record/connection_adapters/postgresql/oid/inet.rb
+- lib/active_record/connection_adapters/postgresql/oid/infinity.rb
+- lib/active_record/connection_adapters/postgresql/oid/integer.rb
+- lib/active_record/connection_adapters/postgresql/oid/json.rb
+- lib/active_record/connection_adapters/postgresql/oid/jsonb.rb
+- lib/active_record/connection_adapters/postgresql/oid/money.rb
+- lib/active_record/connection_adapters/postgresql/oid/point.rb
+- lib/active_record/connection_adapters/postgresql/oid/range.rb
+- lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb
+- lib/active_record/connection_adapters/postgresql/oid/time.rb
+- lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb
+- lib/active_record/connection_adapters/postgresql/oid/uuid.rb
+- lib/active_record/connection_adapters/postgresql/oid/vector.rb
+- lib/active_record/connection_adapters/postgresql/oid/xml.rb
 - lib/active_record/connection_adapters/postgresql/quoting.rb
 - lib/active_record/connection_adapters/postgresql/referential_integrity.rb
+- lib/active_record/connection_adapters/postgresql/schema_definitions.rb
 - lib/active_record/connection_adapters/postgresql/schema_statements.rb
+- lib/active_record/connection_adapters/postgresql/utils.rb
 - lib/active_record/connection_adapters/postgresql_adapter.rb
 - lib/active_record/connection_adapters/schema_cache.rb
 - lib/active_record/connection_adapters/sqlite3_adapter.rb
@@ -161,6 +194,7 @@ files:
 - lib/active_record/gem_version.rb
 - lib/active_record/inheritance.rb
 - lib/active_record/integration.rb
+- lib/active_record/legacy_yaml_adapter.rb
 - lib/active_record/locale/en.yml
 - lib/active_record/locking/optimistic.rb
 - lib/active_record/locking/pessimistic.rb
@@ -213,6 +247,28 @@ files:
 - lib/active_record/timestamp.rb
 - lib/active_record/transactions.rb
 - lib/active_record/translation.rb
+- lib/active_record/type.rb
+- lib/active_record/type/big_integer.rb
+- lib/active_record/type/binary.rb
+- lib/active_record/type/boolean.rb
+- lib/active_record/type/date.rb
+- lib/active_record/type/date_time.rb
+- lib/active_record/type/decimal.rb
+- lib/active_record/type/decimal_without_scale.rb
+- lib/active_record/type/decorator.rb
+- lib/active_record/type/float.rb
+- lib/active_record/type/hash_lookup_type_map.rb
+- lib/active_record/type/integer.rb
+- lib/active_record/type/mutable.rb
+- lib/active_record/type/numeric.rb
+- lib/active_record/type/serialized.rb
+- lib/active_record/type/string.rb
+- lib/active_record/type/text.rb
+- 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
 - lib/active_record/validations/presence.rb
@@ -247,8 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Object-relational mapper framework (part of Rails).

data/lib/active_record/connection_adapters/postgresql/cast.rb

@@ -1,168 +0,0 @@
-module ActiveRecord
-  module ConnectionAdapters
-    class PostgreSQLColumn < Column
-      module Cast
-        def point_to_string(point)
-          "(#{point[0]},#{point[1]})"
-        end
-
-        def string_to_point(string)
-          if string[0] == '(' && string[-1] == ')'
-            string = string[1...-1]
-          end
-          string.split(',').map{ |v| Float(v) }
-        end
-
-        def string_to_time(string)
-          return string unless String === string
-
-          case string
-          when 'infinity'; Float::INFINITY
-          when '-infinity'; -Float::INFINITY
-          when / BC$/
-            super("-" + string.sub(/ BC$/, ""))
-          else
-            super
-          end
-        end
-
-        def string_to_bit(value)
-          case value
-          when /^0x/i
-            value[2..-1].hex.to_s(2) # Hexadecimal notation
-          else
-            value                    # Bit-string notation
-          end
-        end
-
-        def hstore_to_string(object, array_member = false)
-          if Hash === object
-            string = object.map { |k, v| "#{escape_hstore(k)}=>#{escape_hstore(v)}" }.join(',')
-            string = escape_hstore(string) if array_member
-            string
-          else
-            object
-          end
-        end
-
-        def string_to_hstore(string)
-          if string.nil?
-            nil
-          elsif String === string
-            Hash[string.scan(HstorePair).map { |k, v|
-              v = v.upcase == 'NULL' ? nil : v.gsub(/\A"(.*)"\Z/m,'\1').gsub(/\\(.)/, '\1')
-              k = k.gsub(/\A"(.*)"\Z/m,'\1').gsub(/\\(.)/, '\1')
-              [k, v]
-            }]
-          else
-            string
-          end
-        end
-
-        def json_to_string(object)
-          if Hash === object || Array === object
-            ActiveSupport::JSON.encode(object)
-          else
-            object
-          end
-        end
-
-        def array_to_string(value, column, adapter)
-          casted_values = value.map do |val|
-            if String === val
-              if val == "NULL"
-                "\"#{val}\""
-              else
-                quote_and_escape(adapter.type_cast(val, column, true))
-              end
-            else
-              adapter.type_cast(val, column, true)
-            end
-          end
-          "{#{casted_values.join(',')}}"
-        end
-
-        def range_to_string(object)
-          from = object.begin.respond_to?(:infinite?) && object.begin.infinite? ? '' : object.begin
-          to   = object.end.respond_to?(:infinite?) && object.end.infinite? ? '' : object.end
-          "[#{from},#{to}#{object.exclude_end? ? ')' : ']'}"
-        end
-
-        def string_to_json(string)
-          if String === string
-            ActiveSupport::JSON.decode(string)
-          else
-            string
-          end
-        end
-
-        def string_to_cidr(string)
-          if string.nil?
-            nil
-          elsif String === string
-            begin
-              IPAddr.new(string)
-            rescue ArgumentError
-              nil
-            end
-          else
-            string
-          end
-        end
-
-        def cidr_to_string(object)
-          if IPAddr === object
-            "#{object.to_s}/#{object.instance_variable_get(:@mask_addr).to_s(2).count('1')}"
-          else
-            object
-          end
-        end
-
-        def string_to_array(string, oid)
-          parse_pg_array(string).map {|val| type_cast_array(oid, val)}
-        end
-
-        private
-
-          HstorePair = begin
-            quoted_string = /"[^"\\]*(?:\\.[^"\\]*)*"/
-            unquoted_string = /(?:\\.|[^\s,])[^\s=,\\]*(?:\\.[^\s=,\\]*|=[^,>])*/
-            /(#{quoted_string}|#{unquoted_string})\s*=>\s*(#{quoted_string}|#{unquoted_string})/
-          end
-
-          def escape_hstore(value)
-            if value.nil?
-              'NULL'
-            else
-              if value == ""
-                '""'
-              else
-                '"%s"' % value.to_s.gsub(/(["\\])/, '\\\\\1')
-              end
-            end
-          end
-
-          ARRAY_ESCAPE = "\\" * 2 * 2 # escape the backslash twice for PG arrays
-
-          def quote_and_escape(value)
-            case value
-            when "NULL", Numeric
-              value
-            else
-              value = value.gsub(/\\/, ARRAY_ESCAPE)
-              value.gsub!(/"/,"\\\"")
-              "\"#{value}\""
-            end
-          end
-
-          def type_cast_array(oid, value)
-            if ::Array === value
-              value.map {|item| type_cast_array(oid, item)}
-            else
-              oid.type_cast value
-            end
-          end
-      end
-    end
-  end
-end