Merge pull request rails#51765 from Shopify/refactor-devcontainer-implementation

Clean up database generators implementation

Author: rafaelfranca

actionview/test/active_record_unit.rb

@@ -52,8 +52,7 @@ def reconnect
       def setup_connection
         if Object.const_defined?(:ActiveRecord)
           defaults = { database: ":memory:" }
-          adapter = defined?(JRUBY_VERSION) ? "jdbcsqlite3" : "sqlite3"
-          options = defaults.merge adapter: adapter, timeout: 500
+          options = defaults.merge adapter: "sqlite3", timeout: 500
           ActiveRecord::Base.establish_connection(options)
           ActiveRecord::Base.configurations = { "sqlite3_ar_integration" => options }
           ActiveRecord::Base.lease_connection

activerecord/test/schema/oracle_specific_schema.rb

@@ -1,2 +1,7 @@
+*   Remove support for `oracle`, `sqlserver` and JRuby specific database adapters from the
+    `rails new` and `rails db:system:change` commands. The supported options are `sqlite3`,
+    `mysql`, `postgresql` and `trilogy`.
+
+    *Andrew Novoselac*
 
 Please check [7-2-stable](https://github.com/rails/rails/blob/7-2-stable/railties/CHANGELOG.md) for previous changes.

railties/CHANGELOG.md

@@ -12,7 +12,6 @@
 module Rails
   module Generators
     class AppBase < Base # :nodoc:
-      include Database
       include Devcontainer
       include AppName
 
@@ -40,7 +39,7 @@ def self.add_shared_options_for(name)
                                            desc: "Path to some #{name} template (can be a filesystem path or URL)"
 
         class_option :database,            type: :string, aliases: "-d", default: "sqlite3",
-                                           enum: DATABASES,
+                                           enum: Database::DATABASES,
                                            desc: "Preconfigure for selected database"
 
         class_option :skip_git,            type: :boolean, aliases: "-G", default: nil,
@@ -279,7 +278,7 @@ def set_default_accessors! # :doc:
       def database_gemfile_entry # :doc:
         return if options[:skip_active_record]
 
-        gem_name, gem_version = gem_for_database
+        gem_name, gem_version = database.gem
         GemfileEntry.version gem_name, gem_version,
           "Use #{options[:database]} as the database for Active Record"
       end
@@ -574,7 +573,7 @@ def dockerfile_base_packages
         packages = ["curl"]
 
         # ActiveRecord databases
-        packages << base_package_for_database unless skip_active_record?
+        packages << database.base_package unless skip_active_record?
 
         # ActiveStorage preview support
         packages << "libvips" unless skip_active_storage?
@@ -590,7 +589,7 @@ def dockerfile_build_packages
         packages = %w(build-essential git pkg-config)
 
         # add database support
-        packages << build_package_for_database unless skip_active_record?
+        packages << database.build_package unless skip_active_record?
 
         packages << "unzip" if using_bun?
 
@@ -772,6 +771,10 @@ def dockerfile_chown_directories
 
         directories.sort
       end
+
+      def database
+        @database ||= Database.build(options[:database])
+      end
     end
   end
 end