feat: remove schema name in sqlx annotation for sql types

Author: LeadcodeDev

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "sqlx-gen"
-version = "0.4.6"
+version = "0.4.7"
 edition = "2021"
 description = "Generate Rust structs from database schema introspection"
 license = "MIT"

crates/sqlx_gen/Cargo.toml

@@ -44,12 +44,7 @@ pub fn generate_composite(
         derive_tokens.push(quote! { #ident });
     }
 
-    // Schema-qualify the type name for non-public schemas so sqlx can find the type
-    let pg_name = if composite.schema_name != "public" {
-        format!("{}.{}", composite.schema_name, composite.name)
-    } else {
-        composite.name.clone()
-    };
+    let pg_name = &composite.name;
     let type_attr = quote! { #[sqlx(type_name = #pg_name)] };
 
     let fields: Vec<TokenStream> = composite
@@ -194,7 +189,7 @@ mod tests {
         let schema = SchemaInfo::default();
         let (tokens, _) = generate_composite(&c, DatabaseKind::Postgres, &schema, &[], &HashMap::new());
         let code = parse_and_format(&tokens);
-        assert!(code.contains("sqlx(type_name = \"geo.point\")"));
+        assert!(code.contains("sqlx(type_name = \"point\")"));
     }
 
     #[test]

crates/sqlx_gen/src/codegen/composite_gen.rs

@@ -39,13 +39,8 @@ pub fn generate_enum(
     }
 
     // For PG, add #[sqlx(type_name = "...")]
-    // Schema-qualify the type name for non-public schemas so sqlx can find the type
     let type_attr = if db_kind == DatabaseKind::Postgres {
-        let pg_name = if enum_info.schema_name != "public" {
-            format!("{}.{}", enum_info.schema_name, enum_info.name)
-        } else {
-            enum_info.name.clone()
-        };
+        let pg_name = &enum_info.name;
         quote! { #[sqlx(type_name = #pg_name)] }
     } else {
         quote! {}
@@ -193,7 +188,7 @@ mod tests {
         };
         let (tokens, _) = generate_enum(&e, DatabaseKind::Postgres, &[]);
         let code = parse_and_format(&tokens);
-        assert!(code.contains("sqlx(type_name = \"auth.role\")"));
+        assert!(code.contains("sqlx(type_name = \"role\")"));
     }
 
     #[test]

crates/sqlx_gen/src/codegen/enum_gen.rs

@@ -121,7 +121,7 @@ pub fn generate_struct(
 
 /// Detect if a column uses a custom SQL type (enum or composite) and return the qualified
 /// SQL type name for casting, plus whether it's an array.
-/// Returns `(Some("schema.type_name"), true)` for arrays of custom types,
+/// Returns `(Some("type_name"), true)` for arrays of custom types,
 /// `(Some("type_name"), false)` for scalar custom types, or `(None, false)` for built-in types.
 fn detect_custom_sql_type(udt_name: &str, schema_info: &SchemaInfo) -> (Option<String>, bool) {
     let (base_name, is_array) = match udt_name.strip_prefix('_') {
@@ -130,23 +130,13 @@ fn detect_custom_sql_type(udt_name: &str, schema_info: &SchemaInfo) -> (Option<S
     };
 
     // Check enums
-    if let Some(e) = schema_info.enums.iter().find(|e| e.name == base_name) {
-        let qualified = if e.schema_name == "public" {
-            base_name.to_string()
-        } else {
-            format!("{}.{}", e.schema_name, base_name)
-        };
-        return (Some(qualified), is_array);
+    if schema_info.enums.iter().any(|e| e.name == base_name) {
+        return (Some(base_name.to_string()), is_array);
     }
 
     // Check composite types
-    if let Some(c) = schema_info.composite_types.iter().find(|c| c.name == base_name) {
-        let qualified = if c.schema_name == "public" {
-            base_name.to_string()
-        } else {
-            format!("{}.{}", c.schema_name, base_name)
-        };
-        return (Some(qualified), is_array);
+    if schema_info.composite_types.iter().any(|c| c.name == base_name) {
+        return (Some(base_name.to_string()), is_array);
     }
 
     // Check if this is a non-builtin type that would hit the typemap fallback

crates/sqlx_gen/src/codegen/struct_gen.rs

@@ -1,6 +1,6 @@
 [package]
 name = "sqlx-gen-macros"
-version = "0.4.6"
+version = "0.4.7"
 edition = "2021"
 description = "No-op attribute macros for sqlx-gen generated code"
 license = "MIT"