fix(macros): don't mutate environment variables#3848
Merged
Conversation
abonander
requested changes
Apr 30, 2025
abonander
approved these changes
May 19, 2025
psionic-k
reviewed
Aug 3, 2025
|
|
||
| // Check SQLX_OFFLINE_DIR, then local .sqlx, then workspace .sqlx. | ||
| let dirs = [ | ||
| |_: &Metadata| env("SQLX_OFFLINE_DIR").ok().map(PathBuf::from), |
Contributor
There was a problem hiding this comment.
This line would have made 0.8.5 work. Now that it is not checked, I believe this causes #3961
Collaborator
There was a problem hiding this comment.
I believe you're correct. We only read it from the .env but not the actual process environment: https://github.com/launchbadge/sqlx/blob/24317d5eab40fbc33caf1142946e2f39caad73ea/sqlx-macros-core/src/query/mod.rs#L127
We only actually check the process environment when we go to write the data out: https://github.com/launchbadge/sqlx/blob/24317d5eab40fbc33caf1142946e2f39caad73ea/sqlx-macros-core/src/query/mod.rs#L386
However, while we should fix this for existing users, I think the offline directory should be configurable in the sqlx.toml (#3383).
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This PR fixes a regression I created in #3815. Now, environment variables are read or fall back to the
.envfile instead of mutating them before expanding thequerymacro's.Does your PR solve an issue?
fixes #3836