fixup tests for main cr-sqlite build

vlcn-io · Aug 28, 2023 · ce570af · ce570af
1 parent cdc5324
commit ce570af
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/packages/node-allinone/src/__tests__/index.test.ts b/packages/node-allinone/src/__tests__/index.test.ts
@@ -16,7 +16,7 @@ export type Changeset = [
   any, // val,
   Version,
   Version,
-  SiteIDWire // site_id
+  SiteIDWire, // site_id
 ];
 
 // test that we wrapped correctly
@@ -83,7 +83,10 @@ test("failing example", () => {
   const siteid = db1.execA(`SELECT crsql_site_id()`)[0][0];
   db2.transaction(() => {
     for (const cs of changesets) {
-      db2.exec(`INSERT INTO crsql_changes VALUES (?, ?, ?, ?, ?, ?, ?, ?)`, cs);
+      db2.exec(
+        `INSERT INTO crsql_changes VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+        cs
+      );
     }
   });
 
@@ -178,10 +181,11 @@ test("failing two -- discord: https://discord.com/channels/989870439897653248/98
     123,
     1,
     1,
+    0,
   ] as const;
 
   db.exec(
-    `INSERT INTO crsql_changes ("cid", "pk", "site_id", "table", "val", "col_version", "db_version") VALUES (?,?,?,?,?,?,?)`,
+    `INSERT INTO crsql_changes ("cid", "pk", "site_id", "table", "val", "col_version", "db_version", "seq") VALUES (?,?,?,?,?,?,?,?)`,
     change
   );
 });

diff --git a/packages/node-tests/src/__tests__/merge-check.test.ts b/packages/node-tests/src/__tests__/merge-check.test.ts
@@ -40,7 +40,7 @@ const sync = (left: DB, right: DB) => {
   // apply changes to right
   right.transaction(() => {
     const stmt = right.prepare(
-      "INSERT INTO crsql_changes VALUES (?, ?, ?, ?, ?, ?, ?, ?)"
+      "INSERT INTO crsql_changes VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)"
     );
     try {
       for (const cs of changesets) {

diff --git a/packages/node-tests/src/__tests__/user-reports.test.ts b/packages/node-tests/src/__tests__/user-reports.test.ts
@@ -60,6 +60,7 @@ test("failed to increment?", () => {
       db_version: 2,
       site_id: null,
       cl: 1,
+      seq: 0,
     },
     {
       table: "b",
@@ -70,6 +71,7 @@ test("failed to increment?", () => {
       db_version: 3,
       site_id: null,
       cl: 1,
+      seq: 0,
     },
   ]);
 });
diff --git a/packages/ws-litefs/src/LiteFSDBFactory.ts b/packages/ws-litefs/src/LiteFSDBFactory.ts
@@ -30,10 +30,6 @@ export class LiteFSDBFactory implements IDBFactory {
     schemaVersion: bigint
   ): Promise<IDB> {
     if (!this.#primaryConnection.isPrimary()) {
-      // If we are not primary then:
-      // 1. Create the DB on the primary
-      // 2. Get the TXID back
-      // 3. Wait for our DB to match that txid
       const response = await this.#primaryConnection.createDbOnPrimary(
         room,
         schemaName,