activerecord 5.2.3 → 6.0.0.rc2

data/lib/arel/visitors/visitor.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Arel # :nodoc: all
+  module Visitors
+    class Visitor
+      def initialize
+        @dispatch = get_dispatch_cache
+      end
+
+      def accept(object, collector = nil)
+        visit object, collector
+      end
+
+      private
+
+        attr_reader :dispatch
+
+        def self.dispatch_cache
+          @dispatch_cache ||= Hash.new do |hash, klass|
+            hash[klass] = "visit_#{(klass.name || '').gsub('::', '_')}"
+          end
+        end
+
+        def get_dispatch_cache
+          self.class.dispatch_cache
+        end
+
+        def visit(object, collector = nil)
+          dispatch_method = dispatch[object.class]
+          if collector
+            send dispatch_method, object, collector
+          else
+            send dispatch_method, object
+          end
+        rescue NoMethodError => e
+          raise e if respond_to?(dispatch_method, true)
+          superklass = object.class.ancestors.find { |klass|
+            respond_to?(dispatch[klass], true)
+          }
+          raise(TypeError, "Cannot visit #{object.class}") unless superklass
+          dispatch[object.class] = dispatch[superklass]
+          retry
+        end
+    end
+  end
+end

data/lib/arel/visitors/where_sql.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Arel # :nodoc: all
+  module Visitors
+    class WhereSql < Arel::Visitors::ToSql
+      def initialize(inner_visitor, *args, &block)
+        @inner_visitor = inner_visitor
+        super(*args, &block)
+      end
+
+      private
+
+        def visit_Arel_Nodes_SelectCore(o, collector)
+          collector << "WHERE "
+          wheres = o.wheres.map do |where|
+            Nodes::SqlLiteral.new(@inner_visitor.accept(where, collector.class.new).value)
+          end
+
+          inject_join wheres, collector, " AND "
+        end
+    end
+  end
+end

data/lib/arel/window_predications.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Arel # :nodoc: all
+  module WindowPredications
+    def over(expr = nil)
+      Nodes::Over.new(self, expr)
+    end
+  end
+end

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

@@ -25,11 +25,24 @@ module ActiveRecord
 
         def db_migrate_path
           if defined?(Rails.application) && Rails.application
-            Rails.application.config.paths["db/migrate"].to_ary.first
+            configured_migrate_path || default_migrate_path
           else
             "db/migrate"
           end
         end
+
+        def default_migrate_path
+          Rails.application.config.paths["db/migrate"].to_ary.first
+        end
+
+        def configured_migrate_path
+          return unless database = options[:database]
+          config = ActiveRecord::Base.configurations.configs_for(
+            env_name: Rails.env,
+            spec_name: database,
+          )
+          config&.migrations_paths
+        end
     end
   end
 end

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

@@ -8,6 +8,7 @@ module ActiveRecord
       argument :attributes, type: :array, default: [], banner: "field[:type][:index] field[:type][:index]"
 
       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 migration. By default, the current environment's primary database is used."
 
       def create_migration_file
         set_local_assigns!
@@ -15,12 +16,8 @@ module ActiveRecord
         migration_template @migration_template, File.join(db_migrate_path, "#{file_name}.rb")
       end
 
-      # TODO Change this to private once we've dropped Ruby 2.2 support.
-      # Workaround for Ruby 2.2 "private attribute?" warning.
-      protected
-        attr_reader :migration_action, :join_tables
-
       private
+        attr_reader :migration_action, :join_tables
 
         # Sets the default migration template that is being used for the generation of the migration.
         # Depending on command line arguments, the migration template and the table name instance

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

@@ -6,7 +6,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
       t.string :password_digest<%= attribute.inject_options %>
 <% elsif attribute.token? -%>
       t.string :<%= attribute.name %><%= attribute.inject_options %>
-<% else -%>
+<% elsif !attribute.virtual? -%>
       t.<%= attribute.type %> :<%= attribute.name %><%= attribute.inject_options %>
 <% end -%>
 <% end -%>

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,6 +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."
 
       # 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: 5.2.3
+  version: 6.0.0.rc2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-28 00:00:00.000000000 Z
+date: 2019-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,42 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 6.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 6.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 6.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.3
-- !ruby/object:Gem::Dependency
-  name: arel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '9.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '9.0'
+        version: 6.0.0.rc2
 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.
@@ -115,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
@@ -179,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
@@ -190,6 +176,10 @@ files:
 - lib/active_record/connection_handling.rb
 - lib/active_record/core.rb
 - lib/active_record/counter_cache.rb
+- lib/active_record/database_configurations.rb
+- lib/active_record/database_configurations/database_config.rb
+- lib/active_record/database_configurations/hash_config.rb
+- lib/active_record/database_configurations/url_config.rb
 - lib/active_record/define_callbacks.rb
 - lib/active_record/dynamic_matchers.rb
 - lib/active_record/enum.rb
@@ -198,9 +188,14 @@ files:
 - lib/active_record/explain_registry.rb
 - lib/active_record/explain_subscriber.rb
 - lib/active_record/fixture_set/file.rb
+- lib/active_record/fixture_set/model_metadata.rb
+- lib/active_record/fixture_set/render_context.rb
+- lib/active_record/fixture_set/table_row.rb
+- lib/active_record/fixture_set/table_rows.rb
 - 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
