Merge pull request rails#53488 from JoeDupuis/fix-53482

Fix incorrect database.yml with skip_solid

Author: rafaelfranca

railties/lib/rails/generators/rails/app/app_generator.rb

@@ -271,7 +271,8 @@ def devcontainer
         active_storage: !options[:skip_active_storage],
         dev: options[:dev],
         node: using_node?,
-        app_name: app_name
+        app_name: app_name,
+        skip_solid: options[:skip_solid]
       }
 
       Rails::Generators::DevcontainerGenerator.new([], devcontainer_options).invoke_all

railties/lib/rails/generators/rails/devcontainer/devcontainer_generator.rb

@@ -29,6 +29,9 @@ class DevcontainerGenerator < Base # :nodoc:
       class_option :kamal, type: :boolean, default: true,
                     desc: "Include configuration for Kamal"
 
+      class_option :skip_solid, type: :boolean, default: nil,
+                    desc: "Skip Solid Cache & Queue setup"
+
       source_paths << File.expand_path(File.join(base_name, "app", "templates"), base_root)
 
       def create_devcontainer

railties/test/generators/app_generator_test.rb

@@ -1371,6 +1371,18 @@ def test_devcontainer_postgresql
     end
   end
 
+
+  def test_devcontainer_postgresql_skip_solid
+    # Regression test for #53482
+    run_generator [ destination_root, "--devcontainer", "-d", "postgresql", "--skip-solid"]
+
+    assert_file("config/database.yml") do |content|
+      assert_no_match("db/queue_migrate", content)
+      assert_no_match("db/cache_migrate", content)
+      assert_no_match("db/cable_migrate", content)
+    end
+  end
+
   def test_devcontainer_mysql
     run_generator [ destination_root, "--devcontainer", "-d", "mysql" ]