activerecord 5.0.0.beta2 → 5.0.0.beta3

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

@@ -3,7 +3,7 @@ module ActiveRecord
     class RelationHandler # :nodoc:
       def call(attribute, value)
         if value.select_values.empty?
-          value = value.select(value.klass.arel_table[value.klass.primary_key])
+          value = value.select(value.arel_attribute(value.klass.primary_key))
         end
 
         attribute.in(value.arel)

data/lib/active_record/relation/query_methods.rb

@@ -655,6 +655,10 @@ module ActiveRecord
     #    # SELECT `posts`.* FROM `posts`  WHERE (('id = 1' OR 'author_id = 3'))
     #
     def or(other)
+      unless other.is_a? Relation
+        raise ArgumentError, "You have passed #{other.class.name} object to #or. Pass an ActiveRecord::Relation object instead."
+      end
+
       spawn.or!(other)
     end
 
@@ -1093,8 +1097,8 @@ module ActiveRecord
 
     def arel_columns(columns)
       columns.map do |field|
-        if (Symbol === field || String === field) && columns_hash.key?(field.to_s) && !from_clause.value
-          arel_table[field]
+        if (Symbol === field || String === field) && (klass.has_attribute?(field) || klass.attribute_alias?(field)) && !from_clause.value
+          arel_attribute(field)
         elsif Symbol === field
           connection.quote_table_name(field.to_s)
         else
@@ -1105,13 +1109,15 @@ module ActiveRecord
 
     def reverse_sql_order(order_query)
       if order_query.empty?
-        return [table[primary_key].desc] if primary_key
+        return [arel_attribute(primary_key).desc] if primary_key
         raise IrreversibleOrderError,
           "Relation has no current order and table has no primary key to be used as default order"
       end
 
       order_query.flat_map do |o|
         case o
+        when Arel::Attribute
+          o.desc
         when Arel::Nodes::Ordering
           o.reverse
         when String
@@ -1170,12 +1176,10 @@ module ActiveRecord
       order_args.map! do |arg|
         case arg
         when Symbol
-          arg = klass.attribute_alias(arg) if klass.attribute_alias?(arg)
-          table[arg].asc
+          arel_attribute(arg).asc
         when Hash
           arg.map { |field, dir|
-            field = klass.attribute_alias(field) if klass.attribute_alias?(field)
-            table[field].send(dir.downcase)
+            arel_attribute(field).send(dir.downcase)
           }
         else
           arg

data/lib/active_record/relation/spawn_methods.rb

@@ -29,7 +29,7 @@ module ActiveRecord
     # This is mainly intended for sharing common conditions between multiple associations.
     def merge(other)
       if other.is_a?(Array)
-        to_a & other
+        records & other
       elsif other
         spawn.merge!(other)
       else

data/lib/active_record/sanitization.rb

@@ -60,7 +60,7 @@ module ActiveRecord
       end
 
       # Accepts an array, or string of SQL conditions and sanitizes
-      # them into a valid SQL fragment for a ORDER clause.
+      # them into a valid SQL fragment for an ORDER clause.
       #
       #   sanitize_sql_for_order(["field(id, ?)", [1,3,2]])
       #   # => "field(id, 1,3,2)"

data/lib/active_record/schema_dumper.rb

@@ -178,11 +178,11 @@ HEADER
             tbl.puts
           end
 
-          indexes(table, tbl)
-
           tbl.puts "  end"
           tbl.puts
 
+          indexes(table, tbl)
+
           tbl.rewind
           stream.print tbl.read
         rescue => e
@@ -198,7 +198,8 @@ HEADER
         if (indexes = @connection.indexes(table)).any?
           add_index_statements = indexes.map do |index|
             statement_parts = [
-              "t.index #{index.columns.inspect}",
+              "add_index #{remove_prefix_and_suffix(index.table).inspect}",
+              index.columns.inspect,
               "name: #{index.name.inspect}",
             ]
             statement_parts << 'unique: true' if index.unique
@@ -212,10 +213,11 @@ HEADER
             statement_parts << "using: #{index.using.inspect}" if index.using
             statement_parts << "type: #{index.type.inspect}" if index.type
 
