From 6def61916118fb084b6809a9a6483334afff99d2 Mon Sep 17 00:00:00 2001 From: mykola2312 Date: Fri, 8 Mar 2024 08:16:53 +0200 Subject: [PATCH] migrate sql queries to postgres --- src/db/chat.rs | 8 ++++---- src/db/user.rs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/db/chat.rs b/src/db/chat.rs index c3549a8..7f67a93 100644 --- a/src/db/chat.rs +++ b/src/db/chat.rs @@ -5,8 +5,8 @@ use crate::unwrap_or_create; pub async fn create_chat(db: &DbPool, chat: &types::Chat) -> Result { sqlx::query( - "INSERT INTO chat (tg_id,title,username,can_download) - VALUES ($1,$2,$3,$4)", + r#"INSERT INTO "chat" (tg_id,title,username,can_download) + VALUES ($1,$2,$3,$4)"#, ) .bind(chat.id.0 as i64) .bind(chat.title()) @@ -15,7 +15,7 @@ pub async fn create_chat(db: &DbPool, chat: &types::Chat) -> Result Result Result { let res: Result = - sqlx::query_as("SELECT * FROM chat WHERE tg_id = $1 LIMIT 1;") + sqlx::query_as(r#"SELECT * FROM "chat" WHERE tg_id = $1 LIMIT 1;"#) .bind(chat.id.0 as i64) .fetch_one(db) .await; diff --git a/src/db/user.rs b/src/db/user.rs index 807d939..305b5b6 100644 --- a/src/db/user.rs +++ b/src/db/user.rs @@ -10,9 +10,9 @@ pub async fn create_user( is_admin: bool, ) -> Result { sqlx::query( - "INSERT OR IGNORE INTO user + r#"INSERT OR IGNORE INTO "user" (tg_id, username, first_name, last_name, can_download, is_admin, has_private_chat) - VALUES ($1,$2,$3,$4,$5,$6,$7);", + VALUES ($1,$2,$3,$4,$5,$6,$7);"#, ) .bind(user.id.0 as i64) .bind(&user.username) @@ -24,7 +24,7 @@ pub async fn create_user( .execute(db) .await?; - let user: User = sqlx::query_as("SELECT * FROM user WHERE tg_id = $1 LIMIT 1;") + let user: User = sqlx::query_as(r#"SELECT * FROM "user" WHERE tg_id = $1 LIMIT 1;"#) .bind(user.id.0 as i64) .fetch_one(db) .await?; @@ -33,7 +33,7 @@ pub async fn create_user( pub async fn find_or_create_user(db: &DbPool, user: &types::User) -> Result { let res: Result = - sqlx::query_as("SELECT * FROM user WHERE tg_id = $1 LIMIT 1;") + sqlx::query_as(r#"SELECT * FROM "user" WHERE tg_id = $1 LIMIT 1;"#) .bind(user.id.0 as i64) .fetch_one(db) .await;