diff options
| author | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2026-06-11 00:54:30 +0200 |
|---|---|---|
| committer | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2026-06-11 00:54:30 +0200 |
| commit | 5c39e7cf284a1f6e9a1657f2deb44e359fc47eb8 (patch) | |
| tree | c64baa8d5866c8e339eaf660dd3f94f30a3f7d8a /crates/atuin-server-sqlite/src | |
| parent | chore: Somewhat simplify sync code (diff) | |
| download | atuin-5c39e7cf284a1f6e9a1657f2deb44e359fc47eb8.zip | |
chore: Move everything into one big crate
That helps remove duplicated code and rustc/cargo will now also show
dead code correctly.
Diffstat (limited to '')
| -rw-r--r-- | crates/turtle/src/atuin_server_sqlite/mod.rs (renamed from crates/atuin-server-sqlite/src/lib.rs) | 16 | ||||
| -rw-r--r-- | crates/turtle/src/atuin_server_sqlite/wrappers.rs (renamed from crates/atuin-server-sqlite/src/wrappers.rs) | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/crates/atuin-server-sqlite/src/lib.rs b/crates/turtle/src/atuin_server_sqlite/mod.rs index 56ed9b6c..3470a2f1 100644 --- a/crates/atuin-server-sqlite/src/lib.rs +++ b/crates/turtle/src/atuin_server_sqlite/mod.rs @@ -1,11 +1,11 @@ use std::str::FromStr; -use async_trait::async_trait; -use atuin_common::record::{EncryptedData, HostId, Record, RecordIdx, RecordStatus}; -use atuin_server_database::{ +use crate::atuin_common::record::{EncryptedData, HostId, Record, RecordIdx, RecordStatus}; +use crate::atuin_server_database::{ Database, DbError, DbResult, DbSettings, into_utc, models::{History, NewHistory, NewSession, NewUser, Session, User}, }; +use async_trait::async_trait; use futures_util::TryStreamExt; use sqlx::{ Row, @@ -203,7 +203,7 @@ impl Database for Sqlite { // edge case. let res = sqlx::query( - "select client_id from history + "select client_id from history where user_id = $1 and deleted_at is not null", ) @@ -233,11 +233,11 @@ impl Database for Sqlite { let mut tx = self.pool.begin().await?; for i in records { - let id = atuin_common::utils::uuid_v7(); + let id = crate::atuin_common::utils::uuid_v7(); sqlx::query( "insert into store - (id, client_id, host, idx, timestamp, version, tag, data, cek, user_id) + (id, client_id, host, idx, timestamp, version, tag, data, cek, user_id) values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) on conflict do nothing ", @@ -394,7 +394,7 @@ impl Database for Sqlite { sqlx::query( "insert into history - (client_id, user_id, hostname, timestamp, data) + (client_id, user_id, hostname, timestamp, data) values ($1, $2, $3, $4, $5) on conflict do nothing ", @@ -416,7 +416,7 @@ impl Database for Sqlite { #[instrument(skip_all)] async fn oldest_history(&self, user: &User) -> DbResult<History> { sqlx::query_as( - "select id, client_id, user_id, hostname, timestamp, data, created_at from history + "select id, client_id, user_id, hostname, timestamp, data, created_at from history where user_id = $1 order by timestamp asc limit 1", diff --git a/crates/atuin-server-sqlite/src/wrappers.rs b/crates/turtle/src/atuin_server_sqlite/wrappers.rs index 2f1230c2..5aa7a982 100644 --- a/crates/atuin-server-sqlite/src/wrappers.rs +++ b/crates/turtle/src/atuin_server_sqlite/wrappers.rs @@ -1,6 +1,6 @@ use ::sqlx::{FromRow, Result}; -use atuin_common::record::{EncryptedData, Host, Record}; -use atuin_server_database::models::{History, Session, User}; +use crate::atuin_common::record::{EncryptedData, Host, Record}; +use crate::atuin_server_database::models::{History, Session, User}; use sqlx::{Row, sqlite::SqliteRow}; pub struct DbUser(pub User); |
