From b9dd0399eddec49ea0a86ee699db76e8c9a4113e Mon Sep 17 00:00:00 2001 From: Nikkuss Date: Wed, 1 Oct 2025 14:03:16 +0400 Subject: [PATCH] fix errors --- flake.nix | 6 +++++- src/generator/modules/discovery/mod.rs | 2 +- src/generator/modules/sea_orm/config.rs | 14 +++++++------- src/generator/modules/sea_orm/mod.rs | 1 + 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index dc53035..75c4b03 100644 --- a/flake.nix +++ b/flake.nix @@ -44,7 +44,11 @@ craneLib = (crane.mkLib pkgs).overrideToolchain ( p: p.rust-bin.nightly.latest.default.override { - extensions = [ "llvm-tools-preview" ]; + extensions = [ + "llvm-tools-preview" + "rust-analyzer" + "rust-src" + ]; } ); diff --git a/src/generator/modules/discovery/mod.rs b/src/generator/modules/discovery/mod.rs index 8eba137..4cb7c7d 100644 --- a/src/generator/modules/discovery/mod.rs +++ b/src/generator/modules/discovery/mod.rs @@ -82,7 +82,7 @@ impl DiscoveryFilterConfig { && !table.starts_with("seaql_migrations") }) } else { - Box::new(move |table: &String| (include_hidden || !table.starts_with('_'))) + Box::new(move |table: &String| include_hidden || !table.starts_with('_')) } } } diff --git a/src/generator/modules/sea_orm/config.rs b/src/generator/modules/sea_orm/config.rs index ca22082..a07ce1f 100644 --- a/src/generator/modules/sea_orm/config.rs +++ b/src/generator/modules/sea_orm/config.rs @@ -10,13 +10,13 @@ pub enum EntityFormat { Compact, } -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "snake_case")] -#[serde(untagged)] -pub enum TableConfig { - Specific { specific: Vec }, - Exclude { exclude: Vec }, -} +// #[derive(Debug, Clone, Serialize, Deserialize)] +// #[serde(rename_all = "snake_case")] +// #[serde(untagged)] +// pub enum TableConfig { +// Specific { specific: Vec }, +// Exclude { exclude: Vec }, +// } #[derive(Debug, Clone)] pub enum SerdeEnable { diff --git a/src/generator/modules/sea_orm/mod.rs b/src/generator/modules/sea_orm/mod.rs index cf5993f..b24d1cf 100644 --- a/src/generator/modules/sea_orm/mod.rs +++ b/src/generator/modules/sea_orm/mod.rs @@ -74,6 +74,7 @@ impl Module for SeaOrmModule { ) { let writer_context = EntityWriterContext::new( config.entity.format.is_expanded(), + true, config.prelude.clone().into(), config.serde.enable.clone().into(), false,