add macros namespace test

Author: bobozaur

.github/workflows/sqlx.yml

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

Cargo.lock

@@ -21,7 +21,9 @@ _rt-tokio = ["sqlx-macros-core/_rt-tokio"]
 _tls-native-tls = ["sqlx-macros-core/_tls-native-tls"]
 _tls-rustls-aws-lc-rs = ["sqlx-macros-core/_tls-rustls-aws-lc-rs"]
 _tls-rustls-ring-webpki = ["sqlx-macros-core/_tls-rustls-ring-webpki"]
-_tls-rustls-ring-native-roots = ["sqlx-macros-core/_tls-rustls-ring-native-roots"]
+_tls-rustls-ring-native-roots = [
+    "sqlx-macros-core/_tls-rustls-ring-native-roots",
+]
 
 # SQLx features
 derive = ["sqlx-macros-core/derive"]
@@ -55,8 +57,14 @@ sqlx-core = { workspace = true, features = ["any"] }
 sqlx-macros-core = { workspace = true }
 
 proc-macro2 = { version = "1.0.36", default-features = false }
-syn = { version = "2.0.52", default-features = false, features = ["parsing", "proc-macro"] }
+syn = { version = "2.0.52", default-features = false, features = [
+    "parsing",
+    "proc-macro",
+] }
 quote = { version = "1.0.26", default-features = false }
 
+[dev-dependencies]
+sqlx = { workspace = true, features = ["derive", "macros", "migrate"] }
+
 [lints]
-workspace = true
+workspace = true

sqlx-macros/Cargo.toml

@@ -4,18 +4,15 @@ use quote::quote;
 
 use sqlx_macros_core::*;
 
-/// Constant used in all macros to define the root crate.
+/// 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))]
 const CRATE_NAME: &str = "sqlx";
-// Allows for easier testing of the configurable root crate feature
+// Allows for easier testing of the configurable macros namespace feature
 // of current proc macros without duplicating them.
 #[cfg(test)]
-const CRATE_NAME: &str = match option_env!("SQLX_ROOT_CRATE") {
-    Some(c) => c,
-    None => "sqlx",
-};
+const CRATE_NAME: &str = env!("SQLX_NAMESPACE");
 
 #[cfg(feature = "macros")]
 #[proc_macro]
@@ -112,3 +109,31 @@ 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 {}
+    }
+}