activerecord 5.0.0.beta3 → 5.0.0.beta4

data/lib/active_record/scoping/default.rb

@@ -115,7 +115,8 @@ module ActiveRecord
             base_rel ||= relation
             evaluate_default_scope do
               default_scopes.inject(base_rel) do |default_scope, scope|
-                default_scope.merge(base_rel.scoping { scope.call })
+                scope = scope.respond_to?(:to_proc) ? scope : scope.method(:call)
+                default_scope.merge(base_rel.instance_exec(&scope))
               end
             end
           end

data/lib/active_record/suppressor.rb

@@ -37,7 +37,11 @@ module ActiveRecord
       end
     end
 
-    def create_or_update(*args) # :nodoc:
+    def save(*) # :nodoc:
+      SuppressorRegistry.suppressed[self.class.name] ? true : super
+    end
+
+    def save!(*) # :nodoc:
       SuppressorRegistry.suppressed[self.class.name] ? true : super
     end
   end

data/lib/active_record/tasks/database_tasks.rb

@@ -107,8 +107,9 @@ module ActiveRecord
       def create(*arguments)
         configuration = arguments.first
         class_for_adapter(configuration['adapter']).new(*arguments).create
+        $stdout.puts "Created database '#{configuration['database']}'"
       rescue DatabaseAlreadyExists
-        $stderr.puts "#{configuration['database']} already exists"
+        $stderr.puts "Database '#{configuration['database']}' already exists"
       rescue Exception => error
         $stderr.puts error
         $stderr.puts "Couldn't create database for #{configuration.inspect}"
@@ -133,11 +134,12 @@ module ActiveRecord
       def drop(*arguments)
         configuration = arguments.first
         class_for_adapter(configuration['adapter']).new(*arguments).drop
+        $stdout.puts "Dropped database '#{configuration['database']}'"
       rescue ActiveRecord::NoDatabaseError
         $stderr.puts "Database '#{configuration['database']}' does not exist"
       rescue Exception => error
         $stderr.puts error
-        $stderr.puts "Couldn't drop #{configuration['database']}"
+        $stderr.puts "Couldn't drop database '#{configuration['database']}'"
         raise
       end
 
@@ -159,6 +161,7 @@ module ActiveRecord
         Migrator.migrate(migrations_paths, version) do |migration|
           scope.blank? || scope == migration.scope
         end
+        ActiveRecord::Base.clear_cache!
       ensure
         Migration.verbose = verbose_was
       end
@@ -282,8 +285,7 @@ module ActiveRecord
 
       def each_current_configuration(environment)
         environments = [environment]
-        # add test environment only if no RAILS_ENV was specified.
-        environments << 'test' if environment == 'development' && ENV['RAILS_ENV'].nil?
+        environments << 'test' if environment == 'development'
 
         configurations = ActiveRecord::Base.configurations.values_at(*environments)
         configurations.compact.each do |configuration|

data/lib/active_record/tasks/mysql_database_tasks.rb

@@ -130,7 +130,7 @@ IDENTIFIED BY '#{configuration['password']}' WITH GRANT OPTION;
           'sslca'     => '--ssl-ca',
           'sslcert'   => '--ssl-cert',
           'sslcapath' => '--ssl-capath',
-          'sslcipher' => '--ssh-cipher',
+          'sslcipher' => '--ssl-cipher',
           'sslkey'    => '--ssl-key'
         }.map { |opt, arg| "#{arg}=#{configuration[opt]}" if configuration[opt] }.compact
 

data/lib/active_record/type.rb

@@ -61,7 +61,7 @@ module ActiveRecord
     register(:binary, Type::Binary, override: false)
     register(:boolean, Type::Boolean, override: false)
     register(:date, Type::Date, override: false)
-    register(:date_time, Type::DateTime, override: false)
+    register(:datetime, Type::DateTime, override: false)
     register(:decimal, Type::Decimal, override: false)
     register(:float, Type::Float, override: false)
     register(:integer, Type::Integer, override: false)

data/lib/active_record/type/internal/abstract_json.rb

@@ -17,11 +17,7 @@ module ActiveRecord
         end
 
         def serialize(value)
-          if value.is_a?(::Array) || value.is_a?(::Hash)
-            ::ActiveSupport::JSON.encode(value)
-          else
-            value
-          end
+          ::ActiveSupport::JSON.encode(value)
         end
 
         def accessor

