From 68dce235c12c385fad243abcec5c992ce9ea96bc Mon Sep 17 00:00:00 2001
From: Hamcha <hamcha@crunchy.rocks>
Date: Thu, 29 Jun 2023 01:11:09 +0200
Subject: [PATCH] better query_as!

---
 src/main.rs | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 0b9a7c8..ce0cb16 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -13,10 +13,10 @@ use figment::{
     Figment,
 };
 use serde::{Deserialize, Serialize};
-use sqlx::{postgres::PgPoolOptions, query_as, Pool, Postgres};
+use sqlx::{postgres::PgPoolOptions, Pool, Postgres};
 use std::{net::SocketAddr, sync::Arc};
 
-use crate::content::{Page, PageBlock};
+use crate::content::Page;
 
 #[derive(Deserialize, Serialize)]
 struct Config {
@@ -56,23 +56,9 @@ struct AppState {
 }
 
 async fn root(State(state): State<Arc<AppState>>) -> Result<String, GenericError> {
-    let page = query_as!(
-        Page,
-        r#"select
-            id,
-            author,
-            title,
-            description,
-            tags,
-            slug,
-            created_at,
-            modified_at,
-            deleted_at,
-            blocks as "blocks!: sqlx::types::Json<Vec<PageBlock>>" 
-        from pages limit 1"#
-    )
-    .fetch_one(&state.database)
-    .await?;
+    let select_query: sqlx::query::QueryAs<'_, _, Page, _> =
+        sqlx::query_as::<_, Page>("SELECT * FROM pages");
+    let page: Page = select_query.fetch_one(&state.database).await?;
     Ok(page.title)
 }