andras/vault-link
andras/vault-link
1
0
Fork 0
Code Issues Pull requests 19 Projects Releases 55 Packages Wiki Activity Actions 28

Use string uuids

Browse source
This commit is contained in:
Andras Schmelczer 2025-03-15 10:48:17 +00:00
commit d799a1da0c
No known key found for this signature in database
GPG key ID: FC8F2C3D3D1A718C
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
backend/sync_server/src/database.rs
View file

@ -7,6 +7,7 @@ use models::{
use sqlx::{sqlite::SqliteConnectOptions, types::chrono::Utc}; use sqlx::{sqlite::SqliteConnectOptions, types::chrono::Utc};
pub mod models; pub mod models;
use sqlx::{Pool, Sqlite, sqlite::SqlitePoolOptions}; use sqlx::{Pool, Sqlite, sqlite::SqlitePoolOptions};
use uuid::fmt::Hyphenated;
use crate::config::database_config::DatabaseConfig; use crate::config::database_config::DatabaseConfig;
@ -82,7 +83,7 @@ impl Database {
select select
vault_id, vault_id,
vault_update_id, vault_update_id,
document_id as "document_id: uuid::Uuid", document_id as "document_id: Hyphenated",
relative_path, relative_path,
updated_date as "updated_date: chrono::DateTime<Utc>", updated_date as "updated_date: chrono::DateTime<Utc>",
is_deleted is_deleted
@ -115,7 +116,7 @@ impl Database {
select select
vault_id, vault_id,
vault_update_id, vault_update_id,
document_id as "document_id: uuid::Uuid", document_id as "document_id: Hyphenated",
relative_path, relative_path,
updated_date as "updated_date: chrono::DateTime<Utc>", updated_date as "updated_date: chrono::DateTime<Utc>",
is_deleted is_deleted
@ -172,7 +173,7 @@ impl Database {
select select
vault_id, vault_id,
vault_update_id, vault_update_id,
document_id as "document_id: uuid::Uuid", document_id as "document_id: Hyphenated",
relative_path, relative_path,
updated_date as "updated_date: chrono::DateTime<Utc>", updated_date as "updated_date: chrono::DateTime<Utc>",
content, content,
@ -202,13 +203,14 @@ impl Database {
document_id: &DocumentId, document_id: &DocumentId,
transaction: Option<&mut Transaction<'_>>, transaction: Option<&mut Transaction<'_>>,
) -> Result<Option<StoredDocumentVersion>> { ) -> Result<Option<StoredDocumentVersion>> {
let document_id = document_id.as_hyphenated();
let query = sqlx::query_as!( let query = sqlx::query_as!(
StoredDocumentVersion, StoredDocumentVersion,
r#" r#"
select select
vault_id, vault_id,
vault_update_id, vault_update_id,
document_id as "document_id: uuid::Uuid", document_id as "document_id: Hyphenated",
relative_path, relative_path,
updated_date as "updated_date: chrono::DateTime<Utc>", updated_date as "updated_date: chrono::DateTime<Utc>",
content, content,
@ -240,7 +242,7 @@ impl Database {
select select
vault_id, vault_id,
vault_update_id, vault_update_id,
document_id as "document_id: uuid::Uuid", document_id as "document_id: Hyphenated",
relative_path, relative_path,
updated_date as "updated_date: chrono::DateTime<Utc>", updated_date as "updated_date: chrono::DateTime<Utc>",
content, content,
@ -264,6 +266,7 @@ impl Database {
version: &StoredDocumentVersion, version: &StoredDocumentVersion,
transaction: Option<&mut Transaction<'_>>, transaction: Option<&mut Transaction<'_>>,
) -> Result<()> { ) -> Result<()> {
let document_id = version.document_id.as_hyphenated();
let query = sqlx::query!( let query = sqlx::query!(
r#" r#"
insert into documents ( insert into documents (
@ -279,7 +282,7 @@ impl Database {
"#, "#,
version.vault_id, version.vault_id,
version.vault_update_id, version.vault_update_id,
version.document_id, document_id,
version.relative_path, version.relative_path,
version.updated_date, version.updated_date,
version.content, version.content,