handle schema switch for auto-migrate

Author: tantaman

core/rs/core/src/automigrate.rs

@@ -41,7 +41,7 @@ pub extern "C" fn crsql_automigrate(
 
     let args = args!(argc, argv);
     if let Err(code) = automigrate_impl(ctx, args) {
-        ctx.result_error("failed to apply the updated schema");
+        ctx.result_error(&format!("failed to apply the updated schema {:?}", code));
         ctx.result_error_code(code);
         return;
     }
@@ -137,7 +137,10 @@ fn migrate_to(local_db: *mut sqlite3, mem_db: ManagedConnection) -> Result<Resul
 fn strip_crr_statements(schema: &str) -> String {
     schema
         .split("\n")
-        .filter(|line| !line.to_lowercase().contains("crsql_as_crr"))
+        .filter(|line| {
+            !line.to_lowercase().contains("crsql_as_crr")
+                && !line.to_lowercase().contains("crsql_fract_as_ordered")
+        })
         .collect::<Vec<_>>()
         .join("\n")
 }

core/rs/integration-check/tests/automigrate.rs

@@ -2,7 +2,7 @@ use sqlite::{Connection, ManagedConnection, ResultCode};
 use sqlite_nostd as sqlite;
 
 // TODO: auto-calculate starting number
-integration_utils::counter_setup!(25);
+integration_utils::counter_setup!(26);
 
 #[test]
 fn empty_schema() {
@@ -141,6 +141,158 @@ fn no_default_value() {
     decrement_counter();
 }
 
+#[test]
+fn strut_schema() {
+    strut_schema_impl().unwrap();
+    decrement_counter();
+}
+
+fn strut_schema_impl() -> Result<(), ResultCode> {
+    let db = integration_utils::opendb()?;
+    let stmt = db.db.prepare_v2(
+        r#"
+SELECT crsql_automigrate(?)"#,
+    )?;
+    stmt.bind_text(
+        1,
+        r#"
+CREATE TABLE IF NOT EXISTS "deck" (
+  "id" INTEGER primary key,
+  "title",
+  "created",
+  "modified",
+  "theme_id",
+  "chosen_presenter"
+);
+
+CREATE TABLE IF NOT EXISTS "slide" (
+  "id" INTEGER primary key,
+  "deck_id",
+  "order",
+  "created",
+  "modified",
+  "x",
+  "y",
+  "z"
+);
+
+CREATE INDEX IF NOT EXISTS "slide_deck_id" ON "slide" ("deck_id", "order");
+
+CREATE TABLE IF NOT EXISTS "text_component" (
+  "id" INTEGER primary key,
+  "slide_id",
+  "text",
+  "styles",
+  "x",
+  "y"
+);
+
+CREATE TABLE IF NOT EXISTS "embed_component" ("id" primary key, "slide_id", "src", "x", "y");
+
+CREATE INDEX IF NOT EXISTS "embed_component_slide_id" ON "embed_component" ("slide_id");
+
+CREATE TABLE IF NOT EXISTS "shape_component" (
+  "id" INTEGER primary key,
+  "slide_id",
+  "type",
+  "props",
+  "x",
+  "y"
+);
+
+CREATE INDEX IF NOT EXISTS "shape_component_slide_id" ON "shape_component" ("slide_id");
+
+CREATE TABLE IF NOT EXISTS "line_component" ("id" primary key, "slide_id", "props");
+
+CREATE INDEX IF NOT EXISTS "line_component_slide_id" ON "line_component" ("slide_id");
+
+CREATE TABLE IF NOT EXISTS "line_point" ("id" primary key, "line_id", "x", "y");
+
+CREATE INDEX IF NOT EXISTS "line_point_line_id" ON "line_point" ("line_id");
+
+CREATE INDEX IF NOT EXISTS "text_component_slide_id" ON "text_component" ("slide_id");
+
+CREATE TABLE IF NOT EXISTS "theme" (
+  "id" INTEGER primary key,
+  "name",
+  "bg_colorset",
+  "fg_colorset",
+  "fontset",
+  "surface_color",
+  "font_color"
+);
+
+CREATE TABLE IF NOT EXISTS "recent_color" (
+  "color" INTEGER primary key,
+  "last_used",
+  "first_used",
+  "theme_id"
+);
+
+CREATE TABLE IF NOT EXISTS "presenter" (
+  "name" primary key,
+  "available_transitions",
+  "picked_transition"
+);
+
+SELECT crsql_as_crr('deck');
+
+SELECT crsql_as_crr('slide');
+
+SELECT crsql_fract_as_ordered('slide', 'order', 'deck_id');
+
+SELECT crsql_as_crr('text_component');
+
+SELECT crsql_as_crr('embed_component');
+
+SELECT crsql_as_crr('shape_component');
+
+SELECT crsql_as_crr('line_component');
+
+SELECT crsql_as_crr('line_point');
+
+SELECT crsql_as_crr('theme');
+
+SELECT crsql_as_crr('recent_color');
+
+SELECT crsql_as_crr('presenter');
+
+CREATE TABLE IF NOT EXISTS "selected_slide" (
+  "deck_id",
+  "slide_id",
+  primary key ("deck_id", "slide_id")
+);
+
+CREATE TABLE IF NOT EXISTS "selected_component" (
+  "slide_id",
+  "component_id",
+  "component_type",
+  primary key ("slide_id", "component_id")
+);
+
+CREATE TABLE IF NOT EXISTS "undo_stack" (
+  "deck_id",
+  "operation",
+  "order",
+  primary key ("deck_id", "order")
+);
+
+CREATE TABLE IF NOT EXISTS "redo_stack" (
+  "deck_id",
+  "operation",
+  "order",
+  primary key ("deck_id", "order")
+);"#,
+        sqlite::Destructor::STATIC,
+    )?;
+    stmt.step()?;
+    assert_eq!(stmt.column_text(0)?, "migration complete");
+    stmt.reset()?;
+    stmt.step()?;
+    assert_eq!(stmt.column_text(0)?, "migration complete");
+    Ok(())
+}
+
 fn empty_schema_impl() -> Result<(), ResultCode> {
     let db = integration_utils::opendb()?;
     let stmt = db.db.prepare_v2("SELECT crsql_automigrate('')")?;

js/packages/crsqlite-wasm/src/DB.ts

@@ -86,7 +86,16 @@ export class DB implements DBAsync {
         : "migrate";
 
     await this.tx(async (tx) => {
-      if (storedVersion == null) {
+      if (storedVersion == null || storedName !== schemaName) {
+        if (storedName !== schemaName) {
+          // drop all tables since a schema name change is a reformat of the db.
+          const tables = await tx.execA(
+            `SELECT name FROM sqlite_master WHERE type = 'table' AND name NOT LIKE '%crsql_%'`
+          );
+          for (const table of tables) {
+            await tx.exec(`DROP TABLE [${table[0]}]`);
+          }
+        }
         await tx.exec(schemaContent);
       } else {
         await tx.exec(`SELECT crsql_automigrate(?)`, [schemaContent]);
@@ -100,6 +109,7 @@ export class DB implements DBAsync {
         ["schema_name", schemaName]
       );
     });
+    await this.exec(`VACUUM;`);
 
     return ret;
   }

js/packages/direct-connect-browser/src/WorkerInterface.ts

@@ -1,4 +1,5 @@
-import { DBID, Endpoints, FromWorkerMsg, SyncedRemoteMsg } from "./Types";
+import { Endpoints, FromWorkerMsg, SyncedRemoteMsg } from "./Types";
+import { DBID } from "@vlcn.io/xplat-api";
 import tblrx, { Src } from "@vlcn.io/rx-tbl";
 
 type AsUrls<T> = {

js/packages/direct-connect-browser/src/worker/DB.ts

@@ -1,7 +1,7 @@
 import initWasm from "@vlcn.io/crsqlite-wasm";
 import { DBAsync, StmtAsync } from "@vlcn.io/xplat-api";
 import { TXAsync } from "@vlcn.io/xplat-api";
-import { DBID } from "../Types.js";
+import { DBID } from "@vlcn.io/xplat-api";
 import {
   SCHEMA_NAME,
   SCHEMA_VERSION,

js/packages/direct-connect-browser/src/worker/Fetcher.ts

@@ -1,4 +1,5 @@
-import { DBID, Endpoints } from "../Types.js";
+import { Endpoints } from "../Types.js";
+import { DBID } from "@vlcn.io/xplat-api";
 import {
   ApplyChangesMsg,
   ApplyChangesResponse,

js/packages/direct-connect-browser/src/worker/SyncedDB.ts

@@ -1,5 +1,6 @@
 import { ISerializer, hexToBytes, tags } from "@vlcn.io/direct-connect-common";
-import { DBID, Endpoints } from "../Types.js";
+import { Endpoints } from "../Types.js";
+import { DBID } from "@vlcn.io/xplat-api";
 import createDb, { DB } from "./DB.js";
 import InboundStream from "./InboundStream.js";
 import OutboundStream from "./OutboundStream.js";