convert all remaining DB writes & reads to SQL (with successful registration & claim)

src/db/databaseUtil.ts

@@ -1,3 +1,8 @@
+/**
+ * This file is the SQL replacement of the index.ts file in the db directory.
+ * That file will eventually be deleted.
+ */
+
 import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
 import { MASTER_SETTINGS_KEY, Settings } from "./tables/settings";
 import { logger } from "@/utils/logger";
@@ -81,7 +86,15 @@ export async function retrieveSettingsForDefaultAccount(): Promise<Settings> {
   if (!result) {
     return DEFAULT_SETTINGS;
   } else {
-    return mapColumnsToValues(result.columns, result.values)[0] as Settings;
+    const settings = mapColumnsToValues(
+      result.columns,
+      result.values,
+    )[0] as Settings;
+    if (settings.searchBoxes) {
+      // @ts-expect-error - the searchBoxes field is a string in the DB
+      settings.searchBoxes = JSON.parse(settings.searchBoxes);
+    }
+    return settings;
   }
 }
 
@@ -101,7 +114,12 @@ export async function retrieveSettingsForActiveAccount(): Promise<Settings> {
     const overrideSettingsFiltered = Object.fromEntries(
       Object.entries(overrideSettings).filter(([_, v]) => v !== null),
     );
-    return { ...defaultSettings, ...overrideSettingsFiltered };
+    const settings = { ...defaultSettings, ...overrideSettingsFiltered };
+    if (settings.searchBoxes) {
+      // @ts-expect-error - the searchBoxes field is a string in the DB
+      settings.searchBoxes = JSON.parse(settings.searchBoxes);
+    }
+    return settings;
   }
 }
 
@@ -160,8 +178,8 @@ export function generateInsertStatement(
   model: Record<string, unknown>,
   tableName: string,
 ): { sql: string; params: unknown[] } {
-  const columns = Object.keys(model);
-  const values = Object.values(model);
+  const columns = Object.keys(model).filter((key) => model[key] !== undefined);
+  const values = Object.values(model).filter((value) => value !== undefined);
   const placeholders = values.map(() => "?").join(", ");
   const insertSql = `INSERT INTO ${tableName} (${columns.join(", ")}) VALUES (${placeholders})`;
   return {

src/db/index.ts

@@ -1,3 +1,9 @@
+/**
+ * This is the original IndexedDB version of the database.
+ * It will eventually be replaced fully by the SQL version in databaseUtil.ts.
+ * Turn this on or off with the USE_DEXIE_DB constant in constants/app.ts.
+ */
+
 import BaseDexie, { Table } from "dexie";
 import { encrypted, Encryption } from "@pvermeer/dexie-encrypted-addon";
 import * as R from "ramda";

src/db/tables/accounts.ts

@@ -45,6 +45,7 @@ export type Account = {
   publicKeyHex: string;
 };
 
+// When finished with USE_DEXIE_DB, move these fields to Account and move identity and mnemonic here.
 export type AccountEncrypted = Account & {
   identityEncrBase64: string;
   mnemonicEncrBase64: string;