fix(config): restore fallback to default config for macros

Author: abonander

sqlx-core/src/config/mod.rs

@@ -124,11 +124,14 @@ impl ConfigError {
     /// Create a [`ConfigError`] from a [`std::io::Error`].
     ///
     /// Maps to either `NotFound` or `Io`.
-    pub fn from_io(path: PathBuf, error: io::Error) -> Self {
+    pub fn from_io(path: impl Into<PathBuf>, error: io::Error) -> Self {
         if error.kind() == io::ErrorKind::NotFound {
-            Self::NotFound { path }
+            Self::NotFound { path: path.into() }
         } else {
-            Self::Io { path, error }
+            Self::Io {
+                path: path.into(),
+                error,
+            }
         }
     }
 
@@ -147,52 +150,58 @@ static CACHE: OnceCell<Config> = OnceCell::new();
 /// Internal methods for loading a `Config`.
 #[allow(clippy::result_large_err)]
 impl Config {
-    /// Get the cached config, or to read `$CARGO_MANIFEST_DIR/sqlx.toml`.
+    /// Get the cached config, or read `$CARGO_MANIFEST_DIR/sqlx.toml`.
     ///
     /// On success, the config is cached in a `static` and returned by future calls.
     ///
     /// Errors if `CARGO_MANIFEST_DIR` is not set, or if the config file could not be read.
-    pub fn try_from_crate() -> Result<&'static Self, ConfigError> {
-        Self::try_read_with(get_crate_path)
+    ///
+    /// If the file does not exist, the cache is populated with `Config::default()`.
+    pub fn try_from_crate_or_default() -> Result<&'static Self, ConfigError> {
+        CACHE.get_or_try_init(|| {
+            Self::read_from(get_crate_path()?).or_else(|e| {
+                if let ConfigError::NotFound { .. } = e {
+                    Ok(Config::default())
+                } else {
+                    Err(e)
+                }
+            })
+        })
     }
 
-    /// Get the cached config, or attempt to read `sqlx.toml` from the current working directory.
+    /// Get the cached config, or read `$CARGO_MANIFEST_DIR/sqlx.toml`.
     ///
     /// On success, the config is cached in a `static` and returned by future calls.
     ///
-    /// Errors if the config file does not exist, or could not be read.
-    pub fn try_from_current_dir() -> Result<&'static Self, ConfigError> {
-        Self::try_read_with(|| Ok("sqlx.toml".into()))
+    /// Errors if `CARGO_MANIFEST_DIR` is not set, or if the config file could not be read.
+    ///
+    /// If the file does not exist, the cache is populated with `Config::default()`.
+    pub fn try_from_crate_or_default() -> Result<&'static Self, ConfigError> {
+        CACHE.get_or_try_init(|| {
+            Self::read_from(get_crate_path()?).or_else(|e| {
+                if let ConfigError::NotFound { .. } = e {
+                    Ok(Config::default())
+                } else {
+                    Err(e)
+                }
+            })
+        })
     }
 
     /// Get the cached config, or attempt to read it from the path given.
     ///
     /// On success, the config is cached in a `static` and returned by future calls.
     ///
     /// Errors if the config file does not exist, or could not be read.
-    pub fn try_from_path(path: impl Into<PathBuf>) -> Result<&'static Self, ConfigError> {
-        Self::try_read_with(|| Ok(path.into()))
+    pub fn try_from_path(path: PathBuf) -> Result<&'static Self, ConfigError> {
+        CACHE.get_or_try_init(|| Self::read_from(path))
     }
 
     /// Get the cached config, or return the default.
     pub fn get_or_default() -> &'static Self {
         CACHE.get_or_init(Config::default)
     }
 
-    /// Get the cached config, or attempt to read it from the path returned by the closure.
-    ///
-    /// On success, the config is cached in a `static` and returned by future calls.
-    ///
-    /// Errors if the config file does not exist, or could not be read.
-    fn try_read_with(
-        make_path: impl FnOnce() -> Result<PathBuf, ConfigError>,
-    ) -> Result<&'static Self, ConfigError> {
-        CACHE.get_or_try_init(|| {
-            let path = make_path()?;
-            Self::read_from(path)
-        })
-    }
-
     #[cfg(feature = "sqlx-toml")]
     fn read_from(path: PathBuf) -> Result<Self, ConfigError> {
         // The `toml` crate doesn't provide an incremental reader.
@@ -216,8 +225,8 @@ impl Config {
     #[cfg(not(feature = "sqlx-toml"))]
     fn read_from(path: PathBuf) -> Result<Self, ConfigError> {
         match path.try_exists() {
-            Ok(true) => Err(ConfigError::ParseDisabled { path }),
-            Ok(false) => Err(ConfigError::NotFound { path }),
+            Ok(true) => Err(ConfigError::ParseDisabled { path: path.into() }),
+            Ok(false) => Err(ConfigError::NotFound { path: path.into() }),
             Err(e) => Err(ConfigError::from_io(path, e)),
         }
     }

sqlx-macros-core/src/migrate.rs

@@ -92,7 +92,7 @@ pub fn default_path(config: &Config) -> &str {
 }
 
 pub fn expand(path_arg: Option<LitStr>) -> crate::Result<TokenStream> {
-    let config = Config::try_from_crate()?;
+    let config = Config::try_from_crate_or_default()?;
 
     let path = match path_arg {
         Some(path_arg) => crate::common::resolve_path(path_arg.value(), path_arg.span())?,

sqlx-macros-core/src/query/mod.rs

@@ -123,7 +123,9 @@ fn init_metadata(manifest_dir: &String) -> crate::Result<Metadata> {
         .map(|s| s.eq_ignore_ascii_case("true") || s == "1")
         .unwrap_or(false);
 
-    let var_name = Config::try_from_crate()?.common.database_url_var();
+    let var_name = Config::try_from_crate_or_default()?
+        .common
+        .database_url_var();
 
     let database_url = env(var_name).ok().or(database_url);
 
@@ -256,7 +258,7 @@ fn expand_with_data<DB: DatabaseExt>(
 where
     Describe<DB>: DescribeExt,
 {
-    let config = Config::try_from_crate()?;
+    let config = Config::try_from_crate_or_default()?;
 
     // validate at the minimum that our args match the query's input parameters
     let num_parameters = match data.describe.parameters() {

sqlx-macros-core/src/test_attr.rs

@@ -77,7 +77,7 @@ fn expand_simple(input: syn::ItemFn) -> TokenStream {
 
 #[cfg(feature = "migrate")]
 fn expand_advanced(args: AttributeArgs, input: syn::ItemFn) -> crate::Result<TokenStream> {
-    let config = sqlx_core::config::Config::try_from_crate()?;
+    let config = sqlx_core::config::Config::try_from_crate_or_default()?;
 
     let ret = &input.sig.output;
     let name = &input.sig.ident;