activerecord 7.0.10 → 7.1.0.beta1

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

@@ -11,20 +11,25 @@ module ActiveRecord
 
       class_option :migration, type: :boolean
       class_option :timestamps, type: :boolean
-      class_option :parent, type: :string, desc: "The parent class for the generated model"
+      class_option :parent, type: :string, default: "ApplicationRecord", 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."
 
+      Rails::Generators.templates_path.each do |path|
+        source_paths << File.join(path, base_name, "migration")
+      end
+      source_paths << File.expand_path(File.join(base_name, "migration", "templates"), base_root)
+
       # creates the migration file for the model.
       def create_migration_file
         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")
+        migration_template "create_table_migration.rb", File.join(db_migrate_path, "create_#{table_name}.rb")
       end
 
       def create_model_file
-        generate_abstract_class if database && !parent
+        generate_abstract_class if database && !custom_parent?
         template "model.rb", File.join("app/models", class_path, "#{file_name}.rb")
       end
 
@@ -40,7 +45,7 @@ module ActiveRecord
         #   - options parent is present and database option is not present
         #   - migrations option is nil or false
         def skip_migration_creation?
-          parent && !database || !migration
+          custom_parent? && !database || !migration
         end
 
         def attributes_with_index
@@ -49,12 +54,12 @@ module ActiveRecord
 
         # Used by the migration template to determine the parent name of the model
         def parent_class_name
-          if parent
+          if custom_parent?
             parent
           elsif database
             abstract_class_name
           else
-            "ApplicationRecord"
+            parent
           end
         end
 
@@ -77,6 +82,10 @@ module ActiveRecord
           options[:parent]
         end
 
+        def custom_parent?
+          parent != self.class.class_options[:parent].default
+        end
+
         def migration
           options[:migration]
         end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 7.0.10
+  version: 7.1.0.beta1
 platform: ruby
 authors:
 - David Heinemeier Hansson
+autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2023-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -15,28 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.10
+        version: 7.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.10
+        version: 7.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.10
+        version: 7.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.10
+        version: 7.1.0.beta1
+- !ruby/object:Gem::Dependency
+  name: timeout
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 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,6 +116,7 @@ files:
 - lib/active_record/autosave_association.rb
 - lib/active_record/base.rb
 - lib/active_record/callbacks.rb
+- lib/active_record/coders/column_serializer.rb
 - lib/active_record/coders/json.rb
 - lib/active_record/coders/yaml_column.rb
 - lib/active_record/connection_adapters.rb
@@ -122,7 +138,6 @@ files:
 - lib/active_record/connection_adapters/abstract_mysql_adapter.rb
 - lib/active_record/connection_adapters/column.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
@@ -132,6 +147,7 @@ files:
 - lib/active_record/connection_adapters/mysql/schema_dumper.rb
 - lib/active_record/connection_adapters/mysql/schema_statements.rb
 - lib/active_record/connection_adapters/mysql/type_metadata.rb
+- lib/active_record/connection_adapters/mysql2/database_statements.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
@@ -176,6 +192,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/column.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
@@ -185,6 +202,8 @@ files:
 - lib/active_record/connection_adapters/sqlite3/schema_statements.rb
 - lib/active_record/connection_adapters/sqlite3_adapter.rb
 - lib/active_record/connection_adapters/statement_pool.rb
+- lib/active_record/connection_adapters/trilogy/database_statements.rb
+- lib/active_record/connection_adapters/trilogy_adapter.rb
 - lib/active_record/connection_handling.rb
 - lib/active_record/core.rb
 - lib/active_record/counter_cache.rb
@@ -194,10 +213,12 @@ files:
 - lib/active_record/database_configurations/hash_config.rb
 - lib/active_record/database_configurations/url_config.rb
 - lib/active_record/delegated_type.rb
+- lib/active_record/deprecator.rb
 - lib/active_record/destroy_association_async_job.rb
 - lib/active_record/disable_joins_association_relation.rb
 - lib/active_record/dynamic_matchers.rb
 - lib/active_record/encryption.rb
+- lib/active_record/encryption/auto_filtered_parameters.rb
 - lib/active_record/encryption/cipher.rb
 - lib/active_record/encryption/cipher/aes256_gcm.rb
 - lib/active_record/encryption/config.rb
@@ -246,6 +267,8 @@ files:
 - lib/active_record/locking/optimistic.rb
 - lib/active_record/locking/pessimistic.rb
 - lib/active_record/log_subscriber.rb
+- lib/active_record/marshalling.rb
+- lib/active_record/message_pack.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
@@ -253,19 +276,24 @@ files:
 - lib/active_record/migration.rb
 - lib/active_record/migration/command_recorder.rb
 - lib/active_record/migration/compatibility.rb
+- lib/active_record/migration/default_strategy.rb
+- lib/active_record/migration/execution_strategy.rb
 - lib/active_record/migration/join_table.rb
 - lib/active_record/model_schema.rb
 - lib/active_record/nested_attributes.rb
 - lib/active_record/no_touching.rb
-- lib/active_record/null_relation.rb
+- lib/active_record/normalization.rb
 - lib/active_record/persistence.rb
+- lib/active_record/promise.rb
 - lib/active_record/query_cache.rb
 - lib/active_record/query_logs.rb
