Add view to fix deduplication

README.md

@@ -35,7 +35,6 @@
 - add clap
 - add auth middleware
 - add request logs
-- the is deleted logic is bad and we'll always read the previous  version instead of the deleted
 - CI for:
     - publish reconcile
     - cross-platform build server

backend/sync_server/src/database.rs

@@ -64,23 +64,16 @@ impl Database {
             DocumentVersionWithoutContent,
             r#"
             select 
-                d.vault_id,
+                vault_id,
-                d.document_id as "document_id: uuid::Uuid", 
+                document_id as "document_id: uuid::Uuid", 
-                d.version_id, 
+                version_id, 
                 created_date as "created_date: chrono::DateTime<Utc>",
                 updated_date as "updated_date: chrono::DateTime<Utc>",
-                d.relative_path,
+                relative_path,
-                d.is_binary,
+                is_binary,
-                d.is_deleted
+                is_deleted
-            from documents d
+            from latest_documents
-            where d.vault_id = ? 
+            where is_deleted = false and vault_id = ?
-                and d.is_deleted = false 
-                and d.version_id = (
-                    SELECT MAX(sub.version_id)
-                    FROM documents sub
-                    WHERE sub.vault_id = d.vault_id
-                        AND sub.document_id = d.document_id
-                )
             "#,
             vault,
         );
@@ -112,10 +105,8 @@ impl Database {
                 content,
                 is_binary,
                 is_deleted
-            from documents
+            from latest_documents
             where vault_id = ? and document_id = ?
-            ORDER BY version_id DESC
-            LIMIT 1
             "#,
             vault,
             document
@@ -148,10 +139,8 @@ impl Database {
                 content,
                 is_binary,
                 is_deleted
-            from documents
+            from latest_documents
             where vault_id = ? and relative_path = ? and is_deleted = false
-            ORDER BY version_id DESC
-            LIMIT 1
             "#,
             vault,
             relative_path
@@ -207,7 +196,17 @@ impl Database {
     ) -> Result<()> {
         let query = sqlx::query!(
             r#"
-            insert into documents (vault_id, document_id, version_id, created_date, updated_date, relative_path, content, is_binary, is_deleted)
+            insert into documents (
+            vault_id,
+                document_id,
+                version_id,
+                created_date,
+                updated_date,
+                relative_path,
+                content,
+                is_binary,
+                is_deleted
+            )
             values (?, ?, ?, ?, ?, ?, ?, ?, ?)
             "#,
             version.vault_id,

backend/sync_server/src/database/migrations/20241207143519_bootstrap.sql

@@ -10,3 +10,18 @@ CREATE TABLE IF NOT EXISTS documents (
     is_deleted BOOLEAN NOT NULL,
     PRIMARY KEY (vault_id, document_id, version_id)
 );
+
+CREATE VIEW IF NOT EXISTS latest_documents AS
+SELECT d.*
+FROM documents d
+INNER JOIN (
+    SELECT vault_id, document_id, MAX(version_id) AS max_version_id
+    FROM documents
+    GROUP BY vault_id, document_id
+) max_versions
+ON d.vault_id = max_versions.vault_id
+AND d.document_id = max_versions.document_id
+AND d.version_id = max_versions.max_version_id;
+
+CREATE INDEX IF NOT EXISTS idx_documents_vault_doc
+ON documents (vault_id, document_id);