activerecord 6.0.0.beta1 → 6.0.1.rc1

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

@@ -7,7 +7,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
   <%- elsif attribute.token? -%>
     add_column :<%= table_name %>, :<%= attribute.name %>, :string<%= attribute.inject_options %>
     add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>, unique: true
-  <%- else -%>
+  <%- elsif !attribute.virtual? -%>
     add_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %><%= attribute.inject_options %>
     <%- if attribute.has_index? -%>
     add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
@@ -21,7 +21,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
     <%- attributes.each do |attribute| -%>
       <%- if attribute.reference? -%>
       t.references :<%= attribute.name %><%= attribute.inject_options %>
-      <%- else -%>
+      <%- elsif !attribute.virtual? -%>
       <%= '# ' unless attribute.has_index? -%>t.index <%= attribute.index_name %><%= attribute.inject_index_options %>
       <%- end -%>
     <%- end -%>
@@ -37,7 +37,9 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
     <%- if attribute.has_index? -%>
     remove_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
     <%- end -%>
+    <%- if !attribute.virtual? %>
     remove_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %><%= attribute.inject_options %>
+    <%- end -%>
   <%- end -%>
 <%- end -%>
 <%- end -%>

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

@@ -14,7 +14,7 @@ module ActiveRecord
       class_option :parent, type: :string, desc: "The parent class for the generated model"
       class_option :indexes, type: :boolean, default: true, desc: "Add indexes for references and belongs_to columns"
       class_option :primary_key_type, type: :string, desc: "The type for primary key"
-      class_option :database, type: :string, aliases: %i(db), desc: "The database for your model's migration. By default, the current environment's primary database is used."
+      class_option :database, type: :string, aliases: %i(--db), desc: "The database for your model's migration. By default, the current environment's primary database is used."
 
       # creates the migration file for the model.
       def create_migration_file

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

@@ -1,7 +1,16 @@
 <% 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? %><%= ', required: true' if attribute.required? %>
+  belongs_to :<%= attribute.name %><%= ', polymorphic: true' if attribute.polymorphic? %>
+<% end -%>
+<% attributes.select(&:rich_text?).each do |attribute| -%>
+  has_rich_text :<%= attribute.name %>
+<% end -%>
+<% attributes.select(&:attachment?).each do |attribute| -%>
+  has_one_attached :<%= attribute.name %>
+<% end -%>
+<% attributes.select(&:attachments?).each do |attribute| -%>
+  has_many_attached :<%= attribute.name %>
 <% end -%>
 <% attributes.select(&:token?).each do |attribute| -%>
   has_secure_token<% if attribute.name != "token" %> :<%= attribute.name %><% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta1
+  version: 6.0.1.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta1
+        version: 6.0.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta1
+        version: 6.0.1.rc1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta1
+        version: 6.0.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta1
+        version: 6.0.1.rc1
 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.
@@ -101,7 +101,6 @@ files:
 - lib/active_record/callbacks.rb
 - lib/active_record/coders/json.rb
 - lib/active_record/coders/yaml_column.rb
-- lib/active_record/collection_cache_key.rb
 - lib/active_record/connection_adapters/abstract/connection_pool.rb
 - lib/active_record/connection_adapters/abstract/database_limits.rb
 - lib/active_record/connection_adapters/abstract/database_statements.rb
@@ -165,6 +164,7 @@ files:
 - lib/active_record/connection_adapters/postgresql_adapter.rb
 - lib/active_record/connection_adapters/schema_cache.rb
 - lib/active_record/connection_adapters/sql_type_metadata.rb
+- lib/active_record/connection_adapters/sqlite3/database_statements.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
@@ -195,6 +195,7 @@ files:
 - lib/active_record/fixtures.rb
 - lib/active_record/gem_version.rb
 - lib/active_record/inheritance.rb
+- lib/active_record/insert_all.rb
 - lib/active_record/integration.rb
 - lib/active_record/internal_metadata.rb
 - lib/active_record/legacy_yaml_adapter.rb
@@ -202,6 +203,9 @@ files:
 - lib/active_record/locking/optimistic.rb
 - lib/active_record/locking/pessimistic.rb
 - lib/active_record/log_subscriber.rb