+- lib/active_record/query_logs_formatter.rb
 - lib/active_record/querying.rb
 - lib/active_record/railtie.rb
 - lib/active_record/railties/console_sandbox.rb
 - lib/active_record/railties/controller_runtime.rb
 - lib/active_record/railties/databases.rake
+- lib/active_record/railties/job_runtime.rb
 - lib/active_record/readonly_attributes.rb
 - lib/active_record/reflection.rb
 - lib/active_record/relation.rb
@@ -297,6 +325,7 @@ files:
 - lib/active_record/scoping.rb
 - lib/active_record/scoping/default.rb
 - lib/active_record/scoping/named.rb
+- lib/active_record/secure_password.rb
 - lib/active_record/secure_token.rb
 - lib/active_record/serialization.rb
 - lib/active_record/signed_id.rb
@@ -311,6 +340,7 @@ files:
 - lib/active_record/test_databases.rb
 - lib/active_record/test_fixtures.rb
 - lib/active_record/timestamp.rb
+- lib/active_record/token_for.rb
 - lib/active_record/touch_later.rb
 - lib/active_record/transactions.rb
 - lib/active_record/translation.rb
@@ -359,16 +389,19 @@ files:
 - lib/arel/nodes/ascending.rb
 - lib/arel/nodes/binary.rb
 - lib/arel/nodes/bind_param.rb
+- lib/arel/nodes/bound_sql_literal.rb
 - lib/arel/nodes/case.rb
 - lib/arel/nodes/casted.rb
 - lib/arel/nodes/comment.rb
 - lib/arel/nodes/count.rb
+- lib/arel/nodes/cte.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/filter.rb
+- lib/arel/nodes/fragments.rb
 - lib/arel/nodes/full_outer_join.rb
 - lib/arel/nodes/function.rb
 - lib/arel/nodes/grouping.rb
@@ -378,6 +411,7 @@ files:
 - lib/arel/nodes/inner_join.rb
 - lib/arel/nodes/insert_statement.rb
 - lib/arel/nodes/join_source.rb
+- lib/arel/nodes/leading_join.rb
 - lib/arel/nodes/matches.rb
 - lib/arel/nodes/named_function.rb
 - lib/arel/nodes/node.rb
@@ -416,12 +450,14 @@ files:
 - lib/arel/visitors/visitor.rb
 - lib/arel/window_predications.rb
 - lib/rails/generators/active_record.rb
+- lib/rails/generators/active_record/application_record/USAGE
 - lib/rails/generators/active_record/application_record/application_record_generator.rb
 - lib/rails/generators/active_record/application_record/templates/application_record.rb.tt
 - lib/rails/generators/active_record/migration.rb
 - lib/rails/generators/active_record/migration/migration_generator.rb
 - 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/USAGE
 - 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
@@ -433,11 +469,12 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.0.10/activerecord/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.0.10/
+  changelog_uri: https://github.com/rails/rails/blob/v7.1.0.beta1/activerecord/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.1.0.beta1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.0.10/activerecord
+  source_code_uri: https://github.com/rails/rails/tree/v7.1.0.beta1/activerecord
   rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -450,11 +487,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.4.18
+signing_key:
 specification_version: 4
 summary: Object-relational mapper framework (part of Rails).
 test_files: []

data/lib/active_record/connection_adapters/legacy_pool_manager.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecord
-  module ConnectionAdapters
-    class LegacyPoolManager # :nodoc:
-      def initialize
-        @name_to_pool_config = {}
-      end
-
-      def shard_names
-        @name_to_pool_config.keys
-      end
-
-      def pool_configs(_ = nil)
-        @name_to_pool_config.values
-      end
-
-      def remove_pool_config(_, shard)
-        @name_to_pool_config.delete(shard)
-      end
-
-      def get_pool_config(_, shard)
-        @name_to_pool_config[shard]
-      end
-
-      def set_pool_config(role, shard, pool_config)
-        if pool_config
-          @name_to_pool_config[shard] = pool_config
-        else
-          raise ArgumentError, "The `pool_config` for the :#{role} role and :#{shard} shard was `nil`. Please check your configuration. If you want your writing role to be something other than `:writing` set `config.active_record.writing_role` in your application configuration. The same setting should be applied for the `reading_role` if applicable."
-        end
-      end
-    end
-  end
-end

data/lib/active_record/null_relation.rb

@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecord
-  module NullRelation # :nodoc:
-    def pluck(*column_names)
-      []
-    end
-
-    def delete_all
-      0
-    end
-
-    def update_all(_updates)
-      0
-    end
-
-    def delete(_id_or_array)
-      0
-    end
-
-    def empty?
-      true
-    end
-
-    def none?
-      true
-    end
-
-    def any?
-      false
-    end
-
-    def one?
-      false
-    end
-
-    def many?
-      false
-    end
-
-    def calculate(operation, _column_name)
-      case operation
-      when :count, :sum
-        group_values.any? ? Hash.new : 0
-      when :average, :minimum, :maximum
-        group_values.any? ? Hash.new : nil
-      end
-    end
-
-    def exists?(_conditions = :none)
-      false
-    end
-
-    def or(other)
-      other.spawn
-    end
-
-    private
-      def exec_main_query(async: false)
-        [].freeze
-      end
-  end
-end