Merge pull request #11 from outof-coffee/shuttle-fixes

fix: issues with shuttle updates

Author: tsal

.gitignore

@@ -3,4 +3,5 @@ Cargo.lock
 Secrets.toml
 .idea
 dross-manager-frontend/.vscode/
-.vscode/*
+.vscode/*
+dross-manager.db

Cargo.toml

@@ -7,7 +7,8 @@ edition = "2021"
 
 [dependencies]
 axum = { version = "0.7.4", features = ["http2"] }
-libsql = { git = "https://github.com/tursodatabase/libsql" }
+#libsql = { git = "https://github.com/tursodatabase/libsql" }
+libsql = "0.2.0"
 serde = { version = "1.0.196", features = ["derive"] }
 shuttle-axum = { version = "0.40.0" }
 shuttle-runtime = "0.40.0"

src/faery.rs

@@ -1,17 +1,17 @@
 use std::sync::Arc;
-use libsql::{Row, params, Database};
+use libsql::{Row, params, Database, Connection};
 use serde::{Deserialize, Serialize};
 use tokio::sync::Mutex;
 use crate::dross::{DrossError, DrossHolder, DrossResult};
 use crate::repository::{Repository, RepositoryError, RepositoryItem, RepositoryResult};
 
 #[derive(Clone)]
 pub struct FaeryRepository {
-    db: Arc<Mutex<Database>>,
+    db: Arc<Mutex<Connection>>,
 }
 
 impl FaeryRepository {
-    pub fn new(db: Arc<Mutex<Database>>) -> FaeryRepository {
+    pub fn new(db: Arc<Mutex<Connection>>) -> FaeryRepository {
         FaeryRepository {
             db,
         }
@@ -67,7 +67,7 @@ impl Repository for FaeryRepository {
     }
 
     async fn save(&self, faery: Faery) -> RepositoryResult<i64> {
-        let db = self.db.lock().await.connect().unwrap();
+        let db = self.db.lock().await;
         let result = match faery.id {
             Some(id) => {
                 let mut stmt = db.prepare("UPDATE faeries SET name = ?1, is_admin = ?2, email = ?3, dross = ?4 WHERE id = ?5").await.unwrap();
@@ -79,20 +79,20 @@ impl Repository for FaeryRepository {
             },
         };
         match result {
-            Ok(_) => Ok(db.last_insert_rowid().await),
+            Ok(_) => Ok(db.last_insert_rowid()),
             Err(_) => Err(RepositoryError::Other),
         }
     }
 
     // Mark: Faery
     async fn get(&self, id: i64) -> RepositoryResult<Faery> {
-        let db = self.db.lock().await.connect().unwrap();
+        let db = self.db.lock().await;
         let mut stmt = db
             .prepare("SELECT * FROM faeries WHERE id = ?1")
             .await
             .unwrap();
         let mut res = stmt.query([id]).await.unwrap();
-        match res.next().await.unwrap() {
+        match res.next().unwrap() {
             Some(row) => {
                 let faery = Faery::from_response(&row);
                 Ok(faery)
@@ -102,7 +102,7 @@ impl Repository for FaeryRepository {
     }
 
     async fn get_all(&self) -> RepositoryResult<Vec<Faery>> {
-        let db = self.db.lock().await.connect().unwrap();
+        let db = self.db.lock().await;
         let result = db.query("SELECT * FROM faeries", ()).await;
         let mut res = match result {
             Ok(res) => res,
@@ -113,7 +113,7 @@ impl Repository for FaeryRepository {
         };
 
         let mut faeries: Vec<Faery> = Vec::new();
-        while let Ok(result_row) = res.next().await {
+        while let Ok(result_row) = res.next() {
             match result_row {
                 Some(row) => {
                     faeries.push(Faery::from_response(&row));
@@ -125,7 +125,7 @@ impl Repository for FaeryRepository {
     }
 
     async fn delete(&self, id: i64) -> RepositoryResult<()> {
-        let db = self.db.lock().await.connect().unwrap();
+        let db = self.db.lock().await;
         let result = db.execute("DELETE FROM faeries WHERE id = ?1", [id]).await;
         match result {
             Ok(_) => Ok(()),
@@ -134,7 +134,7 @@ impl Repository for FaeryRepository {
     }
 
     async fn create_table(&self) -> RepositoryResult<()> {
-        let db = self.db.lock().await.connect().unwrap();
+        let db = self.db.lock().await;
         let result = db.execute(
             r#"CREATE TABLE IF NOT EXISTS faeries (
     id INTEGER PRIMARY KEY,
@@ -150,7 +150,7 @@ impl Repository for FaeryRepository {
     }
 
     async fn drop_table(&self) -> RepositoryResult<()> {
-        let db = self.db.lock().await.connect().unwrap();
+        let db = self.db.lock().await;
         let result = db.execute("DROP TABLE IF EXISTS faeries", ()).await;
         match result {
             Ok(_) => Ok(()),

src/main.rs

@@ -8,7 +8,8 @@ mod version;
 use std::net::SocketAddr;
 use axum::{routing::get, Router};
 use tower_http::services::ServeDir;
-use libsql::Builder;
+// use libsql::Builder;
+use libsql::{Database, Connection};
 use std::sync::Arc;
 use tokio::sync::Mutex;
 use http::{Method};
@@ -32,17 +33,17 @@ async fn hello_world() -> &'static str {
 async fn axum(
     #[shuttle_secrets::Secrets] store: shuttle_secrets::SecretStore,
     // TODO: Remove entirely or replace with a real connection once shuttle_turso is fixed
-    // #[shuttle_turso::Turso(
-    //     addr = "",
-    //     token = ""
-    // )] turso: Connection
+    #[shuttle_turso::Turso(
+        addr = "{secrets.TURSO_URL}",
+        token = "{secrets.TURSO_TOKEN}"
+    )] turso: Connection
 ) -> Result<DrossManagerService, shuttle_runtime::Error> {
 
     let turso_addr = store.get("TURSO_URL").unwrap();
     let turso_token = store.get("TURSO_TOKEN").unwrap();
-    let db = Builder::new_remote(turso_addr, turso_token).build().await.unwrap();
+    // let db = Builder::new_remote(turso_addr, turso_token).build().await.unwrap();
 
-    let db = Arc::new(Mutex::new(db));
+    let db = Arc::new(Mutex::new(turso));
     let state = Arc::new(DrossManagerState {
         faery_repository: Arc::new(faery::FaeryRepository::new(db.clone())),
     });

src/migrations.rs

@@ -1,5 +1,5 @@
 use std::sync::Arc;
-use libsql::Database;
+use libsql::{Connection, Database};
 use serde::{Deserialize, Serialize};
 use crate::version::VERSION;
 use semver::{Version, VersionReq};
@@ -113,12 +113,12 @@ impl RepositoryItem for MigrationData {
 
 #[derive(Clone)]
 pub struct Manager {
-    db: Arc<Mutex<Database>>,
+    db: Arc<Mutex<Connection>>,
     faery_repository: Arc<FaeryRepository>,
 }
 
 impl Manager {
-    pub fn new(db: Arc<Mutex<Database>>, faery_repository: Arc<FaeryRepository>) -> Manager {
+    pub fn new(db: Arc<Mutex<Connection>>, faery_repository: Arc<FaeryRepository>) -> Manager {
         Manager {
             db,
             faery_repository
@@ -220,7 +220,7 @@ impl Manager {
         match migration {
             Ok(_) => {
                 log::info!("Updating Faeries database");
-                let db = self.db.lock().await.connect().unwrap();
+                let db = self.db.lock().await;
                 let result = db.execute(
                     "ALTER TABLE faeries DROP COLUMN auth_token",
                     ()
@@ -283,7 +283,7 @@ impl Repository for Manager {
     }
 
     async fn save(&self, item: MigrationData) -> RepositoryResult<i64> {
-        let db = self.db.lock().await.connect().unwrap();
+        let db = self.db.lock().await;
         log::info!("Saving migration: {:?}", item);
         let insert_item = item.clone();
         let result = db.execute(
@@ -308,14 +308,14 @@ impl Repository for Manager {
     }
 
     async fn get(&self, _: i64) -> RepositoryResult<MigrationData> {
-        let db = self.db.lock().await.connect().unwrap();
+        let db = self.db.lock().await;
         let result = db.query(
             "SELECT current_version, target_version FROM migrations WHERE id = 0",
             ()
         ).await;
         match result {
             Ok(mut rows) => {
-                let result = rows.next().await;
+                let result = rows.next();
                 match result {
                     Ok(Some(row)) => {
                         let current_version: String = row.get(0).unwrap();
@@ -344,7 +344,7 @@ impl Repository for Manager {
     }
 
     async fn create_table(&self) -> RepositoryResult<()> {
-        let db = self.db.lock().await.connect().unwrap();
+        let db = self.db.lock().await;
         let result = db.execute(
             "CREATE TABLE IF NOT EXISTS migrations (
                     id INTEGER PRIMARY KEY CHECK (id = 0),