sqlx 1:n dependencies

migrations/20240530193519_typen.up.sql

@@ -1,5 +1,5 @@
 -- Add up migration script here
 CREATE TABLE typen (
-  id SERIAL PRIMARY KEY,
+  typ_id SERIAL PRIMARY KEY,
   name VARCHAR NOT NULL
 );

migrations/20240530193528_hersteller.up.sql

@@ -1,5 +1,5 @@
 -- Add up migration script here
 CREATE TABLE hersteller (
-  id SERIAL PRIMARY KEY,
+  hersteller_id SERIAL PRIMARY KEY,
   name VARCHAR NOT NULL
 );

migrations/20240530193533_modelle.up.sql

@@ -1,9 +1,9 @@
 -- Add up migration script here
 CREATE TABLE modelle (
-  id SERIAL PRIMARY KEY,
+  modell_id SERIAL PRIMARY KEY,
   name VARCHAR NOT NULL,
   typ_id SERIAL,
   hersteller_id SERIAL,
-  CONSTRAINT fk_typ FOREIGN KEY(typ_id) REFERENCES typen(id),
-  CONSTRAINT fk_hersteller FOREIGN KEY (hersteller_id) REFERENCES hersteller(id)
+  CONSTRAINT fk_typ FOREIGN KEY(typ_id) REFERENCES typen(typ_id),
+  CONSTRAINT fk_hersteller FOREIGN KEY (hersteller_id) REFERENCES hersteller(hersteller_id)
 )

src/main.rs

