add build.rs watching; use internal cfg for testing

Author: bobozaur

.github/workflows/sqlx.yml

@@ -107,18 +107,22 @@ jobs:
           
       - name: Test sqlx-macros custom namespace
         run: >
-          SQLX_NAMESPACE="external" 
           cargo test
           -p sqlx-macros
           --all-features
+        env:
+          SQLX_NAMESPACE: "external" 
+          RUSTFLAGS: "--cfg sqlx_macros_namespace"
 
       # Should fail compilation since the env var is not set
-      # and the testing `_macros-namespace` feature is enabled.
+      # and the testing `sqlx_macros_namespace` cfg is enabled.
       - name: Test sqlx-macros without namespace
         run: >
           cargo test
           -p sqlx-macros
           --all-features || true
+        env:
+          RUSTFLAGS: "--cfg sqlx_macros_namespace"
 
       # Note: use `--lib` to not run integration tests that require a DB
       - name: Test sqlx

sqlx-macros/Cargo.toml

@@ -64,7 +64,11 @@ syn = { version = "2.0.52", default-features = false, features = [
 quote = { version = "1.0.26", default-features = false }
 
 [dev-dependencies]
-sqlx = { workspace = true, features = ["derive", "macros", "migrate"] }
+sqlx = { workspace = true, features = ["derive", "macros", "migrate", "postgres"] }
+
+[[test]]
+name = "macros_namespace"
+path = "tests/macros_namespace.rs"
 
 [lints]
 workspace = true

sqlx-macros/build.rs

@@ -0,0 +1,4 @@
+fn main() {
+    println!("cargo::rustc-check-cfg=cfg(sqlx_macros_namespace)");
+    println!("cargo:rerun-if-env-changed=SQLX_NAMESPACE");
+}

sqlx-macros/src/lib.rs

@@ -7,11 +7,11 @@ use sqlx_macros_core::*;
 /// Constant used in all macros to define the macros namespace.
 /// This accommodates 3rd party drivers by allowing them to specify a different
 /// root crate that paths used with proc macros resolve to.
-#[cfg(not(test))]
+#[cfg(not(sqlx_macros_namespace))]
 const CRATE_NAME: &str = "sqlx";
 // Allows for easier testing of the configurable macros namespace feature
 // of current proc macros without duplicating them.
-#[cfg(test)]
+#[cfg(sqlx_macros_namespace)]
 const CRATE_NAME: &str = env!("SQLX_NAMESPACE");
 
 #[cfg(feature = "macros")]
@@ -109,31 +109,3 @@ pub fn test(args: TokenStream, input: TokenStream) -> TokenStream {
         }
     }
 }
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    #[cfg(feature = "migrate")]
-    fn test_macros_namespace_migrate() {
-        /// Import as different namespace.
-        ///
-        /// This must be set as `SQLX_NAMESPACE` environment variable to test that
-        /// changing the namespace still results in the proc macros behaving well.
-        extern crate sqlx as external;
-
-        let _ = external::migrate!("../tests/migrate/migrations_simple");
-    }
-
-    #[test]
-    #[cfg(feature = "derive")]
-    fn test_macros_namespace_derive() {
-        /// Import as different namespace.
-        ///
-        /// This must be set as `SQLX_NAMESPACE` environment variable to test that
-        /// changing the namespace still results in the proc macros behaving well.
-        extern crate sqlx as external;
-
-        #[derive(Debug, external::Type, external::Encode, external::Decode, external::FromRow)]
-        struct Test {}
-    }
-}

sqlx-macros/tests/macros_namespace.rs

@@ -0,0 +1,20 @@
+/// Import as different namespace.
+///
+/// This must be set as `SQLX_NAMESPACE` environment variable to test that
+/// changing the namespace still results in the proc macros behaving well.
+extern crate sqlx as external;
+
+#[test]
+#[cfg(feature = "migrate")]
+fn test_macros_namespace_migrate() {
+    let _ = external::migrate!("../tests/migrate/migrations_simple");
+}
+
+#[test]
+#[cfg(feature = "derive")]
+fn test_macros_namespace_derive() {
+    #[derive(Debug, external::Type, external::FromRow)]
+    struct Test {
+        value: i32,
+    }
+}