activerecord 6.0.3.4 → 6.1.2

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

@@ -22,6 +22,11 @@ module ActiveRecord
           ", id: :#{key_type}" if key_type
         end
 
+        def foreign_key_type
+          key_type = options[:primary_key_type]
+          ", type: :#{key_type}" if key_type
+        end
+
         def db_migrate_path
           if defined?(Rails.application) && Rails.application
             configured_migrate_path || default_migrate_path
@@ -38,7 +43,7 @@ module ActiveRecord
           return unless database = options[:database]
           config = ActiveRecord::Base.configurations.configs_for(
             env_name: Rails.env,
-            spec_name: database,
+            name: database
           )
           config&.migrations_paths
         end

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

@@ -7,6 +7,7 @@ module ActiveRecord
     class MigrationGenerator < Base # :nodoc:
       argument :attributes, type: :array, default: [], banner: "field[:type][:index] field[:type][:index]"
 
+      class_option :timestamps, type: :boolean
       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."
 

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

@@ -6,6 +6,8 @@ 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 %>
+<% elsif attribute.reference? -%>
+      t.<%= attribute.type %> :<%= attribute.name %><%= attribute.inject_options %><%= foreign_key_type %>
 <% elsif !attribute.virtual? -%>
       t.<%= attribute.type %> :<%= attribute.name %><%= attribute.inject_options %>
 <% end -%>

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

@@ -3,7 +3,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
   def change
 <% attributes.each do |attribute| -%>
   <%- if attribute.reference? -%>
-    add_reference :<%= table_name %>, :<%= attribute.name %><%= attribute.inject_options %>
+    add_reference :<%= table_name %>, :<%= attribute.name %><%= attribute.inject_options %><%= foreign_key_type %>
   <%- 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
@@ -20,7 +20,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
     create_join_table :<%= join_tables.first %>, :<%= join_tables.second %> do |t|
     <%- attributes.each do |attribute| -%>
       <%- if attribute.reference? -%>
-      t.references :<%= attribute.name %><%= attribute.inject_options %>
+      t.references :<%= attribute.name %><%= attribute.inject_options %><%= foreign_key_type %>
       <%- elsif !attribute.virtual? -%>
       <%= '# ' unless attribute.has_index? -%>t.index <%= attribute.index_name %><%= attribute.inject_index_options %>
       <%- end -%>
@@ -32,7 +32,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
 <% attributes.each do |attribute| -%>
 <%- if migration_action -%>
   <%- if attribute.reference? -%>
-    remove_reference :<%= table_name %>, :<%= attribute.name %><%= attribute.inject_options %>
+    remove_reference :<%= table_name %>, :<%= attribute.name %><%= attribute.inject_options %><%= foreign_key_type %>
   <%- else -%>
     <%- if attribute.has_index? -%>
     remove_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>

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

@@ -18,12 +18,13 @@ module ActiveRecord
 
       # creates the migration file for the model.
       def create_migration_file
-        return unless options[:migration] && options[:parent].nil?
+        return if skip_migration_creation?
         attributes.each { |a| a.attr_options.delete(:index) if a.reference? && !a.has_index? } if options[:indexes] == false
         migration_template "../../migration/templates/create_table_migration.rb", File.join(db_migrate_path, "create_#{table_name}.rb")
       end
 
       def create_model_file
+        generate_abstract_class if database && !parent
         template "model.rb", File.join("app/models", class_path, "#{file_name}.rb")
       end
 
@@ -35,13 +36,49 @@ module ActiveRecord
       hook_for :test_framework
 
       private
+        # Skip creating migration file if:
+        #   - options parent is present and database option is not present
+        #   - migrations option is nil or false
+        def skip_migration_creation?
+          parent && !database || !migration
+        end
+
         def attributes_with_index
           attributes.select { |a| !a.reference? && a.has_index? }
         end
 
         # Used by the migration template to determine the parent name of the model
         def parent_class_name
-          options[:parent] || "ApplicationRecord"
+          if parent
+            parent
+          elsif database
+            abstract_class_name
+          else
+            "ApplicationRecord"
+          end
+        end
+
+        def generate_abstract_class
+          path = File.join("app/models", "#{database.underscore}_record.rb")
+          return if File.exist?(path)
+
+          template "abstract_base_class.rb", path
+        end
+
+        def abstract_class_name
+          "#{database.camelize}Record"
+        end
+
+        def database
+          options[:database]
+        end
+
+        def parent
+          options[:parent]
+        end
+
+        def migration
+          options[:migration]
         end
     end
   end

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

@@ -0,0 +1,7 @@
+<% module_namespacing do -%>
+class <%= abstract_class_name %> < ApplicationRecord
+  self.abstract_class = true
+
+  connects_to database: { <%= ActiveRecord::Base.writing_role %>: :<%= database -%> }
+end
+<% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 6.0.3.4
+  version: 6.1.2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2021-02-09 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.3.4
+        version: 6.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.3.4
+        version: 6.1.2
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.3.4
+        version: 6.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.3.4
+        version: 6.1.2
 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.
