fix errors

.gitea/workflows/check.yml

@@ -0,0 +1,11 @@
+name: checks
+on:
+  push:
+    branches:
+      - main
+jobs:
+  checks:
+    runs-on: nix
+    steps:
+      - uses: actions/checkout@v4
+      - run: nix flake check -L

Cargo.toml

@@ -6,28 +6,28 @@ edition = "2021"
 
 [dependencies]
 anymap = "0.12.1"
-async-trait = "0.1.88"
-clap = { version = "4.5.32", features = ["derive", "env"] }
-color-eyre = "0.6.3"
-comfy-table = { version = "7.1.4", default-features = false }
+async-trait = "0.1.89"
+clap = { version = "4.5.48", features = ["derive", "env"] }
+color-eyre = "0.6.5"
+comfy-table = { version = "7.2.1", default-features = false }
 comment-parser = "0.1.0"
 heck = "0.5.0"
 include_dir = "0.7.4"
 indicatif = "0.17.11"
 inquire = "0.7.5"
-minijinja = { version = "2.9.0", features = ["loader"] }
+minijinja = { version = "2.12.0", features = ["loader"] }
 path-clean = "1.0.1"
 pathdiff = "0.2.3"
-quote = "1.0.40"
-sea-orm-codegen = "1.1.8"
-sea-schema = { version = "0.16.1", features = ["sqlx-all"] }
-serde = { version = "1.0.219", features = ["derive"] }
+quote = "1.0.41"
+sea-orm-codegen = "1.1.16"
+sea-schema = { version = "0.16.2", features = ["sqlx-all"] }
+serde = { version = "1.0.228", features = ["derive"] }
 serde_merge = "0.1.3"
-sqlx = { version = "0.8.3", features = ["mysql", "postgres", "sqlite", "runtime-tokio"] }
-syn = { version = "2.0.100", features = ["extra-traits", "full"] }
-tokio = { version = "1.44.1", features = ["full"] }
-toml = "0.8.20"
-toml_edit = { version = "0.22.24", features = ["serde"] }
+sqlx = { version = "0.8.6", features = ["mysql", "postgres", "sqlite", "runtime-tokio"] }
+syn = { version = "2.0.106", features = ["extra-traits", "full"] }
+tokio = { version = "1.47.1", features = ["full"] }
+toml = "0.8.23"
+toml_edit = { version = "0.22.27", features = ["serde"] }
 tracing = "0.1.41"
-tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
-url = "2.5.4"
+tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }
+url = "2.5.7"

flake.lock

@@ -3,11 +3,11 @@
     "advisory-db": {
       "flake": false,
       "locked": {
-        "lastModified": 1744011916,
-        "narHash": "sha256-vZIug2BsukcfdNIH8Kto6iUGJM4PgaE8sPIKZDy8MT0=",
+        "lastModified": 1759226657,
+        "narHash": "sha256-msIjIH46R32kIF72PbU0+Hxqeu6yQFo8FsANKgs/iP0=",
         "owner": "rustsec",
         "repo": "advisory-db",
-        "rev": "b3d5d51745076cac459a298838d6bec9f4b052f3",
+        "rev": "f71b77f025d1c2afcd2b07a32e7127a5d138ef4a",
         "type": "github"
       },
       "original": {
@@ -18,11 +18,11 @@
     },
     "crane": {
       "locked": {
-        "lastModified": 1743908961,
-        "narHash": "sha256-e1idZdpnnHWuosI3KsBgAgrhMR05T2oqskXCmNzGPq0=",
+        "lastModified": 1758758545,
+        "narHash": "sha256-NU5WaEdfwF6i8faJ2Yh+jcK9vVFrofLcwlD/mP65JrI=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "80ceeec0dc94ef967c371dcdc56adb280328f591",
+        "rev": "95d528a5f54eaba0d12102249ce42f4d01f4e364",
         "type": "github"
       },
       "original": {
@@ -51,11 +51,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1743827369,
-        "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=",
+        "lastModified": 1759036355,
+        "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "42a1c966be226125b48c384171c44c651c236c22",
+        "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127",
         "type": "github"
       },
       "original": {
@@ -67,18 +67,18 @@
     },
     "process-compose-wrapper": {
       "locked": {
-        "lastModified": 1743615288,
-        "narHash": "sha256-X7beZH4dxMDkFqOJRB5daCkTMdgo90nZ62VwbFol55M=",
+        "lastModified": 1747144888,
+        "narHash": "sha256-qxIPqNf4JS9Gz138MP+UOSk7PAsIniDhW0NvOeaC/Ek=",
         "ref": "dev",
-        "rev": "c0f01d143e56669d4ea174ddc882d8c6ca85f55c",
-        "revCount": 85,
+        "rev": "948180a09c429d24648d283212a09ff0f50b2815",
+        "revCount": 86,
         "type": "git",
-        "url": "https://gitlab.scug.io/Nikkuss/process-compose-wrapper.git"
+        "url": "https://git.scug.io/nikkuss/process-compose-wrapper.git"
       },
       "original": {
         "ref": "dev",
         "type": "git",
-        "url": "https://gitlab.scug.io/Nikkuss/process-compose-wrapper.git"
+        "url": "https://git.scug.io/nikkuss/process-compose-wrapper.git"
       }
     },
     "root": {
@@ -98,11 +98,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743993291,
-        "narHash": "sha256-u8GHvduU1gCtoFXvTS/wGjH1ouv5S/GRGq6MAT+sG/k=",
+        "lastModified": 1759286284,
+        "narHash": "sha256-JLdGGc4XDutzSD1L65Ni6Ye+oTm8kWfm0KTPMcyl7Y4=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "0cb3c8979c65dc6a5812dfe67499a8c7b8b4325b",
+        "rev": "f6f2da475176bb7cff51faae8b3fe879cd393545",
         "type": "github"
       },
       "original": {

flake.nix

@@ -8,7 +8,7 @@
     flake-utils.url = "github:numtide/flake-utils";
 
     process-compose-wrapper = {
-      url = "git+https://gitlab.scug.io/Nikkuss/process-compose-wrapper.git?ref=dev";
+      url = "git+https://git.scug.io/nikkuss/process-compose-wrapper.git?ref=dev";
     };
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
@@ -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"
+            ];
           }
         );
 

src/generator/modules/discovery/column.rs

@@ -62,7 +62,7 @@ impl Column {
             ColumnSpec::UniqueKey => Some("unique key".to_owned()),
             ColumnSpec::Check(_) => unimplemented!(),
             ColumnSpec::Generated { .. } => unimplemented!(),
-            ColumnSpec::Extra(_) => unimplemented!(),
+            ColumnSpec::Extra(e) => Some(e.to_string()),
             ColumnSpec::Comment(_) => unimplemented!(),
             ColumnSpec::Using(_) => unimplemented!(),
         }

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('_'))
         }
     }
 }

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<String> },
-    Exclude { exclude: Vec<String> },
-}
+// #[derive(Debug, Clone, Serialize, Deserialize)]
+// #[serde(rename_all = "snake_case")]
+// #[serde(untagged)]
+// pub enum TableConfig {
+//     Specific { specific: Vec<String> },
+//     Exclude { exclude: Vec<String> },
+// }
 
 #[derive(Debug, Clone)]
 pub enum SerdeEnable {

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,