Implement sqlite storage methods #144

Cargo.toml

@@ -58,7 +58,7 @@ serde_with_macros = "1.1.0"
 sqlx = { version = "0.4.0-beta.1", optional = true, default-features = false, features = [
         "runtime-tokio",
         "macros",
-        "sqlite"
+        "sqlite",
 ] }
 redis = { version = "0.16.0", optional = true }
 serde_cbor = { version = "0.11.1", optional = true }

src/dispatching/dialogue/mod.rs

@@ -165,6 +165,6 @@ pub use teloxide_macros::Transition;
 pub use storage::{RedisStorage, RedisStorageError};
 
 #[cfg(feature = "sqlite-storage")]
-pub use storage::{SqliteStorage, SqliteStorageLocation, SqliteStorageError};
+pub use storage::{SqliteStorage, SqliteStorageError};
 
 pub use storage::{serializer, InMemStorage, Serializer, Storage};

src/dispatching/dialogue/storage/mod.rs

@@ -17,7 +17,7 @@ pub use serializer::Serializer;
 use std::sync::Arc;
 
 #[cfg(feature = "sqlite-storage")]
-pub use sqlite_storage::{SqliteStorage, SqliteStorageLocation, SqliteStorageError};
+pub use sqlite_storage::{SqliteStorage, SqliteStorageError};
 
 /// A storage of dialogues.
 ///

src/dispatching/dialogue/storage/sqlite_storage.rs

@@ -1,18 +1,15 @@
-// use super::{serializer::Serializer, Storage};
+use super::{serializer::Serializer, Storage};
-// use futures::future::BoxFuture;
+use futures::future::BoxFuture;
+use serde::{de::DeserializeOwned, Serialize};
+use sqlx::sqlite::{SqliteConnectOptions, SqliteConnection};
+use sqlx::{ConnectOptions, Executor};
 use std::{
     convert::Infallible,
     fmt::{Debug, Display},
+    sync::Arc,
 };
-use sqlx::sqlite::SqlitePool;
-// use serde::{de::DeserializeOwned, Serialize};
 use thiserror::Error;
-// use tokio::task::block_in_place;
+use tokio::sync::Mutex;
-
-pub enum SqliteStorageLocation {
-    InMemory,
-    Path(String),
-}
 
 // An error returned from [`SqliteStorage`].
 #[derive(Debug, Error)]
@@ -20,54 +17,88 @@ pub enum SqliteStorageError<SE>
 where
     SE: Debug + Display,
 {
-    #[error("parsing/serializing error: {0}")]
+    #[error("dialogue serialization error: {0}")]
     SerdeError(SE),
-    #[error("error from Sqlite: {0}")]
+    #[error("sqlite error: {0}")]
-    SqliteError(Box<dyn std::error::Error>),
+    SqliteError(#[from] sqlx::Error),
 }
 
+// TODO: make JSON serializer to be default
 pub struct SqliteStorage<S> {
-    conn: SqlitePool,
+    conn: Mutex<SqliteConnection>,
     serializer: S,
 }
 
 impl<S> SqliteStorage<S> {
     pub async fn open(
-        path: SqliteStorageLocation,
+        path: &str,
         serializer: S,
-    ) -> Result<Self, SqliteStorageError<Infallible>>{
+    ) -> Result<Arc<Self>, SqliteStorageError<Infallible>> {
-        let url = match path {
+        let mut conn =
-            SqliteStorageLocation::InMemory => String::from("sqlite::memory:"),
+            SqliteConnectOptions::new().filename(path).create_if_missing(true).c§onnect().await?;
-            SqliteStorageLocation::Path(p) => p,
+
-        };
+        // TODO: think about a schema migration mechanism.
-        Ok(Self {
+        conn.execute(
-            conn: SqlitePool::connect(&url[..]).await
+            r#"
-                .expect("Impossible sqlite error"),
+CREATE TABLE IF NOT EXISTS teloxide_dialogues (
-            serializer,
+    chat_id BIGINT PRIMARY KEY,
+    dialogue BLOB NOT NULL
+);
+        "#,
+        )
+        .await?;
+
+        Ok(Arc::new(Self { conn: Mutex::new(conn), serializer }))
+    }
+}
+
+impl<S, D> Storage<D> for SqliteStorage<S>
+where
+    S: Send + Sync + Serializer<D> + 'static,
+    D: Send + Serialize + DeserializeOwned + 'static,
+    <S as Serializer<D>>::Error: Debug + Display,
+{
+    type Error = SqliteStorageError<<S as Serializer<D>>::Error>;
+
+    fn remove_dialogue(
+        self: Arc<Self>,
+        chat_id: i64,
+    ) -> BoxFuture<'static, Result<Option<D>, Self::Error>> {
+        Box::pin(async move {
+            self.conn
+                .lock()
+                .await
+                .execute(
+                    sqlx::query("DELETE FROM teloxide_dialogues WHERE chat_id = ?").bind(chat_id),
+                )
+                .await?;
+            Ok(None)
+        })
+    }
+
+    fn update_dialogue(
+        self: Arc<Self>,
+        chat_id: i64,
+        dialogue: D,
+    ) -> BoxFuture<'static, Result<Option<D>, Self::Error>> {
+        Box::pin(async move {
+            let dialogue =
+                self.serializer.serialize(&dialogue).map_err(SqliteStorageError::SerdeError)?;
+            self.conn
+                .lock()
+                .await
+                .execute(
+                    sqlx::query(
+                        r#"
+INSERT INTO teloxide_dialogues VALUES (?, ?) WHERE chat_id = ?
+ON CONFLICT(chat_id) DO UPDATE SET dialogue=excluded.dialogue
+                    "#,
+                    )
+                    .bind(chat_id)
+                    .bind(dialogue),
+                )
+                .await?;
+            Ok(None)
         })
     }
 }
-
-// impl<S, D> Storage<D> for SqliteStorage<S>
-// where
-// S: Send + Sync + Serializer<D> + 'static,
-// D: Send + Serialize + DeserializeOwned + 'static,
-// <S as Serializer<D>>::Error: Debug + Display,
-// {
-//     type Error = SqliteStorageError<<S as Serializer<D>>::Error>;
-
-//     fn remove_dialogue(
-//         self: Arc<Self>,
-//         chat_id: i64,
-//     ) -> BoxFuture<'static, Result<Option<D>, Self::Error>> {
-//         Box::pin(async move {
-//             todo!()
-//         });
-//     }
-
-//     fn update_dialogue(
-//         self: Arc<Self>,
-//         chat_id: i64,
-//         dialogue: D
-//     ) { todo!() }
-// }

tests/sqlite.rs

@@ -1,19 +0,0 @@
-use teloxide::dispatching::dialogue::{
-    serializer::{Bincode, CBOR, JSON},
-    SqliteStorage, SqliteStorageLocation::InMemory
-};
-
-#[tokio::test]
-async fn test_sqlite_json() {
-    let _storage = SqliteStorage::open(InMemory, JSON).await.unwrap();
-}
-
-#[tokio::test]
-async fn test_sqlite_cbor() {
-    let _storage = SqliteStorage::open(InMemory, CBOR).await.unwrap();
-}
-
-#[tokio::test]
-async fn test_sqlite_bincode() {
-    let _storage = SqliteStorage::open(InMemory, Bincode).await.unwrap();
-}