@@ -53,7 +53,6 @@ files:
 - examples/performance.rb
 - examples/simple.rb
 - lib/active_record.rb
-- lib/active_record/advisory_lock_base.rb
 - lib/active_record/aggregations.rb
 - lib/active_record/association_relation.rb
 - lib/active_record/associations.rb
@@ -86,7 +85,6 @@ files:
 - lib/active_record/associations/singular_association.rb
 - lib/active_record/associations/through_association.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
@@ -102,6 +100,7 @@ files:
 - lib/active_record/callbacks.rb
 - lib/active_record/coders/json.rb
 - lib/active_record/coders/yaml_column.rb
+- lib/active_record/connection_adapters.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
@@ -116,8 +115,8 @@ files:
 - lib/active_record/connection_adapters/abstract_adapter.rb
 - lib/active_record/connection_adapters/abstract_mysql_adapter.rb
 - lib/active_record/connection_adapters/column.rb
-- lib/active_record/connection_adapters/connection_specification.rb
-- lib/active_record/connection_adapters/determine_if_preparable_visitor.rb
+- lib/active_record/connection_adapters/deduplicable.rb
+- lib/active_record/connection_adapters/legacy_pool_manager.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
@@ -128,6 +127,8 @@ files:
 - lib/active_record/connection_adapters/mysql/schema_statements.rb
 - lib/active_record/connection_adapters/mysql/type_metadata.rb
 - lib/active_record/connection_adapters/mysql2_adapter.rb
+- lib/active_record/connection_adapters/pool_config.rb
+- lib/active_record/connection_adapters/pool_manager.rb
 - lib/active_record/connection_adapters/postgresql/column.rb
 - lib/active_record/connection_adapters/postgresql/database_statements.rb
 - lib/active_record/connection_adapters/postgresql/explain_pretty_printer.rb
@@ -143,8 +144,10 @@ files:
 - lib/active_record/connection_adapters/postgresql/oid/enum.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/interval.rb
 - lib/active_record/connection_adapters/postgresql/oid/jsonb.rb
 - lib/active_record/connection_adapters/postgresql/oid/legacy_point.rb
+- lib/active_record/connection_adapters/postgresql/oid/macaddr.rb
 - lib/active_record/connection_adapters/postgresql/oid/money.rb
 - lib/active_record/connection_adapters/postgresql/oid/oid.rb
 - lib/active_record/connection_adapters/postgresql/oid/point.rb
@@ -178,10 +181,12 @@ files:
 - lib/active_record/core.rb
 - lib/active_record/counter_cache.rb
 - lib/active_record/database_configurations.rb
+- lib/active_record/database_configurations/connection_url_resolver.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/delegated_type.rb
+- lib/active_record/destroy_association_async_job.rb
 - lib/active_record/dynamic_matchers.rb
 - lib/active_record/enum.rb
 - lib/active_record/errors.rb
@@ -219,7 +224,6 @@ 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
@@ -236,7 +240,6 @@ files:
 - lib/active_record/relation/predicate_builder.rb
 - lib/active_record/relation/predicate_builder/array_handler.rb
 - lib/active_record/relation/predicate_builder/association_query_value.rb
-- 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/polymorphic_array_value.rb
 - lib/active_record/relation/predicate_builder/range_handler.rb
@@ -246,7 +249,6 @@ files:
 - lib/active_record/relation/record_fetch_warning.rb
 - lib/active_record/relation/spawn_methods.rb
 - lib/active_record/relation/where_clause.rb
-- lib/active_record/relation/where_clause_factory.rb
 - lib/active_record/result.rb
 - lib/active_record/runtime_registry.rb
 - lib/active_record/sanitization.rb
@@ -258,6 +260,7 @@ files:
 - lib/active_record/scoping/named.rb
 - lib/active_record/secure_token.rb
 - lib/active_record/serialization.rb
+- lib/active_record/signed_id.rb
 - lib/active_record/statement_cache.rb
 - lib/active_record/store.rb
 - lib/active_record/suppressor.rb
@@ -292,12 +295,12 @@ files:
 - lib/active_record/validations/absence.rb
 - lib/active_record/validations/associated.rb
 - lib/active_record/validations/length.rb
+- lib/active_record/validations/numericality.rb
 - 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
@@ -328,6 +331,7 @@ files:
 - lib/arel/nodes/full_outer_join.rb
 - lib/arel/nodes/function.rb
 - lib/arel/nodes/grouping.rb
+- lib/arel/nodes/homogeneous_in.rb
 - lib/arel/nodes/in.rb
 - lib/arel/nodes/infix_operation.rb
 - lib/arel/nodes/inner_join.rb
