zac/Rasql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use generator state for extra type support rather than cargo features

Browse source
This commit is contained in:
ZacJW 2025-01-27 22:08:43 +00:00
parent e1958abe53
commit 177490cf4d
4 changed files with 42 additions and 353 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rasql-core/Cargo.toml
View file

@ -9,8 +9,6 @@ description = "SQL analysis and Rust type generation for Rasql"
[features]
tokio-postgres = ["rasql-traits/tokio-postgres", "dep:tokio-postgres"]
uuid = ["dep:uuid"]
rust_decimal = ["dep:rust_decimal"]
[dependencies]
sqlparser = "0.54.0"
@ -21,5 +19,3 @@ syn = { version = "2.0.96", features = ["full"] }
tokio-postgres = { version = "0.7.12", optional = true }
convert_case = "0.7.1"
thiserror = "2.0.11"
uuid = { version = "1.12.1", optional = true }
rust_decimal = { version = "1.36.0", optional = true }

6
rasql-core/src/rust/mod.rs
View file

@ -55,6 +55,8 @@ fn generate_table_struct_and_impls<
>(
table: &crate::sql::Table,
module_config: Option<&ModuleCodeGenConfig>,
type_gen: &TypeGen,
client_gen: &ClientGen,
) -> (GeneratedTableStruct, TableStructImpls) {
let name = sql_ident_to_type_name(table.name.0.last().unwrap());
let default_struct_config = StructCodeGenConfig {
@ -95,7 +97,7 @@ fn generate_table_struct_and_impls<
let r#type = match (&field_config.override_type, field_config.id_promote_mode) {
(Some(r#type), _) => r#type.clone(),
(None, IdPromoteMode::None) => TypeGen::sql_datatype_to_rust_type(&column.data_type).unwrap(),
(None, IdPromoteMode::None) => type_gen.sql_datatype_to_rust_type(&column.data_type).unwrap(),
(None, IdPromoteMode::TrustedId) => todo!(),
(None, IdPromoteMode::Id) => todo!(),
};
@ -114,7 +116,7 @@ fn generate_table_struct_and_impls<
db_alias: todo!(),
};
(
GeneratedTableStruct(TypeGen::generate_table_struct(&table_struct)),
GeneratedTableStruct(type_gen.generate_table_struct(&table_struct)),
TableStructImpls {
base_table_impl: todo!(),
table_with_pk_impl: todo!(),

38
rasql-core/src/rust/type_gen.rs
View file

@ -6,10 +6,11 @@ use super::TableStruct;
pub trait TypeGenerator<Traits: rasql_traits::DbTraits> {
fn sql_datatype_to_rust_type(
&self,
datatype: &sqlparser::ast::DataType,
) -> Result<syn::Type, UnsupportedDataType>;
fn generate_table_struct(table_struct: &TableStruct) -> proc_macro2::TokenStream;
fn generate_table_struct(&self, table_struct: &TableStruct) -> proc_macro2::TokenStream;
}
#[derive(Debug, Error)]
@ -17,7 +18,23 @@ pub trait TypeGenerator<Traits: rasql_traits::DbTraits> {
pub struct UnsupportedDataType(pub sqlparser::ast::DataType);
#[cfg(feature = "tokio-postgres")]
pub struct TokioPostgresGenerator;
pub struct TokioPostgresGenerator {
pub use_rust_decimal: UseRustDecimal,
pub use_uuid: UseUuid,
}
#[cfg(feature = "tokio-postgres")]
pub enum UseRustDecimal {
DontUse,
Version1,
}
#[cfg(feature = "tokio-postgres")]
pub enum UseUuid {
DontUse,
Version0_8,
Version1,
}
#[cfg(feature = "tokio-postgres")]
impl TokioPostgresGenerator {
@ -33,6 +50,7 @@ impl TokioPostgresGenerator {
#[cfg(feature = "tokio-postgres")]
impl TypeGenerator<rasql_traits::PostgresTypesTraits> for TokioPostgresGenerator {
fn sql_datatype_to_rust_type(
&self,
datatype: &sqlparser::ast::DataType,
) -> Result<syn::Type, UnsupportedDataType> {
Ok(match datatype {
@ -50,8 +68,11 @@ impl TypeGenerator<rasql_traits::PostgresTypesTraits> for TokioPostgresGenerator
| sqlparser::ast::DataType::FixedString(_) => {
syn::Type::Verbatim(quote::quote! {String})
}
#[cfg(feature = "uuid")]
sqlparser::ast::DataType::Uuid => syn::Type::Verbatim(quote::quote! {uuid::Uuid}),
sqlparser::ast::DataType::Uuid
if matches!(self.use_uuid, UseUuid::Version0_8 | UseUuid::Version1) =>
{
syn::Type::Verbatim(quote::quote! {uuid::Uuid})
}
sqlparser::ast::DataType::Varbinary(_)
| sqlparser::ast::DataType::Blob(_)
| sqlparser::ast::DataType::TinyBlob
@ -60,10 +81,11 @@ impl TypeGenerator<rasql_traits::PostgresTypesTraits> for TokioPostgresGenerator
| sqlparser::ast::DataType::Bytes(_)
| sqlparser::ast::DataType::Bytea
| sqlparser::ast::DataType::Binary(_) => syn::Type::Verbatim(quote::quote! {Vec<u8>}),
#[cfg(feature = "rust_decimal")]
sqlparser::ast::DataType::Numeric(..)
| sqlparser::ast::DataType::Decimal(..)
| sqlparser::ast::DataType::Dec(..) => {
| sqlparser::ast::DataType::Dec(..)
if matches!(self.use_rust_decimal, UseRustDecimal::Version1) =>
{
syn::Type::Verbatim(quote::quote! {rust_decimal::Decimal})
}
sqlparser::ast::DataType::Int2(_) => syn::Type::Verbatim(quote::quote! {i16}),
@ -119,7 +141,7 @@ impl TypeGenerator<rasql_traits::PostgresTypesTraits> for TokioPostgresGenerator
sqlparser::ast::ArrayElemTypeDef::AngleBracket(data_type)
| sqlparser::ast::ArrayElemTypeDef::SquareBracket(data_type, _)
| sqlparser::ast::ArrayElemTypeDef::Parenthesis(data_type) => {
let inner_type = Self::sql_datatype_to_rust_type(&datatype)?;
let inner_type = self.sql_datatype_to_rust_type(&datatype)?;
syn::Type::Verbatim(quote::quote! {Vec<#inner_type>})
}
},
@ -137,7 +159,7 @@ impl TypeGenerator<rasql_traits::PostgresTypesTraits> for TokioPostgresGenerator
})
}
fn generate_table_struct(table_struct: &TableStruct) -> proc_macro2::TokenStream {
fn generate_table_struct(&self, table_struct: &TableStruct) -> proc_macro2::TokenStream {
let TableStruct {
name,
fields,