fix: sqlite provider import sub doc db file (#2991)

Co-authored-by: Alex Yang <himself65@outlook.com>

packages/native/src/sqlite/mod.rs

@@ -232,29 +232,40 @@ impl SqliteConnection {
 
   #[napi]
   pub async fn validate(path: String) -> bool {
-    if let Ok(pool) = SqlitePoolOptions::new()
+    let pool = match SqlitePoolOptions::new()
       .max_connections(1)
       .connect(&path)
       .await
     {
-      if let Ok(res) = sqlx::query("SELECT name FROM sqlite_master WHERE type='table'")
-        .fetch_all(&pool)
-        .await
-      {
-        let names = res.iter().map(|row| row.get(0));
-        names.fold(0, |acc, cur: String| {
-          if cur == "updates" || cur == "blobs" {
-            acc + 1
-          } else {
-            acc
-          }
-        }) == 2
-      } else {
-        false
+      Ok(pool) => pool,
+      Err(_) => return false,
+    };
+
+    let tables_res = sqlx::query("SELECT name FROM sqlite_master WHERE type='table'")
+      .fetch_all(&pool)
+      .await;
+
+    let tables_exist = match tables_res {
+      Ok(res) => {
+        let names: Vec<String> = res.iter().map(|row| row.get(0)).collect();
+        names.contains(&"updates".to_string()) && names.contains(&"blobs".to_string())
       }
-    } else {
-      false
-    }
+      Err(_) => return false,
+    };
+
+    let columns_res = sqlx::query("PRAGMA table_info(updates)")
+      .fetch_all(&pool)
+      .await;
+
+    let columns_exist = match columns_res {
+      Ok(res) => {
+        let names: Vec<String> = res.iter().map(|row| row.get(1)).collect();
+        names.contains(&"data".to_string()) && names.contains(&"doc_id".to_string())
+      }
+      Err(_) => return false,
+    };
+
+    tables_exist && columns_exist
   }
 
   // todo: have a better way to handle migration

packages/workspace/src/providers/sqlite-providers.ts

@@ -173,17 +173,18 @@ export const createSQLiteDBDownloadProvider: DocProviderCreator = (
       Y.applyUpdate(doc, updates, sqliteOrigin);
     }
 
-    const diff = Y.encodeStateAsUpdate(doc, updates);
+    const mergedUpdates = Y.encodeStateAsUpdate(doc);
 
     // also apply updates to sqlite
-    await apis.db.applyDocUpdate(id, diff, subdocId);
+    await apis.db.applyDocUpdate(id, mergedUpdates, subdocId);
 
     return true;
   }
 
   async function syncAllUpdates(doc: Doc) {
     if (await syncUpdates(doc)) {
-      const subdocs = Array.from(doc.subdocs).filter(d => d.shouldLoad);
+      // load all subdocs
+      const subdocs = Array.from(doc.subdocs);
       await Promise.all(subdocs.map(syncAllUpdates));
     }
   }
@@ -198,7 +199,7 @@ export const createSQLiteDBDownloadProvider: DocProviderCreator = (
       disconnected = true;
     },
     sync: async () => {
-      logger.info('connect indexeddb provider', id);
+      logger.info('connect sqlite download provider', id);
       try {
         await syncAllUpdates(rootDoc);
         _resolve();