Add dual and single

owjs3901 · owjs3901 · commit 312e87289e76 · 2026-04-01T23:47:05.000+09:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/vespertide-exporter/Cargo.toml b/crates/vespertide-exporter/Cargo.toml
@@ -16,7 +16,7 @@ thiserror = "2"
 
 [dev-dependencies]
 rstest = "0.26"
-insta = { version = "1.46", features = ["yaml"] }
+insta = { version = "1.47", features = ["yaml"] }
 
 [lints.rust]
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tarpaulin_include)'] }
diff --git a/crates/vespertide-planner/Cargo.toml b/crates/vespertide-planner/Cargo.toml
@@ -15,4 +15,4 @@ thiserror = "2"
 
 [dev-dependencies]
 rstest = "0.26"
-insta = "1.46"
+insta = "1.47"
diff --git a/crates/vespertide-query/Cargo.toml b/crates/vespertide-query/Cargo.toml
@@ -17,4 +17,4 @@ sea-query = "0.32"
 
 [dev-dependencies]
 rstest = "0.26"
-insta = "1.46"
+insta = "1.47"
diff --git a/examples/app/Cargo.toml b/examples/app/Cargo.toml
@@ -10,4 +10,4 @@ tokio = { version = "1", features = ["full"] }
 sea-orm = { version = "2.0.0-rc.37", features = ["sqlx-sqlite", "sqlx-postgres", "runtime-tokio-native-tls", "macros"] }
 anyhow = "1"
 serde = { version = "1", features = ["derive"] }