-            "    #{statement_parts.join(', ')}"
+            "  #{statement_parts.join(', ')}"
           end
 
           stream.puts add_index_statements.sort.join("\n")
+          stream.puts
         end
       end
 

data/lib/active_record/scoping/named.rb

@@ -151,6 +151,7 @@ module ActiveRecord
               "a class method with the same name."
           end
 
+          valid_scope_name?(name)
           extension = Module.new(&block) if block
 
           if body.respond_to?(:to_proc)
@@ -169,6 +170,15 @@ module ActiveRecord
             end
           end
         end
+
+      protected
+
+        def valid_scope_name?(name)
+          if respond_to?(name, true)
+            logger.warn "Creating scope :#{name}. " \
+                        "Overwriting existing method #{self.name}.#{name}."
+          end
+        end
       end
     end
   end

data/lib/active_record/statement_cache.rb

@@ -106,7 +106,7 @@ module ActiveRecord
 
       sql = query_builder.sql_for bind_values, connection
 
-      klass.find_by_sql sql, bind_values
+      klass.find_by_sql(sql, bind_values, preparable: true)
     end
     alias :call :execute
   end

data/lib/active_record/table_metadata.rb

@@ -22,7 +22,11 @@ module ActiveRecord
     end
 
     def arel_attribute(column_name)
-      arel_table[column_name]
+      if klass
+        klass.arel_attribute(column_name, arel_table)
+      else
+        arel_table[column_name]
+      end
     end
 
     def type(column_name)

data/lib/active_record/tasks/database_tasks.rb

@@ -116,7 +116,11 @@ module ActiveRecord
       end
 
       def create_all
+        old_pool = ActiveRecord::Base.connection_handler.retrieve_connection_pool(ActiveRecord::Base)
         each_local_configuration { |configuration| create configuration }
+        if old_pool
+          ActiveRecord::Base.connection_handler.establish_connection(ActiveRecord::Base, old_pool.spec)
+        end
       end
 
       def create_current(environment = env)

data/lib/active_record/validations.rb

@@ -45,7 +45,7 @@ module ActiveRecord
     end
 
     # Attempts to save the record just like {ActiveRecord::Base#save}[rdoc-ref:Base#save] but
-    # will raise a ActiveRecord::RecordInvalid exception instead of returning +false+ if the record is not valid.
+    # will raise an ActiveRecord::RecordInvalid exception instead of returning +false+ if the record is not valid.
     def save!(options={})
       perform_validations(options) ? super : raise_validation_error
     end

data/lib/active_record/validations/absence.rb

@@ -2,7 +2,6 @@ module ActiveRecord
   module Validations
     class AbsenceValidator < ActiveModel::Validations::AbsenceValidator # :nodoc:
       def validate_each(record, attribute, association_or_value)
-        return unless should_validate?(record)
         if record.class._reflect_on_association(attribute)
           association_or_value = Array.wrap(association_or_value).reject(&:marked_for_destruction?)
         end

data/lib/active_record/validations/length.rb

@@ -2,23 +2,11 @@ module ActiveRecord
   module Validations
     class LengthValidator < ActiveModel::Validations::LengthValidator # :nodoc:
       def validate_each(record, attribute, association_or_value)
-        return unless should_validate?(record) || associations_are_dirty?(record)
         if association_or_value.respond_to?(:loaded?) && association_or_value.loaded?
           association_or_value = association_or_value.target.reject(&:marked_for_destruction?)
         end
         super
       end
-
-      def associations_are_dirty?(record)
-        attributes.any? do |attribute|
-          value = record.read_attribute_for_validation(attribute)
-          if value.respond_to?(:loaded?) && value.loaded?
-            value.target.any?(&:marked_for_destruction?)
-          else
-            false
-          end
-        end
-      end
     end
 
     module ClassMethods

data/lib/active_record/validations/presence.rb

@@ -2,7 +2,6 @@ module ActiveRecord
   module Validations
     class PresenceValidator < ActiveModel::Validations::PresenceValidator # :nodoc:
       def validate_each(record, attribute, association_or_value)
-        return unless should_validate?(record)
         if record.class._reflect_on_association(attribute)
           association_or_value = Array.wrap(association_or_value).reject(&:marked_for_destruction?)
         end

data/lib/active_record/validations/uniqueness.rb