@@ -208,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
@@ -220,6 +218,7 @@ files:
 - lib/active_record/query_cache.rb
 - lib/active_record/querying.rb
 - lib/active_record/railtie.rb
+- lib/active_record/railties/collection_cache_association_loading.rb
 - lib/active_record/railties/console_sandbox.rb
 - lib/active_record/railties/controller_runtime.rb
 - lib/active_record/railties/databases.rake
@@ -266,6 +265,8 @@ files:
 - lib/active_record/tasks/mysql_database_tasks.rb
 - lib/active_record/tasks/postgresql_database_tasks.rb
 - lib/active_record/tasks/sqlite_database_tasks.rb
+- lib/active_record/test_databases.rb
+- lib/active_record/test_fixtures.rb
 - lib/active_record/timestamp.rb
 - lib/active_record/touch_later.rb
 - lib/active_record/transactions.rb
@@ -293,6 +294,87 @@ files:
 - lib/active_record/validations/presence.rb
 - lib/active_record/validations/uniqueness.rb
 - lib/active_record/version.rb
+- lib/arel.rb
+- lib/arel/alias_predication.rb
+- lib/arel/attributes.rb
+- lib/arel/attributes/attribute.rb
+- lib/arel/collectors/bind.rb
+- lib/arel/collectors/composite.rb
+- lib/arel/collectors/plain_string.rb
+- lib/arel/collectors/sql_string.rb
+- lib/arel/collectors/substitute_binds.rb
+- lib/arel/crud.rb
+- lib/arel/delete_manager.rb
+- lib/arel/errors.rb
+- lib/arel/expressions.rb
+- lib/arel/factory_methods.rb
+- lib/arel/insert_manager.rb
+- lib/arel/math.rb
+- lib/arel/nodes.rb
+- lib/arel/nodes/and.rb
+- lib/arel/nodes/ascending.rb
+- lib/arel/nodes/binary.rb
+- 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
+- lib/arel/nodes/equality.rb
+- lib/arel/nodes/extract.rb
+- lib/arel/nodes/false.rb
+- lib/arel/nodes/full_outer_join.rb
+- lib/arel/nodes/function.rb
+- lib/arel/nodes/grouping.rb
+- lib/arel/nodes/in.rb
+- lib/arel/nodes/infix_operation.rb
+- lib/arel/nodes/inner_join.rb
+- lib/arel/nodes/insert_statement.rb
+- lib/arel/nodes/join_source.rb
+- lib/arel/nodes/matches.rb
+- lib/arel/nodes/named_function.rb
+- lib/arel/nodes/node.rb
+- lib/arel/nodes/node_expression.rb
+- lib/arel/nodes/outer_join.rb
+- lib/arel/nodes/over.rb
+- lib/arel/nodes/regexp.rb
+- lib/arel/nodes/right_outer_join.rb
+- lib/arel/nodes/select_core.rb
+- lib/arel/nodes/select_statement.rb
+- lib/arel/nodes/sql_literal.rb
+- lib/arel/nodes/string_join.rb
+- lib/arel/nodes/table_alias.rb
+- lib/arel/nodes/terminal.rb
+- lib/arel/nodes/true.rb
+- lib/arel/nodes/unary.rb
+- lib/arel/nodes/unary_operation.rb
+- lib/arel/nodes/unqualified_column.rb
+- lib/arel/nodes/update_statement.rb
+- lib/arel/nodes/values_list.rb
+- lib/arel/nodes/window.rb
+- lib/arel/nodes/with.rb
+- lib/arel/order_predications.rb
+- lib/arel/predications.rb
+- lib/arel/select_manager.rb
+- lib/arel/table.rb
+- lib/arel/tree_manager.rb
+- lib/arel/update_manager.rb
+- lib/arel/visitors.rb
+- lib/arel/visitors/depth_first.rb
+- lib/arel/visitors/dot.rb
+- lib/arel/visitors/ibm_db.rb
+- lib/arel/visitors/informix.rb
+- lib/arel/visitors/mssql.rb
+- lib/arel/visitors/mysql.rb
+- lib/arel/visitors/oracle.rb
+- lib/arel/visitors/oracle12.rb
+- lib/arel/visitors/postgresql.rb
+- lib/arel/visitors/sqlite.rb
+- lib/arel/visitors/to_sql.rb
+- lib/arel/visitors/visitor.rb
+- lib/arel/visitors/where_sql.rb
+- lib/arel/window_predications.rb
 - lib/rails/generators/active_record.rb
 - lib/rails/generators/active_record/application_record/application_record_generator.rb
 - lib/rails/generators/active_record/application_record/templates/application_record.rb.tt
@@ -303,12 +385,12 @@ 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/v5.2.3/activerecord
-  changelog_uri: https://github.com/rails/rails/blob/v5.2.3/activerecord/CHANGELOG.md
+  source_code_uri: https://github.com/rails/rails/tree/v6.0.0.rc2/activerecord
+  changelog_uri: https://github.com/rails/rails/blob/v6.0.0.rc2/activerecord/CHANGELOG.md
 post_install_message: 
 rdoc_options:
 - "--main"
@@ -319,12 +401,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.1
 signing_key: 

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.column_name_from_arel_node(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