@@ -337,6 +341,7 @@ files:
 - lib/arel/nodes/named_function.rb
 - lib/arel/nodes/node.rb
 - lib/arel/nodes/node_expression.rb
+- lib/arel/nodes/ordering.rb
 - lib/arel/nodes/outer_join.rb
 - lib/arel/nodes/over.rb
 - lib/arel/nodes/regexp.rb
@@ -362,19 +367,12 @@ files:
 - 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
@@ -384,6 +382,7 @@ files:
 - lib/rails/generators/active_record/migration/templates/create_table_migration.rb.tt
 - lib/rails/generators/active_record/migration/templates/migration.rb.tt
 - lib/rails/generators/active_record/model/model_generator.rb
+- lib/rails/generators/active_record/model/templates/abstract_base_class.rb.tt
 - lib/rails/generators/active_record/model/templates/model.rb.tt
 - lib/rails/generators/active_record/model/templates/module.rb.tt
 homepage: https://rubyonrails.org
@@ -391,10 +390,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.0.3.4/activerecord/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.0.3.4/
+  changelog_uri: https://github.com/rails/rails/blob/v6.1.2/activerecord/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.1.2/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.3.4/activerecord
+  source_code_uri: https://github.com/rails/rails/tree/v6.1.2/activerecord
 post_install_message:
 rdoc_options:
 - "--main"
@@ -412,7 +411,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Object-relational mapper framework (part of Rails).

data/lib/active_record/advisory_lock_base.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecord
-  # This class is used to create a connection that we can use for advisory
-  # locks. This will take out a "global" lock that can't be accidentally
-  # removed if a new connection is established during a migration.
-  class AdvisoryLockBase < ActiveRecord::Base # :nodoc:
-    self.abstract_class = true
-
-    self.connection_specification_name = "AdvisoryLockBase"
-
-    class << self
-      def _internal?
-        true
-      end
-    end
-  end
-end

data/lib/active_record/attribute_decorators.rb

@@ -1,88 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecord
-  module AttributeDecorators # :nodoc:
-    extend ActiveSupport::Concern
-
-    included do
-      class_attribute :attribute_type_decorations, instance_accessor: false, default: TypeDecorator.new # :internal:
-    end
-
-    module ClassMethods # :nodoc:
-      # This method is an internal API used to create class macros such as
-      # +serialize+, and features like time zone aware attributes.
-      #
-      # Used to wrap the type of an attribute in a new type.
-      # When the schema for a model is loaded, attributes with the same name as
-      # +column_name+ will have their type yielded to the given block. The
-      # return value of that block will be used instead.
-      #
-      # Subsequent calls where +column_name+ and +decorator_name+ are the same
-      # will override the previous decorator, not decorate twice. This can be
-      # used to create idempotent class macros like +serialize+
-      def decorate_attribute_type(column_name, decorator_name, &block)
-        matcher = ->(name, _) { name == column_name.to_s }
-        key = "_#{column_name}_#{decorator_name}"
-        decorate_matching_attribute_types(matcher, key, &block)
-      end
-
-      # This method is an internal API used to create higher level features like
-      # time zone aware attributes.
-      #
-      # When the schema for a model is loaded, +matcher+ will be called for each
-      # attribute with its name and type. If the matcher returns a truthy value,
-      # the type will then be yielded to the given block, and the return value
-      # of that block will replace the type.
-      #
-      # Subsequent calls to this method with the same value for +decorator_name+
-      # will replace the previous decorator, not decorate twice. This can be
-      # used to ensure that class macros are idempotent.
-      def decorate_matching_attribute_types(matcher, decorator_name, &block)
-        reload_schema_from_cache
-        decorator_name = decorator_name.to_s
-
-        # Create new hashes so we don't modify parent classes
-        self.attribute_type_decorations = attribute_type_decorations.merge(decorator_name => [matcher, block])
-      end
-
-      private
-        def load_schema!
-          super
-          attribute_types.each do |name, type|
-            decorated_type = attribute_type_decorations.apply(name, type)
-            define_attribute(name, decorated_type)
-          end
-        end
-    end
-
-    class TypeDecorator # :nodoc:
-      delegate :clear, to: :@decorations
-
-      def initialize(decorations = {})
-        @decorations = decorations
-      end
-
-      def merge(*args)
-        TypeDecorator.new(@decorations.merge(*args))
-      end
-
-      def apply(name, type)
-        decorations = decorators_for(name, type)
-        decorations.inject(type) do |new_type, block|
-          block.call(new_type)
-        end
-      end
-
-      private
-        def decorators_for(name, type)
-          matching(name, type).map(&:last)
-        end
-
-        def matching(name, type)
-          @decorations.values.select do |(matcher, _)|
-            matcher.call(name, type)
-          end
-        end
-    end
-  end
-end