simplify master table(s)

vlcn-io · Apr 24, 2023 · 28b6f4c · 28b6f4c
1 parent 777b2da
commit 28b6f4c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 41 deletions.
diff --git a/core/src/consts.h b/core/src/consts.h
@@ -25,8 +25,7 @@
 
 #define TBL_SITE_ID "__crsql_siteid"
 #define TBL_DB_VERSION "__crsql_dbversion"
-#define TBL_SCHEMA "__crsql_master"
-#define TBL_SCHEMA_PROPS "__crsql_master_prop"
+#define TBL_SCHEMA "crsql_master"
 #define UNION "UNION"
 
 #define MAX_TBL_NAME_LEN 2048

diff --git a/core/src/crsqlite.c b/core/src/crsqlite.c
@@ -122,9 +122,8 @@ static int createSchemaTableIfNotExists(sqlite3 *db) {
   }
 
   char *zSql = sqlite3_mprintf(
-      "CREATE TABLE IF NOT EXISTS \"%s\" (id INTEGER PRIMARY KEY "
-      "AUTOINCREMENT, type TEXT NOT NULL, name TEXT NOT "
-      "NULL, augments TEXT NOT NULL) STRICT;",
+      "CREATE TABLE IF NOT EXISTS \"%s\" (\"key\" TEXT PRIMARY KEY, \"value\" "
+      "TEXT);",
       TBL_SCHEMA);
   rc = sqlite3_exec(db, zSql, 0, 0, 0);
   sqlite3_free(zSql);
@@ -134,42 +133,6 @@ static int createSchemaTableIfNotExists(sqlite3 *db) {
     return rc;
   }
 
-  zSql = sqlite3_mprintf(
-      "CREATE UNIQUE INDEX IF NOT EXISTS __crsql_master_index ON "
-      "\"%s\" (type, name);",
-      TBL_SCHEMA);
-  rc = sqlite3_exec(db, zSql, 0, 0, 0);
-  sqlite3_free(zSql);
-
-  if (rc != SQLITE_OK) {
-    sqlite3_exec(db, "ROLLBACK;", 0, 0, 0);
-    return rc;
-  }
-
-  zSql = sqlite3_mprintf(
-      "CREATE TABLE IF NOT EXISTS \"%s\" (master_id INTEGER NOT NULL, key "
-      "TEXT NOT NULL, ord INTEGER DEFAULT 0, value ANY) STRICT;",
-      TBL_SCHEMA_PROPS);
-  rc = sqlite3_exec(db, zSql, 0, 0, 0);
-  sqlite3_free(zSql);
-
-  if (rc != SQLITE_OK) {
-    sqlite3_exec(db, "ROLLBACK;", 0, 0, 0);
-    return rc;
-  }
-
-  zSql = sqlite3_mprintf(
-      "CREATE UNIQUE INDEX IF NOT EXISTS __crsql_master_prop_id_index "
-      "ON \"%s\" (master_id, key, ord);",
-      TBL_SCHEMA_PROPS);
-  rc = sqlite3_exec(db, zSql, 0, 0, 0);
-  sqlite3_free(zSql);
-
-  if (rc != SQLITE_OK) {
-    sqlite3_exec(db, "ROLLBACK;", 0, 0, 0);
-    return rc;
-  }
-
   sqlite3_exec(db, "RELEASE crsql_create_schema_table;", 0, 0, 0);
 
   return rc;