π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[rust][photos] Route SQLite imports through db
laurenspriem29a153a90530
diff --git a/rust/crates/photos/src/db.rs b/rust/crates/photos/src/db.rsindex 66fe5cba7b..eb42e3a77f 100644--- a/rust/crates/photos/src/db.rs+++ b/rust/crates/photos/src/db.rs@@ -3,9 +3,11 @@ use std::path::Path;use std::sync::{Condvar, Mutex, MutexGuard, PoisonError};use std::time::Duration;-pub use rusqlite;--use rusqlite::{Connection, OpenFlags, Result, Transaction, TransactionBehavior};+use rusqlite::OpenFlags;+pub use rusqlite::{+ Connection, Error, OptionalExtension, Params, Result, Row, ToSql, Transaction,+ TransactionBehavior, params_from_iter, types::FromSql,+};const BUSY_TIMEOUT: Duration = Duration::from_secs(30);diff --git a/rust/crates/photos/src/ml_db/migrations.rs b/rust/crates/photos/src/ml_db/migrations.rsindex eed97c5b83..0f11bb2d59 100644--- a/rust/crates/photos/src/ml_db/migrations.rs+++ b/rust/crates/photos/src/ml_db/migrations.rs@@ -1,4 +1,4 @@-use rusqlite::{Connection, TransactionBehavior};+use crate::db::{Connection, TransactionBehavior};use super::{Error, Result};@@ -37,8 +37,7 @@ mod tests {use std::sync::Barrier;use std::thread;- use crate::db::{Database, OpenOptions};- use rusqlite::Connection;+ use crate::db::{Connection, Database, OpenOptions, Result as SqliteResult};use super::migrate;use crate::ml_db::{Error, Result};@@ -112,7 +111,7 @@ mod tests {.unwrap().query_map((), |row| row.get::<_, String>(0)).unwrap()- .collect::<rusqlite::Result<Vec<_>>>()+ .collect::<SqliteResult<Vec<_>>>().unwrap();assert_eq!(version, 1);assert_eq!(columns, ["id"]);diff --git a/rust/crates/photos/src/ml_db/mod.rs b/rust/crates/photos/src/ml_db/mod.rsindex 7426d3049b..3e1c791f91 100644--- a/rust/crates/photos/src/ml_db/mod.rs+++ b/rust/crates/photos/src/ml_db/mod.rs@@ -6,7 +6,7 @@ mod vector_encoding;use std::num::NonZeroUsize;use std::path::Path;-use crate::db::{Database, OpenOptions};+use crate::db::{self, Database, OpenOptions};pub use queries::clip::{CLIP_EMBEDDING_BYTES_LENGTH, CLIP_EMBEDDING_DIMENSIONS, CLIP_ML_VERSION, ClipEmbedding,@@ -28,7 +28,7 @@ pub use vector_encoding::{decode_evector, decode_f32, encode_evector, encode_f32#[derive(Debug, thiserror::Error)]pub enum Error {#[error(transparent)]- Database(#[from] rusqlite::Error),+ Database(#[from] db::Error),#[error("currentVersion({current}) cannot be greater than toVersion({target})")]Downgrade { current: i64, target: i64 },#[error("{0}")]@@ -99,7 +99,7 @@ mod tests {use super::queries::clip::tests::full_clip;use super::queries::{caches, clip, clusters, faces, filedata, persons, pets};use super::{Error, MlDb, TARGET_VERSION};- use rusqlite::Connection;+ use crate::db::Connection;use tempfile::TempDir;type Query<T> = fn(&MlDb) -> Result<T, Error>;diff --git a/rust/crates/photos/src/ml_db/queries/caches.rs b/rust/crates/photos/src/ml_db/queries/caches.rsindex d9a913ffb1..009e25d3b9 100644--- a/rust/crates/photos/src/ml_db/queries/caches.rs+++ b/rust/crates/photos/src/ml_db/queries/caches.rs@@ -90,8 +90,8 @@ fn now_millis() -> i64 {#[cfg(test)]pub(in crate::ml_db) mod tests {use super::MlDb;+ use crate::db::Connection;use crate::ml_db::tests::{cases, check, open};- use rusqlite::Connection;use tempfile::TempDir;pub(in crate::ml_db) fn seed(db: &MlDb) {diff --git a/rust/crates/photos/src/ml_db/queries/clusters.rs b/rust/crates/photos/src/ml_db/queries/clusters.rsindex a4dc7a2195..73e29636d1 100644--- a/rust/crates/photos/src/ml_db/queries/clusters.rs+++ b/rust/crates/photos/src/ml_db/queries/clusters.rs@@ -4,7 +4,7 @@ use std::num::NonZeroUsize;use super::helpers::{MAX_SQL_BIND_PARAMS_PER_QUERY, bind_placeholders, group_into, optional_parameter, pair,};-use rusqlite::{Result as SqliteResult, Row, params_from_iter};+use crate::db::{Result as SqliteResult, Row, params_from_iter};use super::faces::{file_id_from_face_id, is_bad_face_for_clustering};use super::unique_in_order;diff --git a/rust/crates/photos/src/ml_db/queries/faces.rs b/rust/crates/photos/src/ml_db/queries/faces.rsindex 2d983a2ce1..cdf50c527c 100644--- a/rust/crates/photos/src/ml_db/queries/faces.rs+++ b/rust/crates/photos/src/ml_db/queries/faces.rs@@ -4,7 +4,7 @@ use std::num::NonZeroUsize;use super::helpers::{MAX_SQL_BIND_PARAMS_PER_QUERY, bind_placeholders, group_into, optional_parameter, pair,};-use rusqlite::{Result as SqliteResult, Row, ToSql, params_from_iter};+use crate::db::{Result as SqliteResult, Row, ToSql, params_from_iter};use super::clip::CLIP_ML_VERSION;use super::pets::PET_ML_VERSION;diff --git a/rust/crates/photos/src/ml_db/queries/helpers.rs b/rust/crates/photos/src/ml_db/queries/helpers.rsindex 486bd8d577..1d82e53d05 100644--- a/rust/crates/photos/src/ml_db/queries/helpers.rs+++ b/rust/crates/photos/src/ml_db/queries/helpers.rs@@ -2,9 +2,8 @@ use std::collections::HashMap;use std::hash::Hash;use std::num::NonZeroUsize;-use rusqlite::{- OptionalExtension, Params, Result, Row, ToSql, TransactionBehavior, params_from_iter,- types::FromSql,+use crate::db::{+ FromSql, OptionalExtension, Params, Result, Row, ToSql, TransactionBehavior, params_from_iter,};use crate::ml_db::MlDb;diff --git a/rust/crates/photos/src/ml_db/queries/pets.rs b/rust/crates/photos/src/ml_db/queries/pets.rsindex c30b355afb..72ccb46de9 100644--- a/rust/crates/photos/src/ml_db/queries/pets.rs+++ b/rust/crates/photos/src/ml_db/queries/pets.rs@@ -2,7 +2,7 @@ use std::collections::HashMap;use std::num::NonZeroUsize;use super::helpers::{bind_placeholders, pair};-use rusqlite::{Result as SqliteResult, Row, params_from_iter};+use crate::db::{Result as SqliteResult, Row, params_from_iter};use super::unique_in_order;use crate::ml_db::{MlDb, Result};