feat: includes macros as default and enhance logger

Author: LeadcodeDev

Cargo.lock

@@ -1,3 +1,6 @@
+[workspace]
+members = [".", "sqlx_gen_macros"]
+
 [package]
 name = "sqlx-gen"
 version = "0.4.0"
@@ -9,7 +12,28 @@ readme = "README.md"
 keywords = ["sqlx", "codegen", "postgres", "mysql", "sqlite"]
 categories = ["database", "development-tools"]
 
+[[bin]]
+name = "sqlx-gen"
+required-features = ["cli"]
+
+[features]
+default = ["cli"]
+cli = [
+    "dep:sqlx",
+    "dep:tokio",
+    "dep:clap",
+    "dep:heck",
+    "dep:thiserror",
+    "dep:quote",
+    "dep:proc-macro2",
+    "dep:syn",
+    "dep:prettyplease",
+    "dep:log",
+    "dep:env_logger",
+]
+
 [dependencies]
+sqlx-gen-macros = { path = "sqlx_gen_macros", version = "0.4.0" }
 sqlx = { version = "0.8", features = [
     "runtime-tokio",
     "tls-rustls-ring",
@@ -19,15 +43,17 @@ sqlx = { version = "0.8", features = [
     "chrono",
     "uuid",
     "json",
-] }
-tokio = { version = "1", features = ["full"] }
-clap = { version = "4", features = ["derive", "env"] }
-heck = "0.5"
-thiserror = "2"
-quote = "1"
-proc-macro2 = "1"
-syn = "2"
-prettyplease = "0.2"
+], optional = true }
+tokio = { version = "1", features = ["full"], optional = true }
+clap = { version = "4", features = ["derive", "env"], optional = true }
+heck = { version = "0.5", optional = true }
+thiserror = { version = "2", optional = true }
+quote = { version = "1", optional = true }
+proc-macro2 = { version = "1", optional = true }
+syn = { version = "2", optional = true }
+prettyplease = { version = "0.2", optional = true }
+log = { version = "0.4", optional = true }
+env_logger = { version = "0.11", optional = true }
 
 [dev-dependencies]
 pretty_assertions = "1"

Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "sqlx-gen-macros"
+version = "0.4.0"
+edition = "2021"
+description = "No-op attribute macros for sqlx-gen generated code"
+license = "MIT"
+repository = "https://github.com/LeadcodeDev/sqlx-gen"
+keywords = ["sqlx", "codegen", "macros"]
+categories = ["database", "development-tools"]
+
+[lib]
+proc-macro = true

sqlx_gen_macros/Cargo.toml

@@ -0,0 +1,22 @@
+use proc_macro::TokenStream;
+
+/// No-op derive macro that registers `sqlx_gen` as a helper attribute.
+///
+/// This allows `#[sqlx_gen(...)]` to be used on both structs and fields
+/// without the compiler rejecting them as unknown attributes.
+///
+/// # Usage
+///
+/// Add `SqlxGen` to your derive list:
+/// ```ignore
+/// #[derive(sqlx::FromRow, SqlxGen)]
+/// #[sqlx_gen(kind = "table", table = "users")]
+/// pub struct Users {
+///     #[sqlx_gen(primary_key)]
+///     pub id: i32,
+/// }
+/// ```
+#[proc_macro_derive(SqlxGen, attributes(sqlx_gen))]
+pub fn derive_sqlx_gen(_input: TokenStream) -> TokenStream {
+    TokenStream::new()
+}

sqlx_gen_macros/src/lib.rs

@@ -28,6 +28,7 @@ pub fn generate_composite(
     );
 
     imports.insert("use serde::{Serialize, Deserialize};".to_string());
+    imports.insert("use sqlx_gen::SqlxGen;".to_string());
     let mut derive_tokens = vec![
         quote! { Debug },
         quote! { Clone },
@@ -36,6 +37,7 @@ pub fn generate_composite(
         quote! { Serialize },
         quote! { Deserialize },
         quote! { sqlx::Type },
+        quote! { SqlxGen },
     ];
     for d in extra_derives {
         let ident = format_ident!("{}", d);

src/codegen/composite_gen.rs

@@ -21,10 +21,8 @@ pub fn generate_crud_from_parsed(
 
     let table_name = &entity.table_name;
 
-    // Pool type
+    // Pool type (used via full path sqlx::PgPool etc., no import needed)
     let pool_type = pool_type_tokens(db_kind);
-    let pool_import = pool_import_str(db_kind);
-    imports.insert(pool_import);
 
     // Entity import
     imports.insert(format!("use {}::{};", entity_module_path, entity.struct_name));
@@ -495,14 +493,6 @@ fn pool_type_tokens(db_kind: DatabaseKind) -> TokenStream {
     }
 }
 
-fn pool_import_str(db_kind: DatabaseKind) -> String {
-    match db_kind {
-        DatabaseKind::Postgres => "use sqlx::PgPool;".to_string(),
-        DatabaseKind::Mysql => "use sqlx::MySqlPool;".to_string(),
-        DatabaseKind::Sqlite => "use sqlx::SqlitePool;".to_string(),
-    }
-}
-
 fn placeholder(db_kind: DatabaseKind, index: usize) -> String {
     match db_kind {
         DatabaseKind::Postgres => format!("${}", index),
@@ -1033,10 +1023,10 @@ mod tests {
     // --- imports ---
 
     #[test]
-    fn test_imports_contain_pool() {
+    fn test_no_pool_import() {
         let skip = Methods::all();
         let (_, imports) = generate_crud_from_parsed(&standard_entity(), DatabaseKind::Postgres, "crate::models::users", &skip, false);
-        assert!(imports.iter().any(|i| i.contains("PgPool")));
+        assert!(!imports.iter().any(|i| i.contains("PgPool")));
     }
 
     #[test]

src/codegen/crud_gen.rs

@@ -43,9 +43,10 @@ pub fn generate_domain(
         quote! { #fallback }
     });
 
+    let domain_doc = "sqlx_gen:kind=domain";
     let tokens = quote! {
         #[doc = #doc]
-        #[sqlx_gen(kind = "domain")]
+        #[doc = #domain_doc]
         pub type #alias_name = #type_tokens;
     };
 

src/codegen/domain_gen.rs

@@ -15,7 +15,7 @@ pub struct ParsedField {
     pub is_nullable: bool,
     /// The inner type if nullable, or the full type if not
     pub inner_type: String,
-    /// Whether this field is a primary key (#[sqlx_gen(primary_key)])
+    /// Whether this field is a primary key (`#[sqlx_gen(primary_key)]`)
     pub is_primary_key: bool,
 }
 

src/codegen/entity_parser.rs

@@ -22,6 +22,7 @@ pub fn generate_enum(
     let doc = format!("Enum: {}.{}", enum_info.schema_name, enum_info.name);
 
     imports.insert("use serde::{Serialize, Deserialize};".to_string());
+    imports.insert("use sqlx_gen::SqlxGen;".to_string());
     let mut derive_tokens = vec![
         quote! { Debug },
         quote! { Clone },
@@ -30,6 +31,7 @@ pub fn generate_enum(
         quote! { Serialize },
         quote! { Deserialize },
         quote! { sqlx::Type },
+        quote! { SqlxGen },
     ];
     for d in extra_derives {
         let ident = format_ident!("{}", d);