-vespera = "0.1.43"
+vespera = "0.1.48"
diff --git a/examples/app/models/dual.json b/examples/app/models/dual.json
@@ -0,0 +1,12 @@
+{
+  "$schema": "https://raw.githubusercontent.com/dev-five-git/vespertide/refs/heads/main/schemas/model.schema.json",
+  "name": "dual",
+  "columns": [
+    {
+      "name": "username",
+      "type": { "kind": "varchar", "length": 32 },
+      "nullable": false,
+      "primary_key": true
+    }
+  ]
+}
diff --git a/examples/app/models/dual_rel.json b/examples/app/models/dual_rel.json
@@ -0,0 +1,28 @@
+{
+  "$schema": "https://raw.githubusercontent.com/dev-five-git/vespertide/refs/heads/main/schemas/model.schema.json",
+  "name": "dual_rel",
+  "columns": [
+    {
+      "name": "username",
+      "type": { "kind": "varchar", "length": 32 },
+      "nullable": false,
+      "primary_key": true,
+      "foreign_key": {
+        "ref_table": "dual",
+        "ref_columns": ["username"],
+        "on_delete": "cascade"
+      }
+    },
+    {
+      "name": "checker_username",
+      "type": { "kind": "varchar", "length": 32 },
+      "nullable": false,
+      "primary_key": true,
+      "foreign_key": {
+        "ref_table": "dual",
+        "ref_columns": ["username"],
+        "on_delete": "cascade"
+      }
+    }
+  ]
+}
diff --git a/examples/app/models/single.json b/examples/app/models/single.json
@@ -0,0 +1,12 @@
+{
+  "$schema": "https://raw.githubusercontent.com/dev-five-git/vespertide/refs/heads/main/schemas/model.schema.json",
+  "name": "single",
+  "columns": [
+    {
+      "name": "username",
+      "type": { "kind": "varchar", "length": 32 },
+      "nullable": false,
+      "primary_key": true
+    }
+  ]
+}
diff --git a/examples/app/models/single_rel.json b/examples/app/models/single_rel.json
@@ -0,0 +1,17 @@
+{
+  "$schema": "https://raw.githubusercontent.com/dev-five-git/vespertide/refs/heads/main/schemas/model.schema.json",
+  "name": "single_rel",
+  "columns": [
+    {
+      "name": "username",
+      "type": { "kind": "varchar", "length": 32 },
+      "nullable": false,
+      "primary_key": true,
+      "foreign_key": {
+        "ref_table": "single",
+        "ref_columns": ["username"],
+        "on_delete": "cascade"
+      }
+    }
+  ]
+}
diff --git a/examples/app/src/models/article.rs b/examples/app/src/models/article.rs
@@ -1,9 +1,7 @@
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
-#[derive(
-    Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize, vespera::Schema,
-)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize, vespera::Schema)]
 #[serde(rename_all = "camelCase")]
 #[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "article_status")]
 pub enum Status {
diff --git a/examples/app/src/models/article_user.rs b/examples/app/src/models/article_user.rs
@@ -1,9 +1,7 @@
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
-#[derive(
-    Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize, vespera::Schema,
-)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize, vespera::Schema)]
 #[serde(rename_all = "camelCase")]
 #[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "article_user_role")]
 pub enum Role {
diff --git a/examples/app/src/models/dual.rs b/examples/app/src/models/dual.rs
@@ -0,0 +1,14 @@
+use sea_orm::entity::prelude::*;
+
+#[sea_orm::model]
+#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
+#[sea_orm(table_name = "dual")]
+pub struct Model {
+    #[sea_orm(primary_key)]
+    pub username: String,
+    #[sea_orm(has_many)]
+    pub dual_rels: HasMany<super::dual_rel::Entity>,
+}
+
+vespera::schema_type!(Schema from Model, name = "DualSchema");
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/examples/app/src/models/dual_rel.rs b/examples/app/src/models/dual_rel.rs
@@ -0,0 +1,18 @@
+use sea_orm::entity::prelude::*;
+
+#[sea_orm::model]
+#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
+#[sea_orm(table_name = "dual_rel")]
+pub struct Model {
+    #[sea_orm(primary_key)]
+    pub username: String,
+    #[sea_orm(primary_key)]
+    pub checker_username: String,
+    #[sea_orm(belongs_to, relation_enum = "Username", from = "username", to = "username")]
+    pub dual: HasOne<super::dual::Entity>,
+    #[sea_orm(belongs_to, relation_enum = "CheckerUsername", from = "checker_username", to = "username")]
+    pub checker: HasOne<super::dual::Entity>,
+}
+
+vespera::schema_type!(Schema from Model, name = "DualRelSchema");
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/examples/app/src/models/media.rs b/examples/app/src/models/media.rs
@@ -21,11 +21,7 @@ pub struct Model {
     pub articles: HasMany<super::article::Entity>,
     #[sea_orm(has_many)]
     pub user_media_roles: HasMany<super::user_media_role::Entity>,
-    #[sea_orm(
-        has_many,
-        relation_enum = "UserViaUserMediaRole",
-        via = "user_media_role"
-    )]
+    #[sea_orm(has_many, relation_enum = "UserViaUserMediaRole", via = "user_media_role")]
     pub users_via_user_media_role: HasMany<super::user::Entity>,
 }
 
diff --git a/examples/app/src/models/mod.rs b/examples/app/src/models/mod.rs
@@ -1,5 +1,9 @@
 pub mod article;
 pub mod article_user;
+pub mod dual;
+pub mod dual_rel;
 pub mod media;
+pub mod single;
+pub mod single_rel;
 pub mod user;
 pub mod user_media_role;
diff --git a/examples/app/src/models/single.rs b/examples/app/src/models/single.rs
@@ -0,0 +1,14 @@
+use sea_orm::entity::prelude::*;
+
+#[sea_orm::model]
+#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
+#[sea_orm(table_name = "single")]
+pub struct Model {
+    #[sea_orm(primary_key)]
+    pub username: String,
+    #[sea_orm(has_one)]
+    pub single_rel: HasOne<super::single_rel::Entity>,
+}
+
+vespera::schema_type!(Schema from Model, name = "SingleSchema");
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/examples/app/src/models/single_rel.rs b/examples/app/src/models/single_rel.rs
diff --git a/examples/app/src/models/user.rs b/examples/app/src/models/user.rs
diff --git a/examples/app/src/models/user_media_role.rs b/examples/app/src/models/user_media_role.rs