data/lib/active_record/type/time.rb

@@ -2,6 +2,18 @@ module ActiveRecord
   module Type
     class Time < ActiveModel::Type::Time
       include Internal::Timezone
+
+      class Value < DelegateClass(::Time) # :nodoc:
+      end
+
+      def serialize(value)
+        case value = super
+        when ::Time
+          Value.new(value)
+        else
+          value
+        end
+      end
     end
   end
 end

data/lib/active_record/validations/uniqueness.rb

@@ -18,7 +18,7 @@ module ActiveRecord
         relation = build_relation(finder_class, table, attribute, value)
         if record.persisted?
           if finder_class.primary_key
-            relation = relation.where.not(finder_class.primary_key => record.id_was)
+            relation = relation.where.not(finder_class.primary_key => record.id_was || record.id)
           else
             raise UnknownPrimaryKey.new(finder_class, "Can not validate uniqueness for persisted record without primary key.")
           end
@@ -67,9 +67,6 @@ module ActiveRecord
         cast_type = klass.type_for_attribute(attribute_name)
         value = cast_type.serialize(value)
         value = klass.connection.type_cast(value)
-        if value.is_a?(String) && column.limit
-          value = value.to_s[0, column.limit]
-        end
 
         comparison = if !options[:case_sensitive] && !value.nil?
           # will use SQL LOWER function before comparison, unless it detects a case insensitive collation

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

@@ -41,8 +41,8 @@ module ActiveRecord
 
         # 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'
+          if self.behavior == :invoke && !application_record_exist?
+            template 'application_record.rb', application_record_file_name
           end
         end
 
@@ -51,18 +51,22 @@ module ActiveRecord
           options[:parent] || determine_default_parent_class
         end
 
-        def determine_default_parent_class
-          application_record = nil
+        def application_record_exist?
+          file_exist = nil
+          in_root { file_exist = File.exist?(application_record_file_name) }
+          file_exist
+        end
 
-          in_root do
-            application_record = if mountable_engine?
-              File.exist?("app/models/#{namespaced_path}/application_record.rb")
-            else
-              File.exist?('app/models/application_record.rb')
-            end
+        def application_record_file_name
+          @application_record_file_name ||= if mountable_engine?
+            "app/models/#{namespaced_path}/application_record.rb"
+          else
+            'app/models/application_record.rb'
           end
+        end
 
-          if application_record
+        def determine_default_parent_class
+          if application_record_exist?
             "ApplicationRecord"
           else
             "ActiveRecord::Base"

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

@@ -1,3 +1,5 @@
+<% module_namespacing do -%>
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
 end
+<% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta3
+  version: 5.0.0.beta4
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-04-27 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.beta3
+        version: 5.0.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: 5.0.0.beta4
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: 5.0.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: 5.0.0.beta4
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
@@ -145,7 +145,9 @@ files:
 - lib/active_record/connection_adapters/connection_specification.rb
 - lib/active_record/connection_adapters/determine_if_preparable_visitor.rb
 - lib/active_record/connection_adapters/mysql/column.rb
+- lib/active_record/connection_adapters/mysql/database_statements.rb
 - lib/active_record/connection_adapters/mysql/explain_pretty_printer.rb
+- lib/active_record/connection_adapters/mysql/quoting.rb
 - lib/active_record/connection_adapters/mysql/schema_creation.rb
 - lib/active_record/connection_adapters/mysql/schema_definitions.rb
 - lib/active_record/connection_adapters/mysql/schema_dumper.rb
@@ -187,6 +189,7 @@ files:
 - lib/active_record/connection_adapters/schema_cache.rb
 - lib/active_record/connection_adapters/sql_type_metadata.rb
 - lib/active_record/connection_adapters/sqlite3/explain_pretty_printer.rb
+- lib/active_record/connection_adapters/sqlite3/quoting.rb
 - lib/active_record/connection_adapters/sqlite3/schema_creation.rb
 - lib/active_record/connection_adapters/sqlite3_adapter.rb
 - lib/active_record/connection_adapters/statement_pool.rb
@@ -303,7 +306,7 @@ files:
 - 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
+homepage: http://rubyonrails.org
 licenses:
 - MIT
 metadata: {}
@@ -325,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Object-relational mapper framework (part of Rails).