Facilitate use of any regular ERB in database.yml #46134
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eileencodes
requested changes
Sep 26, 2022
There was a problem hiding this comment.
Thanks for the PR @eikes. It looks like this will work and I've verified there is no performance difference.
I've left some comments for things to change, mainly around wording and style.
eikes
force-pushed
the
remove-dummy-erb-compiler
branch
2 times, most recently
from
08c991f
to
b96a395
Compare
|
@eileencodes Thank you for reviewing this so quickly. I addressed all your requested changes. |
skipkayhil
reviewed
Sep 26, 2022
eikes
force-pushed
the
remove-dummy-erb-compiler
branch
from
b96a395
to
6068048
Compare
eileencodes
requested changes
Sep 27, 2022
Commit 37d1429 introduced the DummyERB to avoid loading the environment when running `rake -T`. The DummyCompiler simply replaced all output from `<%=` with a fixed string and removed everything else. This worked okay when it was used for YAML values. When using `<%=` within a YAML key, it caused an error in the YAML parser, making it impossible to use ERB as you would expect. For example a `database.yml` file containing the following should be possible: development: <% 5.times do |i| %> shard_<%= i %>: database: db/development_shard_<%= i %>.sqlite3 adapter: sqlite3 <% end %> Instead of using a broken ERB compiler we can temporarily use a `Rails.application.config` that does not raise an error when configurations are accessed which have not been set as described in rails#35468. This change removes the `DummyCompiler` and uses the standard `ERB::Compiler`. It introduces the `DummyConfig` which delegates all known configurations to the real `Rails::Application::Configuration` instance and returns a dummy string for everything else. This restores the full ERB capabilities without compromising on speed when generating the rake tasks for multiple databases. Deprecates `config.active_record.suppress_multiple_database_warning`.
eikes
force-pushed
the
remove-dummy-erb-compiler
branch
from
6068048
to
5ba8aa5
Compare
eileencodes
approved these changes
Sep 27, 2022
|
Thank you @eikes! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Commit 37d1429 (#35497) introduced the
DummyERBto avoid loading the environment when runningrake -T.The
DummyCompilersimply replaced all output from<%=with a fixed string and removed everything else. This worked okay when it was used for YAML values. When using<%=within a YAML key, it caused an error in the YAML parser, making it impossible to use ERB as you would expect. For examplea database.ymlfile containing the following should be possible:Instead of using a broken ERB compiler we can temporarily use a
Rails.application.configthat does not raise an error when configurations are accessed which have not been set as described in #35468.This change removes the
DummyCompilerand uses the standardERB::Compiler. It introduces theDummyConfigwhich delegates all known configurations to the realRails::Application::Configurationinstance and returns a dummy string for everything else. This restores the full ERB capabilities without compromising on speed when generating the rake tasks for multiple databases.Deprecates
config.active_record.suppress_multiple_database_warning.