@@ -11,15 +11,14 @@ module ActiveRecord
       end
 
       def validate_each(record, attribute, value)
-        return unless should_validate?(record)
         finder_class = find_finder_class_for(record)
         table = finder_class.arel_table
         value = map_enum_attribute(finder_class, attribute, value)
 
         relation = build_relation(finder_class, table, attribute, value)
-        if record.persisted? && finder_class.primary_key.to_s != attribute.to_s
+        if record.persisted?
           if finder_class.primary_key
-            relation = relation.where.not(finder_class.primary_key => record.id)
+            relation = relation.where.not(finder_class.primary_key => record.id_was)
           else
             raise UnknownPrimaryKey.new(finder_class, "Can not validate uniqueness for persisted record without primary key.")
           end
@@ -57,14 +56,13 @@ module ActiveRecord
           value = value.attributes[reflection.klass.primary_key] unless value.nil?
         end
 
-        attribute_name = attribute.to_s
-
         # the attribute may be an aliased attribute
-        if klass.attribute_aliases[attribute_name]
-          attribute = klass.attribute_aliases[attribute_name]
-          attribute_name = attribute.to_s
+        if klass.attribute_alias?(attribute)
+          attribute = klass.attribute_alias(attribute)
         end
 
+        attribute_name = attribute.to_s
+
         column = klass.columns_hash[attribute_name]
         cast_type = klass.type_for_attribute(attribute_name)
         value = cast_type.serialize(value)
@@ -82,7 +80,7 @@ module ActiveRecord
         if value.nil?
           klass.unscoped.where(comparison)
         else
-          bind = Relation::QueryAttribute.new(attribute.to_s, value, Type::Value.new)
+          bind = Relation::QueryAttribute.new(attribute_name, value, Type::Value.new)
           klass.unscoped.where(comparison, bind)
         end
       rescue RangeError

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

@@ -22,11 +22,13 @@ module ActiveRecord
 
       def create_model_file
         template 'model.rb', File.join('app/models', class_path, "#{file_name}.rb")
+        generate_application_record
       end
 
       def create_module_file
         return if regular_class_path.empty?
         template 'module.rb', File.join('app/models', "#{class_path.join('/')}.rb") if behavior == :invoke
+        generate_application_record
       end
 
       hook_for :test_framework
@@ -37,6 +39,13 @@ module ActiveRecord
           attributes.select { |a| !a.reference? && a.has_index? }
         end
 
+        # FIXME: Change this file to a symlink once RubyGems 2.5.0 is required.
+        def generate_application_record
+          if self.behavior == :invoke && !File.exist?('app/models/application_record.rb')
+            template 'application_record.rb', 'app/models/application_record.rb'
+          end
+        end
+
         # Used by the migration template to determine the parent name of the model
         def parent_class_name
           options[:parent] || determine_default_parent_class

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

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta2
+  version: 5.0.0.beta3
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta2
+        version: 5.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta2
+        version: 5.0.0.beta3
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta2
+        version: 5.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta2
+        version: 5.0.0.beta3
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
@@ -242,6 +242,7 @@ files:
 - lib/active_record/relation/predicate_builder/base_handler.rb
 - lib/active_record/relation/predicate_builder/basic_object_handler.rb
 - lib/active_record/relation/predicate_builder/class_handler.rb
+- lib/active_record/relation/predicate_builder/polymorphic_array_handler.rb
 - lib/active_record/relation/predicate_builder/range_handler.rb
 - lib/active_record/relation/predicate_builder/relation_handler.rb
 - lib/active_record/relation/query_attribute.rb
@@ -299,6 +300,7 @@ files:
 - lib/rails/generators/active_record/migration/templates/create_table_migration.rb
 - lib/rails/generators/active_record/migration/templates/migration.rb
 - lib/rails/generators/active_record/model/model_generator.rb
+- lib/rails/generators/active_record/model/templates/application_record.rb
 - lib/rails/generators/active_record/model/templates/model.rb
 - lib/rails/generators/active_record/model/templates/module.rb
 homepage: http://www.rubyonrails.org
@@ -323,9 +325,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Object-relational mapper framework (part of Rails).
 test_files: []
-has_rdoc: