Return new & smar rename
This commit is contained in:
parent
3cfe095fa7
commit
5707add47c
5 changed files with 70 additions and 36 deletions
|
|
@ -443,6 +443,7 @@ impl Database {
|
|||
r#"
|
||||
select
|
||||
vault_update_id,
|
||||
creation_vault_update_id,
|
||||
document_id as "document_id: Hyphenated",
|
||||
relative_path,
|
||||
updated_date as "updated_date: chrono::DateTime<Utc>",
|
||||
|
|
@ -474,6 +475,7 @@ impl Database {
|
|||
user_id: row.user_id,
|
||||
device_id: row.device_id,
|
||||
content_size: row.content_size.unwrap_or(0),
|
||||
is_new_file: row.creation_vault_update_id == row.vault_update_id,
|
||||
})
|
||||
.collect()
|
||||
})
|
||||
|
|
@ -491,6 +493,7 @@ impl Database {
|
|||
r#"
|
||||
select
|
||||
vault_update_id,
|
||||
creation_vault_update_id,
|
||||
document_id as "document_id: Hyphenated",
|
||||
relative_path,
|
||||
updated_date as "updated_date: chrono::DateTime<Utc>",
|
||||
|
|
@ -526,6 +529,7 @@ impl Database {
|
|||
user_id: row.user_id,
|
||||
device_id: row.device_id,
|
||||
content_size: row.content_size.unwrap_or(0),
|
||||
is_new_file: row.creation_vault_update_id == row.vault_update_id,
|
||||
})
|
||||
.collect()
|
||||
})
|
||||
|
|
@ -750,6 +754,7 @@ impl Database {
|
|||
r#"
|
||||
select
|
||||
vault_update_id,
|
||||
creation_vault_update_id,
|
||||
document_id as "document_id: Hyphenated",
|
||||
relative_path,
|
||||
updated_date as "updated_date: chrono::DateTime<Utc>",
|
||||
|
|
@ -783,6 +788,7 @@ impl Database {
|
|||
user_id: row.user_id,
|
||||
device_id: row.device_id,
|
||||
content_size: row.content_size.unwrap_or(0),
|
||||
is_new_file: row.creation_vault_update_id == row.vault_update_id,
|
||||
})
|
||||
.collect()
|
||||
})
|
||||
|
|
@ -805,6 +811,7 @@ impl Database {
|
|||
user_id: row.user_id,
|
||||
device_id: row.device_id,
|
||||
content_size: row.content_size.unwrap_or(0),
|
||||
is_new_file: row.creation_vault_update_id == row.vault_update_id,
|
||||
};
|
||||
|
||||
if let Some(before) = before_update_id {
|
||||
|
|
@ -813,6 +820,7 @@ impl Database {
|
|||
r#"
|
||||
select
|
||||
vault_update_id,
|
||||
creation_vault_update_id,
|
||||
document_id as "document_id: Hyphenated",
|
||||
relative_path,
|
||||
updated_date as "updated_date: chrono::DateTime<Utc>",
|
||||
|
|
@ -845,6 +853,7 @@ impl Database {
|
|||
r#"
|
||||
select
|
||||
vault_update_id,
|
||||
creation_vault_update_id,
|
||||
document_id as "document_id: Hyphenated",
|
||||
relative_path,
|
||||
updated_date as "updated_date: chrono::DateTime<Utc>",
|
||||
|
|
|
|||
|
|
@ -46,10 +46,14 @@ pub struct DocumentVersionWithoutContent {
|
|||
|
||||
#[ts(type = "number")]
|
||||
pub content_size: u64,
|
||||
|
||||
/// True iff this is the first version of the document
|
||||
pub is_new_file: bool,
|
||||
}
|
||||
|
||||
impl From<StoredDocumentVersion> for DocumentVersionWithoutContent {
|
||||
fn from(value: StoredDocumentVersion) -> Self {
|
||||
let is_new_file = value.creation_vault_update_id == value.vault_update_id;
|
||||
Self {
|
||||
vault_update_id: value.vault_update_id,
|
||||
document_id: value.document_id,
|
||||
|
|
@ -59,6 +63,7 @@ impl From<StoredDocumentVersion> for DocumentVersionWithoutContent {
|
|||
user_id: value.user_id,
|
||||
device_id: value.device_id,
|
||||
content_size: value.content.len() as u64,
|
||||
is_new_file,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -82,6 +87,7 @@ pub struct DocumentVersion {
|
|||
#[derive(Debug)]
|
||||
pub struct VaultHistoryRow {
|
||||
pub vault_update_id: VaultUpdateId,
|
||||
pub creation_vault_update_id: VaultUpdateId,
|
||||
pub document_id: DocumentId,
|
||||
pub relative_path: String,
|
||||
pub updated_date: DateTime<Utc>,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue