Review pass
This commit is contained in:
parent
2a05930ae7
commit
99fa298b92
1 changed files with 621 additions and 94 deletions
|
|
@ -1,8 +1,8 @@
|
|||
use super::{
|
||||
Database, Transaction,
|
||||
models::{
|
||||
DocumentId, EventBatch, FileManifest, StoredDocumentVersion, VaultId, VaultSnapshot,
|
||||
VaultUpdateId,
|
||||
DocumentId, DocumentVersionWithoutContent, EventBatch, FileManifest, StoredDocumentVersion,
|
||||
VaultId, VaultSnapshot, VaultUpdateId,
|
||||
},
|
||||
};
|
||||
use anyhow::{Result, ensure};
|
||||
|
|
@ -99,8 +99,10 @@ impl Database {
|
|||
let head_event_id = Self::latest_event_id(&mut tx).await?;
|
||||
let file_manifest = Self::current_file_manifest(&mut tx).await?;
|
||||
|
||||
let versions = sqlx::query_as::<_, StoredDocumentVersion>(
|
||||
"SELECT d.* FROM latest_document_versions d
|
||||
let documents = sqlx::query_as::<_, DocumentVersionWithoutContent>(
|
||||
"SELECT d.vault_update_id, d.document_id, d.updated_date, d.user_id, d.device_id,
|
||||
length(d.content) AS content_size
|
||||
FROM latest_document_versions d
|
||||
JOIN file_manifest_entries m ON m.document_id = d.document_id
|
||||
WHERE m.file_manifest_id = ? ORDER BY d.vault_update_id",
|
||||
)
|
||||
|
|
@ -108,8 +110,6 @@ impl Database {
|
|||
.fetch_all(&mut *tx)
|
||||
.await?;
|
||||
|
||||
let documents = versions.into_iter().map(Into::into).collect();
|
||||
|
||||
Ok(VaultSnapshot {
|
||||
head_event_id,
|
||||
file_manifest,
|
||||
|
|
|
|||
Loading…
Reference in a new issue