chore: Restore db migrations

7 files changed, 12 insertions, 8 deletions

diff --git a/crates/turtle/src/atuin_client/database.rs b/crates/turtle/src/atuin_client/database.rs
index 75b1200c..27f46da5 100644
--- a/crates/turtle/src/atuin_client/database.rs
+++ b/crates/turtle/src/atuin_client/database.rs
@@ -233,7 +233,7 @@ impl Sqlite {
     async fn setup_db(pool: &SqlitePool) -> Result<()> {
         debug!("running sqlite database setup");
 
-        sqlx::migrate!("./migrations").run(pool).await?;
+        sqlx::migrate!("./db/client-migrations").run(pool).await?;
 
         Ok(())
     }
diff --git a/crates/turtle/src/atuin_client/meta.rs b/crates/turtle/src/atuin_client/meta.rs
index 1eea7061..2fbfe275 100644
--- a/crates/turtle/src/atuin_client/meta.rs
+++ b/crates/turtle/src/atuin_client/meta.rs
@@ -61,7 +61,9 @@ impl MetaStore {
             .connect_with(opts)
             .await?;
 
-        sqlx::migrate!("./meta-migrations").run(&pool).await?;
+        sqlx::migrate!("./db/client-meta-migrations")
+            .run(&pool)
+            .await?;
 
         // Session tokens are stored in this database, so restrict permissions.
         #[cfg(unix)]
diff --git a/crates/turtle/src/atuin_client/record/sqlite_store.rs b/crates/turtle/src/atuin_client/record/sqlite_store.rs
index 5fab999d..03f82d13 100644
--- a/crates/turtle/src/atuin_client/record/sqlite_store.rs
+++ b/crates/turtle/src/atuin_client/record/sqlite_store.rs
@@ -66,7 +66,9 @@ impl SqliteStore {
     async fn setup_db(pool: &SqlitePool) -> Result<()> {
         debug!("running sqlite database setup");
 
-        sqlx::migrate!("./record-migrations").run(pool).await?;
+        sqlx::migrate!("./db/client-record-migrations")
+            .run(pool)
+            .await?;
 
         Ok(())
     }
diff --git a/crates/turtle/src/atuin_daemon/mod.rs b/crates/turtle/src/atuin_daemon/mod.rs
index b05eb95c..aff33307 100644
--- a/crates/turtle/src/atuin_daemon/mod.rs
+++ b/crates/turtle/src/atuin_daemon/mod.rs
@@ -14,14 +14,14 @@ pub mod semantic;
 pub mod server;
 
 // Re-export core daemon types for convenience
-pub use daemon::{Component, Daemon, DaemonBuilder, DaemonHandle};
+pub use daemon::Daemon;
 pub use events::DaemonEvent;
 
 // Re-export components
 pub use components::{HistoryComponent, SearchComponent, SemanticComponent, SyncComponent};
 
 // Re-export client helpers
-pub use client::{ControlClient, SemanticClient, emit_event, emit_event_with_settings};
+pub use client::SemanticClient;
 
 /// Boot the daemon using the new component-based architecture.
 ///
diff --git a/crates/turtle/src/atuin_server/settings.rs b/crates/turtle/src/atuin_server/settings.rs
index f6650af0..2bce0dac 100644
--- a/crates/turtle/src/atuin_server/settings.rs
+++ b/crates/turtle/src/atuin_server/settings.rs
@@ -66,7 +66,7 @@ impl Settings {
         config_file.push("server.toml");
 
         // create the config file if it does not exist
-        let mut config_builder = Config::builder()
+        let config_builder = Config::builder()
             .set_default("host", "127.0.0.1")?
             .set_default("port", 8888)?
             .set_default("open_registration", false)?
diff --git a/crates/turtle/src/atuin_server_postgres/mod.rs b/crates/turtle/src/atuin_server_postgres/mod.rs
index f506cf25..96bcb7c2 100644
--- a/crates/turtle/src/atuin_server_postgres/mod.rs
+++ b/crates/turtle/src/atuin_server_postgres/mod.rs
@@ -62,7 +62,7 @@ impl Database for Postgres {
             ))));
         }
 
-        sqlx::migrate!("./migrations")
+        sqlx::migrate!("./db/server-pg-migrations")
             .run(&pool)
             .await
             .map_err(|error| DbError::Other(error.into()))?;
diff --git a/crates/turtle/src/atuin_server_sqlite/mod.rs b/crates/turtle/src/atuin_server_sqlite/mod.rs
index 3470a2f1..bc40db3f 100644
--- a/crates/turtle/src/atuin_server_sqlite/mod.rs
+++ b/crates/turtle/src/atuin_server_sqlite/mod.rs
@@ -31,7 +31,7 @@ impl Database for Sqlite {
 
         let pool = SqlitePoolOptions::new().connect_with(opts).await?;
 
-        sqlx::migrate!("./migrations")
+        sqlx::migrate!("./db/server-sqlite-migrations")
             .run(&pool)
             .await
             .map_err(|error| DbError::Other(error.into()))?;