Skip to content

Commit b205824

Browse files
committed
Fix incorrect database.yml with skip_solid
Fixes rails#53482 This fix a bug that override the database.yml file omitting the `skip_solid` option when all 3: `--devcontainer` `-d postgresql` and `--skip_solid` options are set.
1 parent 723d410 commit b205824

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,8 @@ def devcontainer
271271
active_storage: !options[:skip_active_storage],
272272
dev: options[:dev],
273273
node: using_node?,
274-
app_name: app_name
274+
app_name: app_name,
275+
skip_solid: options[:skip_solid]
275276
}
276277

277278
Rails::Generators::DevcontainerGenerator.new([], devcontainer_options).invoke_all

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ class DevcontainerGenerator < Base # :nodoc:
2929
class_option :kamal, type: :boolean, default: true,
3030
desc: "Include configuration for Kamal"
3131

32+
class_option :skip_solid, type: :boolean, default: nil,
33+
desc: "Skip Solid Cache & Queue setup"
34+
3235
source_paths << File.expand_path(File.join(base_name, "app", "templates"), base_root)
3336

3437
def create_devcontainer

railties/test/generators/app_generator_test.rb

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1371,6 +1371,18 @@ def test_devcontainer_postgresql
13711371
end
13721372
end
13731373

1374+
1375+
def test_devcontainer_postgresql_skip_solid
1376+
# Regression test for #53482
1377+
run_generator [ destination_root, "--devcontainer", "-d", "postgresql", "--skip-solid"]
1378+
1379+
assert_file("config/database.yml") do |content|
1380+
assert_no_match("db/queue_migrate", content)
1381+
assert_no_match("db/cache_migrate", content)
1382+
assert_no_match("db/cable_migrate", content)
1383+
end
1384+
end
1385+
13741386
def test_devcontainer_mysql
13751387
run_generator [ destination_root, "--devcontainer", "-d", "mysql" ]
13761388

0 commit comments

Comments
 (0)