Give SQLX_OFFLINE_DIR from environment precedence in macros #3962
Conversation
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
abonander
requested changes
Aug 9, 2025
sqlx-macros-core/src/query/mod.rs
Outdated
| @@ -124,6 +124,11 @@ fn init_metadata(manifest_dir: &String) -> crate::Result<Metadata> { | |||
| .map(|s| s.eq_ignore_ascii_case("true") || s == "1") | |||
| .unwrap_or(false); | |||
|
|
|||
| let offline_dir = env("SQLX_OFFLINE_DIR") | |||
| .ok() | |||
| .or(offline_dir.as_ref().cloned()) | |||
There was a problem hiding this comment.
This line doesn't make any sense. It's redundant to .or(offline_dir)
We need to be able to supply this variable via the environment when built via Nix Crane, which uses cargo vendor, which will filter the .sqlx path. Renaming is necessary in that case.
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.
We need to be able to supply this variable via the environment when built via Nix Crane, which uses cargo vendor for dependencies, which will filter the .sqlx path. Renaming is necessary in that case.
Fixes #3961
Tested container build on a branch of 0.8.6 ✔️