Skip to content

fix(macros): don't look for .env outside workspace #4282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abonander wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −3
Open

fix(macros): don't look for .env outside workspace #4282

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions sqlx-macros-core/src/query/metadata.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,11 @@ pub struct MacrosEnv {

impl Metadata {
pub fn env(&self) -> crate::Result<Arc<MacrosEnv>> {
self.env
.get_or_try_init(|builder| load_env(&self.manifest_dir, &self.config, builder))
let workspace_root = self.workspace_root();

self.env.get_or_try_init(|builder| {
load_env(&self.manifest_dir, &workspace_root, &self.config, builder)
})
}

pub fn workspace_root(&self) -> PathBuf {
Expand Down Expand Up @@ -91,6 +94,7 @@ pub fn try_for_crate() -> crate::Result<Arc<Metadata>> {

fn load_env(
manifest_dir: &Path,
workspace_root: &Path,
config: &Config,
builder: &mut MtimeCacheBuilder,
) -> crate::Result<Arc<MacrosEnv>> {
Expand All @@ -108,7 +112,22 @@ fn load_env(
offline: None,
};

for dir in manifest_dir.ancestors() {
// https://github.com/launchbadge/sqlx/issues/4276
let dirs = if manifest_dir.starts_with(workspace_root) {
// Often just `[manifest_dir, workspace_dir]` but project structures can absolutely
// be more complicated
manifest_dir
.ancestors()
.take_while(|dir| dir.starts_with(workspace_root))
.collect::<Vec<_>>()
Comment on lines +119 to +122
Copy link
Copy Markdown
Collaborator Author

@abonander abonander May 26, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This means that if the project has a structure like this, for example:

/
├── crates/
│   ├── foo/
│   │   └── .env
│   ├── bar/
│   │   └── .env
│   └── .env
└── .env

When compiling foo we'll read /crates/foo/.env, /crates/.env and /.env in that order.

} else {
// Thinking of edge cases, there's the possibility that the package directory
// isn't actually a child of the workspace directory. There isn't really any other sane
// thing to do here; we shouldn't traverse into unrelated paths.
[manifest_dir, workspace_root].to_vec()
};

for dir in dirs {
let path = dir.join(".env");

let dotenv = match dotenvy::from_path_iter(&path) {
Expand Down
Loading