@@ -43,6 +43,8 @@ async fn main() -> Result<()> {
         .data(db_pool)
         .finish();
 
+    // println!("{}", &schema.sdl());
+
     let app = Router::new()
         .route("/ping", get(ping))
         .route("/", get(graphiql).post_service(GraphQL::new(schema)));

src/models/hersteller.rs

@@ -3,10 +3,10 @@ use async_graphql::SimpleObject;
 use serde::{Deserialize, Serialize};
 use sqlx::{FromRow, PgPool};
 
-#[derive(SimpleObject, FromRow, Deserialize, Serialize)]
+#[derive(SimpleObject, Debug, FromRow, Deserialize, Serialize, sqlx::Type)]
 pub struct Hersteller {
     /// Die Datenbank-ID
-    pub id: i32,
+    pub hersteller_id: i32,
 
     /// Der Name eines Herstellers
     name: String,
@@ -15,28 +15,32 @@ pub struct Hersteller {
 impl Hersteller {
     pub async fn create(pool: &PgPool, name: &str) -> Result<Hersteller> {
         let row = sqlx::query!(
-            "INSERT INTO hersteller(name) VALUES ($1) RETURNING id",
+            "INSERT INTO hersteller(name) VALUES ($1) RETURNING hersteller_id",
             name
         )
         .fetch_one(pool)
         .await?;
 
         Ok(Hersteller {
-            id: row.id,
+            hersteller_id: row.hersteller_id,
             name: name.to_string(),
         })
     }
 
     pub async fn read_one(pool: &PgPool, id: &i32) -> Result<Hersteller> {
-        let row = sqlx::query_as!(Hersteller, "SELECT * FROM hersteller WHERE id = $1", id)
-            .fetch_one(pool)
-            .await?;
+        let row = sqlx::query_as!(
+            Hersteller,
+            "SELECT * FROM hersteller WHERE hersteller_id = $1",
+            id
+        )
+        .fetch_one(pool)
+        .await?;
 
         Ok(row)
     }
 
     pub async fn read_all(pool: &PgPool) -> Result<Vec<Hersteller>> {
-        let rows = sqlx::query_as!(Hersteller, "SELECT id, name FROM hersteller")
+        let rows = sqlx::query_as!(Hersteller, "SELECT hersteller_id, name FROM hersteller")
             .fetch_all(pool)
             .await?;
 
@@ -44,9 +48,13 @@ impl Hersteller {
     }
 
     pub async fn update(pool: &PgPool, id: &i32, name: &str) -> Result<Hersteller> {
-        sqlx::query!("UPDATE hersteller SET name=$1 WHERE id = $2", name, id)
-            .execute(pool)
-            .await?;
+        sqlx::query!(
+            "UPDATE hersteller SET name=$1 WHERE hersteller_id = $2",
+            name,
+            id
+        )
+        .execute(pool)
+        .await?;
 
         let t = Hersteller::read_one(pool, id).await?;
 
@@ -54,7 +62,7 @@ impl Hersteller {
     }
 
     pub async fn delete(pool: &PgPool, id: &i32) -> Result<()> {
-        sqlx::query!("DELETE FROM hersteller WHERE id = $1", id)
+        sqlx::query!("DELETE FROM hersteller WHERE hersteller_id = $1", id)
             .execute(pool)
             .await?;
 

src/models/mod.rs

@@ -1,3 +1,4 @@
 pub mod hersteller;
 pub mod modell;
+pub mod modell_temp;
 pub mod typ;

src/models/modell.rs

@@ -6,7 +6,7 @@ use sqlx::{FromRow, PgPool};
 #[derive(SimpleObject, FromRow, Deserialize, Serialize)]
 pub struct Modell {
     /// Die Datenbank-ID
-    pub id: i32,
+    pub modell_id: i32,
 
     /// Der Typ
     typ_id: i32,
@@ -14,10 +14,7 @@ pub struct Modell {
     /// Der Hersteller
     hersteller_id: i32,
 
-    /**
-     * Der Name eines Modells
-     * Das ist ein Zusatz
-     */
+    /// Der Name eines Modells
     name: String,
 }
 
@@ -29,7 +26,7 @@ impl Modell {
         name: &str,
     ) -> Result<Modell> {
         let row = sqlx::query!(
-            "INSERT INTO modelle(typ_id, hersteller_id, name) VALUES ($1, $2, $3) RETURNING id",
+            "INSERT INTO modelle(typ_id, hersteller_id, name) VALUES ($1, $2, $3) RETURNING modell_id",
             typ_id,
             hersteller_id,
             name
@@ -38,7 +35,7 @@ impl Modell {
         .await?;
 
         Ok(Modell {
-            id: row.id,
+            modell_id: row.modell_id,
             typ_id,
             hersteller_id,
             name: name.to_string(),
@@ -46,7 +43,7 @@ impl Modell {
     }
 
     pub async fn read_one(pool: &PgPool, id: &i32) -> Result<Modell> {
-        let row = sqlx::query_as!(Modell, "SELECT * FROM modelle WHERE id = $1", id)
+        let row = sqlx::query_as!(Modell, "SELECT * FROM modelle WHERE modell_id = $1", id)
             .fetch_one(pool)
             .await?;
 
@@ -56,7 +53,7 @@ impl Modell {
     pub async fn read_all(pool: &PgPool) -> Result<Vec<Modell>> {
         let rows = sqlx::query_as!(
             Modell,
-            "SELECT id, name, hersteller_id, typ_id FROM modelle"
+            "SELECT modell_id, name, hersteller_id, typ_id FROM modelle"
         )
         .fetch_all(pool)
         .await?;
@@ -64,28 +61,8 @@ impl Modell {
         Ok(rows)
     }
 
-    pub async fn read_by_typ(pool: &PgPool, typ_id: &i32) -> Result<Vec<Modell>> {
-        let row = sqlx::query_as!(Modell, "SELECT * FROM modelle WHERE typ_id = $1", typ_id)
-            .fetch_all(pool)
-            .await?;
-
-        Ok(row)
-    }
-
-    pub async fn read_by_hersteller(pool: &PgPool, hersteller_id: &i32) -> Result<Vec<Modell>> {
-        let row = sqlx::query_as!(
-            Modell,
-            "SELECT * FROM modelle WHERE hersteller_id = $1",
-            hersteller_id
-        )
-        .fetch_all(pool)
-        .await?;
-
-        Ok(row)
-    }
-
     pub async fn update(pool: &PgPool, id: &i32, name: &str) -> Result<Modell> {
-        sqlx::query!("UPDATE modelle SET name=$1 WHERE id = $2", name, id)
+        sqlx::query!("UPDATE modelle SET name=$1 WHERE modell_id = $2", name, id)
             .execute(pool)
             .await?;
 
@@ -95,7 +72,7 @@ impl Modell {
     }
 
     pub async fn delete(pool: &PgPool, id: &i32) -> Result<()> {
-        sqlx::query!("DELETE FROM modelle WHERE id = $1", id)
+        sqlx::query!("DELETE FROM modelle WHERE modell_id = $1", id)
             .execute(pool)
             .await?;
 

src/models/modell_temp.rs

@@ -0,0 +1,44 @@
+use anyhow::Result;
+use async_graphql::SimpleObject;
+use serde::{Deserialize, Serialize};
+use sqlx::{FromRow, PgPool};
+
+use super::{hersteller::Hersteller, typ::Typ};
+
+#[derive(SimpleObject, Debug, FromRow, Deserialize, Serialize)]
+pub struct ModellTemp {
+    /// Die Datenbank-ID
+    pub modell_id: i32,
+
+    /// Der Typ
+    pub typ: Typ,
+
+    /// Der Hersteller
+    pub hersteller: Hersteller,
+
+    /// Der Name eines Modells
+    pub name: String,
+}
+
+impl ModellTemp {
+    pub async fn read_one(pool: &PgPool, id: &i32) -> Result<ModellTemp> {
+        let row = sqlx::query_as!(
+            ModellTemp,
+            r#"
+             select
+               m.modell_id, m.name,
+               (t.typ_id, t.name) as "typ!: Typ",
+               (h.hersteller_id, h.name) as "hersteller!: Hersteller"
+             from modelle as m
+             join typen as t using(typ_id)
+             join hersteller as h using(hersteller_id)
+             where m.modell_id = $1;
+         "#,
+            id
+        )
+        .fetch_one(pool)
+        .await?;
+
+        Ok(row)
+    }
+}

src/models/typ.rs

@@ -1,31 +1,30 @@
 use anyhow::Result;
 use async_graphql::SimpleObject;
 use serde::{Deserialize, Serialize};
-use sqlx::{FromRow, PgPool};
+use sqlx::{FromRow, PgPool, Type};
 
-#[derive(SimpleObject, FromRow, Deserialize, Serialize)]
+#[derive(SimpleObject, Debug, FromRow, Deserialize, Serialize, Type)]
 pub struct Typ {
-    /// Die Datenbank-ID
-    pub id: i32,
+    pub typ_id: i32,
 
     /// Der Name eines Typs
-    name: String,
+    pub name: String,
 }
 
 impl Typ {
     pub async fn create(pool: &PgPool, name: &str) -> Result<Typ> {
-        let row = sqlx::query!("INSERT INTO typen(name) VALUES ($1) RETURNING id", name)
+        let row = sqlx::query!("INSERT INTO typen(name) VALUES ($1) RETURNING typ_id", name)
             .fetch_one(pool)
             .await?;
 
         Ok(Typ {
-            id: row.id,
+            typ_id: row.typ_id,
             name: name.to_string(),
         })
     }
 
     pub async fn read_one(pool: &PgPool, id: &i32) -> Result<Typ> {
-        let row = sqlx::query_as!(Typ, "SELECT * FROM typen WHERE id = $1", id)
+        let row = sqlx::query_as!(Typ, "SELECT * FROM typen WHERE typ_id = $1", id)
             .fetch_one(pool)
             .await?;
 
@@ -33,7 +32,7 @@ impl Typ {
     }
 
     pub async fn read_all(pool: &PgPool) -> Result<Vec<Typ>> {
-        let rows = sqlx::query_as!(Typ, "SELECT id, name FROM typen")
+        let rows = sqlx::query_as!(Typ, "SELECT typ_id, name FROM typen")
             .fetch_all(pool)
             .await?;
 
@@ -41,7 +40,7 @@ impl Typ {
     }
 
     pub async fn update(pool: &PgPool, id: &i32, name: &str) -> Result<Typ> {
-        sqlx::query!("UPDATE typen SET name=$1 WHERE id = $2", name, id)
+        sqlx::query!("UPDATE typen SET name=$1 WHERE typ_id = $2", name, id)
             .execute(pool)
             .await?;
 
@@ -51,7 +50,7 @@ impl Typ {
     }
 
     pub async fn delete(pool: &PgPool, id: &i32) -> Result<()> {
-        sqlx::query!("DELETE FROM typen WHERE id = $1", id)
+        sqlx::query!("DELETE FROM typen WHERE typ_id = $1", id)
             .execute(pool)
             .await?;
 

src/queries/mod.rs

@@ -1,5 +1,6 @@
 pub mod hersteller;
 pub mod modell;
+pub mod modell_temp;
 pub mod typ;
 
 use async_graphql::MergedObject;
@@ -8,5 +9,6 @@ use async_graphql::MergedObject;
 pub struct Query(
     typ::TypQuery,
     modell::ModellQuery,
+    modell_temp::ModellTempQuery,
     hersteller::HerstellerQuery,
 );

src/queries/modell_temp.rs

@@ -0,0 +1,22 @@
+use async_graphql::{Context, FieldResult, Object};
+use sqlx::postgres::PgPool;
+
+use crate::models::modell_temp::ModellTemp;
+
+#[derive(Default)]
+pub struct ModellTempQuery {}
+
+#[Object(extends)]
+impl ModellTempQuery {
+    // async fn modelle<'a>(&self, ctx: &'a Context<'_>) -> FieldResult<Vec<ModellTemp>> {
+    //     let pool = ctx.data::<PgPool>()?;
+    //     let rows = ModellTemp::read_all(pool).await?;
+    //     Ok(rows)
+    // }
+
+    async fn modell_temp<'a>(&self, ctx: &'a Context<'_>, id: i32) -> FieldResult<ModellTemp> {
+        let pool = ctx.data::<PgPool>()?;
+        let row = ModellTemp::read_one(pool, &id).await?;
+        Ok(row)
+    }
+}