+- lib/active_record/middleware/database_selector.rb
+- lib/active_record/middleware/database_selector/resolver.rb
+- lib/active_record/middleware/database_selector/resolver/session.rb
 - lib/active_record/migration.rb
 - lib/active_record/migration/command_recorder.rb
 - lib/active_record/migration/compatibility.rb
@@ -313,6 +317,7 @@ files:
 - lib/arel/nodes/bind_param.rb
 - lib/arel/nodes/case.rb
 - lib/arel/nodes/casted.rb
+- lib/arel/nodes/comment.rb
 - lib/arel/nodes/count.rb
 - lib/arel/nodes/delete_statement.rb
 - lib/arel/nodes/descending.rb
@@ -346,7 +351,6 @@ files:
 - lib/arel/nodes/unary_operation.rb
 - lib/arel/nodes/unqualified_column.rb
 - lib/arel/nodes/update_statement.rb
-- lib/arel/nodes/values.rb
 - lib/arel/nodes/values_list.rb
 - lib/arel/nodes/window.rb
 - lib/arel/nodes/with.rb
@@ -381,12 +385,15 @@ files:
 - lib/rails/generators/active_record/model/model_generator.rb
 - lib/rails/generators/active_record/model/templates/model.rb.tt
 - lib/rails/generators/active_record/model/templates/module.rb.tt
-homepage: http://rubyonrails.org
+homepage: https://rubyonrails.org
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.0.beta1/activerecord
-  changelog_uri: https://github.com/rails/rails/blob/v6.0.0.beta1/activerecord/CHANGELOG.md
+  bug_tracker_uri: https://github.com/rails/rails/issues
+  changelog_uri: https://github.com/rails/rails/blob/v6.0.1.rc1/activerecord/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.0.1.rc1/
+  mailing_list_uri: https://groups.google.com/forum/#!forum/rubyonrails-talk
+  source_code_uri: https://github.com/rails/rails/tree/v6.0.1.rc1/activerecord
 post_install_message: 
 rdoc_options:
 - "--main"
@@ -404,7 +411,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Object-relational mapper framework (part of Rails).

data/lib/active_record/collection_cache_key.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecord
-  module CollectionCacheKey
-    def collection_cache_key(collection = all, timestamp_column = :updated_at) # :nodoc:
-      query_signature = ActiveSupport::Digest.hexdigest(collection.to_sql)
-      key = "#{collection.model_name.cache_key}/query-#{query_signature}"
-
-      if collection.loaded? || collection.distinct_value
-        size = collection.records.size
-        if size > 0
-          timestamp = collection.max_by(&timestamp_column)._read_attribute(timestamp_column)
-        end
-      else
-        if collection.eager_loading?
-          collection = collection.send(:apply_join_dependency)
-        end
-        column_type = type_for_attribute(timestamp_column)
-        column = connection.visitor.compile(collection.arel_attribute(timestamp_column))
-        select_values = "COUNT(*) AS #{connection.quote_column_name("size")}, MAX(%s) AS timestamp"
-
-        if collection.has_limit_or_offset?
-          query = collection.select("#{column} AS collection_cache_key_timestamp")
-          subquery_alias = "subquery_for_cache_key"
-          subquery_column = "#{subquery_alias}.collection_cache_key_timestamp"
-          subquery = query.arel.as(subquery_alias)
-          arel = Arel::SelectManager.new(subquery).project(select_values % subquery_column)
-        else
-          query = collection.unscope(:order)
-          query.select_values = [select_values % column]
-          arel = query.arel
-        end
-
-        result = connection.select_one(arel, nil)
-
-        if result.blank?
-          size = 0
-          timestamp = nil
-        else
-          size = result["size"]
-          timestamp = column_type.deserialize(result["timestamp"])
-        end
-
-      end
-
-      if timestamp
-        "#{key}-#{size}-#{timestamp.utc.to_s(cache_timestamp_format)}"
-      else
-        "#{key}-#{size}"
-      end
-    end
-  end
-end

data/lib/arel/nodes/values.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Arel # :nodoc: all
-  module Nodes
-    class Values < Arel::Nodes::Binary
-      alias :expressions :left
-      alias :expressions= :left=
-      alias :columns :right
-      alias :columns= :right=
-
-      def initialize(exprs, columns = [])
-        super
-      end
-    end
-  end
-end