rename raw query method in preparation for typed query

src/components/GiftedDialog.vue

@@ -154,7 +154,7 @@ export default class GiftedDialog extends Vue {
       this.activeDid = settings.activeDid || "";
 
       const platformService = PlatformServiceFactory.getInstance();
-      const result = await platformService.dbQuery(`SELECT * FROM contacts`);
+      const result = await platformService.dbQueryRaw(`SELECT * FROM contacts`);
       if (result) {
         this.allContacts = databaseUtil.mapQueryResultToValues(
           result,

src/components/GiftedPrompts.vue

@@ -130,7 +130,7 @@ export default class GivenPrompts extends Vue {
     this.callbackOnFullGiftInfo = callbackOnFullGiftInfo;
 
     const platformService = PlatformServiceFactory.getInstance();
-    const result = await platformService.dbQuery(
+    const result = await platformService.dbQueryRaw(
       "SELECT COUNT(*) FROM contacts",
     );
     if (result) {
@@ -240,7 +240,7 @@ export default class GivenPrompts extends Vue {
     } else {
       // get the contact at that offset
       const platformService = PlatformServiceFactory.getInstance();
-      const result = await platformService.dbQuery(
+      const result = await platformService.dbQueryRaw(
         "SELECT * FROM contacts LIMIT 1 OFFSET ?",
         [someContactDbIndex],
       );

src/components/MembersList.vue

@@ -361,7 +361,7 @@ export default class MembersList extends Vue {
 
   async loadContacts() {
     const platformService = PlatformServiceFactory.getInstance();
-    const result = await platformService.dbQuery("SELECT * FROM contacts");
+    const result = await platformService.dbQueryRaw("SELECT * FROM contacts");
     if (result) {
       this.contacts = databaseUtil.mapQueryResultToValues(
         result,

src/components/OnboardingDialog.vue

@@ -241,7 +241,7 @@ export default class OnboardingDialog extends Vue {
     this.activeDid = settings.activeDid || "";
     this.isRegistered = !!settings.isRegistered;
     const platformService = PlatformServiceFactory.getInstance();
-    const dbContacts = await platformService.dbQuery("SELECT * FROM contacts");
+    const dbContacts = await platformService.dbQueryRaw("SELECT * FROM contacts");
     if (dbContacts) {
       this.numContacts = dbContacts.values.length;
       const firstContact = dbContacts.values[0];

src/db-sql/migration.ts

@@ -1,5 +1,5 @@
 import migrationService from "../services/migrationService";
-import type { QueryExecResult } from "../interfaces/database";
+import type { QueryExecResultRaw } from "../interfaces/database";
 import { DEFAULT_ENDORSER_API_SERVER } from "@/constants/app";
 import { arrayBufferToBase64 } from "@/libs/crypto";
 
@@ -127,7 +127,7 @@ export async function registerMigrations(): Promise<void> {
 }
 
 export async function runMigrations(
-  sqlExec: (sql: string, params?: unknown[]) => Promise<Array<QueryExecResult>>,
+  sqlExec: (sql: string, params?: unknown[]) => Promise<Array<QueryExecResultRaw>>,
 ): Promise<void> {
   await registerMigrations();
   await migrationService.runMigrations(sqlExec);

src/db/databaseUtil.ts

@@ -7,7 +7,7 @@ import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
 import { MASTER_SETTINGS_KEY, Settings } from "./tables/settings";
 import { logger } from "@/utils/logger";
 import { DEFAULT_ENDORSER_API_SERVER } from "@/constants/app";
-import { QueryExecResult } from "@/interfaces/database";
+import { QueryExecResultRaw } from "@/interfaces/database";
 
 export async function updateDefaultSettings(
   settingsChanges: Settings,
@@ -80,7 +80,7 @@ const DEFAULT_SETTINGS: Settings = {
 // retrieves default settings
 export async function retrieveSettingsForDefaultAccount(): Promise<Settings> {
   const platform = PlatformServiceFactory.getInstance();
-  const result = await platform.dbQuery("SELECT * FROM settings WHERE id = ?", [
+  const result = await platform.dbQueryRaw("SELECT * FROM settings WHERE id = ?", [
     MASTER_SETTINGS_KEY,
   ]);
   if (!result) {
@@ -104,7 +104,7 @@ export async function retrieveSettingsForActiveAccount(): Promise<Settings> {
     return defaultSettings;
   } else {
     const platform = PlatformServiceFactory.getInstance();
-    const result = await platform.dbQuery(
+    const result = await platform.dbQueryRaw(
       "SELECT * FROM settings WHERE accountDid = ?",
       [defaultSettings.activeDid],
     );
@@ -236,7 +236,7 @@ export function generateUpdateStatement(
 }
 
 export function mapQueryResultToValues(
-  record: QueryExecResult | undefined,
+  record: QueryExecResultRaw | undefined,
 ): Array<Record<string, unknown>> {
   if (!record) {
     return [];

src/interfaces/absurd-sql.d.ts

@@ -1,4 +1,4 @@
-import type { QueryExecResult, SqlValue } from "./database";
+import type { QueryExecResultRaw, SqlValue } from "./database";
 
 declare module "@jlongster/sql.js" {
   interface SQL {
@@ -49,7 +49,7 @@ declare module "absurd-sql/dist/indexeddb-main-thread" {
   }
 
   export interface SQLiteDatabase {
-    exec: (sql: string, params?: unknown[]) => Promise<QueryExecResult[]>;
+    exec: (sql: string, params?: unknown[]) => Promise<QueryExecResultRaw[]>;
     close: () => Promise<void>;
   }
 

src/interfaces/database.ts

@@ -1,17 +1,21 @@
 export type SqlValue = string | number | null | Uint8Array;
 
-export interface QueryExecResult {
+export interface QueryExecResultRaw {
   columns: Array<string>;
   values: Array<Array<SqlValue>>;
 }
 
 export interface DatabaseService {
   initialize(): Promise<void>;
-  query(sql: string, params?: unknown[]): Promise<QueryExecResult[]>;
+  query(sql: string, params?: unknown[]): Promise<QueryExecResultRaw[]>;
   run(
     sql: string,
     params?: unknown[],
   ): Promise<{ changes: number; lastId?: number }>;
-  getOneRow(sql: string, params?: unknown[]): Promise<unknown[] | undefined>;
-  getAll(sql: string, params?: unknown[]): Promise<unknown[][]>;
+
+  // Change this to return QueryExecResultRaw[] so that we can create objects with the right keys
+  // getOneRow(sql: string, params?: unknown[]): Promise<unknown[] | undefined>;
+
+  // Change this to return QueryExecResultRaw[] so that we can create objects with the right keys
+  // getAll(sql: string, params?: unknown[]): Promise<unknown[][]>;
 }

src/libs/util.ts

@@ -479,7 +479,7 @@ export type AccountKeyInfo = Account & KeyMetaWithPrivate;
 export const retrieveAccountCount = async (): Promise<number> => {
   let result = 0;
   const platformService = PlatformServiceFactory.getInstance();
-  const dbResult = await platformService.dbQuery(
+  const dbResult = await platformService.dbQueryRaw(
     `SELECT COUNT(*) FROM accounts`,
   );
   if (dbResult?.values?.[0]?.[0]) {
@@ -496,7 +496,7 @@ export const retrieveAccountCount = async (): Promise<number> => {
 
 export const retrieveAccountDids = async (): Promise<string[]> => {
   const platformService = PlatformServiceFactory.getInstance();
-  const dbAccounts = await platformService.dbQuery(`SELECT did FROM accounts`);
+  const dbAccounts = await platformService.dbQueryRaw(`SELECT did FROM accounts`);
   let allDids =
     databaseUtil
       .mapQueryResultToValues(dbAccounts)
@@ -522,7 +522,7 @@ export const retrieveAccountMetadata = async (
 ): Promise<Account | undefined> => {
   let result: Account | undefined = undefined;
   const platformService = PlatformServiceFactory.getInstance();
-  const dbAccount = await platformService.dbQuery(
+  const dbAccount = await platformService.dbQueryRaw(
     `SELECT * FROM accounts WHERE did = ?`,
     [activeDid],
   );
@@ -563,7 +563,7 @@ export const retrieveFullyDecryptedAccount = async (
 ): Promise<Account | undefined> => {
   let result: Account | undefined = undefined;
   const platformService = PlatformServiceFactory.getInstance();
-  const dbSecrets = await platformService.dbQuery(
+  const dbSecrets = await platformService.dbQueryRaw(
     `SELECT secretBase64 from secret`,
   );
   if (
@@ -577,7 +577,7 @@ export const retrieveFullyDecryptedAccount = async (
   }
   const secretBase64 = dbSecrets.values[0][0] as string;
   const secret = base64ToArrayBuffer(secretBase64);
-  const dbAccount = await platformService.dbQuery(
+  const dbAccount = await platformService.dbQueryRaw(
     `SELECT * FROM accounts WHERE did = ?`,
     [activeDid],
   );
@@ -611,7 +611,7 @@ export const retrieveFullyDecryptedAccount = async (
 
 export const retrieveAllAccountsMetadata = async (): Promise<Account[]> => {
   const platformService = PlatformServiceFactory.getInstance();
-  const dbAccounts = await platformService.dbQuery(`SELECT * FROM accounts`);
+  const dbAccounts = await platformService.dbQueryRaw(`SELECT * FROM accounts`);
   const accounts = databaseUtil.mapQueryResultToValues(dbAccounts) as Account[];
   let result = accounts.map((account) => {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -643,7 +643,7 @@ export async function saveNewIdentity(
   try {
     // add to the new sql db
     const platformService = PlatformServiceFactory.getInstance();
-    const secrets = await platformService.dbQuery(
+    const secrets = await platformService.dbQueryRaw(
       `SELECT secretBase64 FROM secret`,
     );
     if (!secrets?.values?.length || !secrets.values[0]?.length) {

src/services/AbsurdSqlDatabaseService.ts

@@ -3,7 +3,7 @@ import { SQLiteFS } from "absurd-sql";
 import IndexedDBBackend from "absurd-sql/dist/indexeddb-backend";
 
 import { runMigrations } from "../db-sql/migration";
-import type { DatabaseService, QueryExecResult } from "../interfaces/database";
+import type { DatabaseService, QueryExecResultRaw } from "../interfaces/database";
 import { logger } from "@/utils/logger";
 
 interface QueuedOperation {
@@ -15,7 +15,7 @@ interface QueuedOperation {
 }
 
 interface AbsurdSqlDatabase {
-  exec: (sql: string, params?: unknown[]) => Promise<QueryExecResult[]>;
+  exec: (sql: string, params?: unknown[]) => Promise<QueryExecResultRaw[]>;
   run: (
     sql: string,
     params?: unknown[],
@@ -123,7 +123,7 @@ class AbsurdSqlDatabaseService implements DatabaseService {
       if (!operation) continue;
 
       try {
-        let queryResult: QueryExecResult[] = [];
+        let queryResult: QueryExecResultRaw[] = [];
         let result: unknown;
         switch (operation.type) {
           case "run":
@@ -218,22 +218,9 @@ class AbsurdSqlDatabaseService implements DatabaseService {
   }
 
   // Note that the resulting array may be empty if there are no results from the query
-  async query(sql: string, params: unknown[] = []): Promise<QueryExecResult[]> {
+  async query(sql: string, params: unknown[] = []): Promise<QueryExecResultRaw[]> {
     await this.waitForInitialization();
-    return this.queueOperation<QueryExecResult[]>("query", sql, params);
-  }
-
-  async getOneRow(
-    sql: string,
-    params: unknown[] = [],
-  ): Promise<unknown[] | undefined> {
-    await this.waitForInitialization();
-    return this.queueOperation<unknown[] | undefined>("getOneRow", sql, params);
-  }
-
-  async getAll(sql: string, params: unknown[] = []): Promise<unknown[][]> {
-    await this.waitForInitialization();
-    return this.queueOperation<unknown[][]>("getAll", sql, params);
+    return this.queueOperation<QueryExecResultRaw[]>("query", sql, params);
   }
 }
 

src/services/PlatformService.ts

@@ -1,12 +1,9 @@
-import { QueryExecResult } from "@/interfaces/database";
+import { QueryExecResultRaw } from "@/interfaces/database";
 
 /**
  * Query execution result interface
  */
-export interface QueryExecResult<T = unknown> {
-  columns: string[];
-  values: T[];
-}
+export type QueryExecResult<T = unknown> = T[];
 
 /**
  * Represents the result of an image capture or selection operation.
@@ -110,12 +107,20 @@ export interface PlatformService {
   handleDeepLink(url: string): Promise<void>;
 
   /**
-   * Execute a database query and return the results
+   * Execute a database query and return the well-typed results
+   * @param sql SQL query to execute
+   * @param params Query parameters
+   * @returns Query results with array of values
+   */
+  // dbQuery<T = unknown>(sql: string, params?: unknown[]): Promise<QueryExecResult<T>>;
+
+  /**
+   * Execute a database query and return the raw results
    * @param sql SQL query to execute
    * @param params Query parameters
    * @returns Query results with columns and values
    */
-  dbQuery<T = unknown>(sql: string, params?: unknown[]): Promise<QueryExecResult<T>>;
+  dbQueryRaw(sql: string, params?: unknown[]): Promise<QueryExecResultRaw | undefined>;
 
   /**
    * Executes a create/update/delete on the database.

src/services/migrationService.ts

@@ -1,5 +1,5 @@
 import { logger } from "@/utils/logger";
-import { QueryExecResult } from "../interfaces/database";
+import { QueryExecResultRaw } from "../interfaces/database";
 
 interface Migration {
   name: string;
@@ -27,7 +27,7 @@ export class MigrationService {
     sqlExec: (
       sql: string,
       params?: unknown[],
-    ) => Promise<Array<QueryExecResult>>,
+    ) => Promise<Array<QueryExecResultRaw>>,
   ): Promise<void> {
     // Create migrations table if it doesn't exist
     await sqlExec(`
@@ -39,7 +39,7 @@ export class MigrationService {
     `);
 
     // Get list of executed migrations
-    const result: QueryExecResult[] = await sqlExec(
+    const result: QueryExecResultRaw[] = await sqlExec(
       "SELECT name FROM migrations;",
     );
     let executedMigrations: Set<unknown> = new Set();

src/services/platforms/CapacitorPlatformService.ts

@@ -13,7 +13,7 @@ import {
   Changes,
 } from "@capacitor-community/sqlite";
 import { logger } from "../../utils/logger";
-import { QueryExecResult, SqlValue } from "@/interfaces/database";
+import { QueryExecResultRaw, SqlValue } from "@/interfaces/database";
 import { DEFAULT_ENDORSER_API_SERVER } from "@/constants/app";
 
 interface Migration {
@@ -657,9 +657,9 @@ export class CapacitorPlatformService implements PlatformService {
   }
 
   /**
-   * @see PlatformService.dbQuery
+   * @see PlatformService.dbQueryRaw
    */
-  async dbQuery(sql: string, params?: unknown[]): Promise<QueryExecResult> {
+  async dbQueryRaw(sql: string, params?: unknown[]): Promise<QueryExecResultRaw> {
     await this.initializeDatabase();
     if (!this.db) {
       throw new Error("Database not initialized");

src/services/platforms/ElectronPlatformService.ts

@@ -2,11 +2,10 @@ import {
   ImageResult,
   PlatformService,
   PlatformCapabilities,
-  QueryExecResult,
 } from "../PlatformService";
 import { logger } from "../../utils/logger";
 import { DEFAULT_ENDORSER_API_SERVER } from "@/constants/app";
-import { DatabaseConnectionPool } from "../database/ConnectionPool";
+import { QueryExecResultRaw, SqlValue } from "@/interfaces/database";
 
 // Type for the electron window object
 declare global {
@@ -325,10 +324,21 @@ export class ElectronPlatformService implements PlatformService {
     throw new Error("Not implemented");
   }
 
-  /**
-   * @see PlatformService.dbQuery
-   */
-  async dbQuery<T = unknown>(sql: string, params: unknown[] = []): Promise<QueryExecResult<T>> {
+  // /**
+  //  * @see PlatformService.dbQueryRaw
+  //  */
+  // async dbQuery<T = unknown>(sql: string, params: unknown[] = []): Promise<QueryExecResult<T>> {
+  //   await this.initializeDatabase();
+  //   if (this.dbFatalError) throw new Error("Database is in a fatal error state. Please restart the app.");
+  //   const result = await this.sqlite.query({
+  //     database: this.dbName,
+  //     statement: sql,
+  //     values: params
+  //   });
+  //   return (result.values || []) as T[];
+  // }
+
+  async dbQueryRaw(sql: string, params?: unknown[]): Promise<QueryExecResultRaw> {
     await this.initializeDatabase();
     if (this.dbFatalError) throw new Error("Database is in a fatal error state. Please restart the app.");
     const result = await this.sqlite.query({
@@ -336,10 +346,10 @@ export class ElectronPlatformService implements PlatformService {
       statement: sql,
       values: params
     });
-    const columns = result.values?.[0] ? Object.keys(result.values[0]) : [];
+    const columns = Object.keys(result.values?.[0] || {});
     return {
       columns,
-      values: (result.values || []).map((row: Record<string, unknown>) => row as T)
+      values: result.values.map((row: Record<string, any>) => columns.map((column) => row[column] as SqlValue))
     };
   }
 

src/services/platforms/PyWebViewPlatformService.ts

@@ -4,7 +4,7 @@ import {
   PlatformCapabilities,
 } from "../PlatformService";
 import { logger } from "../../utils/logger";
-import { QueryExecResult } from "@/interfaces/database";
+import { QueryExecResultRaw } from "@/interfaces/database";
 
 /**
  * Platform service implementation for PyWebView platform.
@@ -111,7 +111,7 @@ export class PyWebViewPlatformService implements PlatformService {
     throw new Error("Not implemented");
   }
 
-  dbQuery(sql: string, params?: unknown[]): Promise<QueryExecResult> {
+  dbQueryRaw(sql: string, params?: unknown[]): Promise<QueryExecResultRaw> {
     throw new Error("Not implemented for " + sql + " with params " + params);
   }
   dbExec(

src/services/platforms/WebPlatformService.ts

@@ -4,7 +4,7 @@ import {
   PlatformCapabilities,
 } from "../PlatformService";
 import { logger } from "../../utils/logger";
-import { QueryExecResult } from "@/interfaces/database";
+import { QueryExecResultRaw } from "@/interfaces/database";
 import databaseService from "../AbsurdSqlDatabaseService";
 
 /**
@@ -362,32 +362,39 @@ export class WebPlatformService implements PlatformService {
     throw new Error("File system access not available in web platform");
   }
 
+  // /**
+  //  * @see PlatformService.dbQuery
+  //  */
+  // async dbQuery<T = unknown>(sql: string, params: unknown[] = []): Promise<QueryExecResult<T>> {
+  //   const result = await databaseService.query(sql, params);
+  //   const columns = result[0]?.columns || [];
+  //   const values = result[0]?.values || [];
+  //   return values.map((row: SqlValue[]) => {
+  //       const obj: Record<string, SqlValue> = {};
+  //       columns.forEach((column, index) => {
+  //         obj[column] = row[index];
+  //       });
+  //       return obj as T;
+  //     });
+  // }
+
   /**
-   * @see PlatformService.dbQuery
+   * @see PlatformService.dbQueryRaw
    */
-  dbQuery(
+  async dbQueryRaw(
     sql: string,
     params?: unknown[],
-  ): Promise<QueryExecResult | undefined> {
+  ): Promise<QueryExecResultRaw | undefined> {
     return databaseService.query(sql, params).then((result) => result[0]);
   }
 
   /**
    * @see PlatformService.dbExec
    */
-  dbExec(
+  async dbExec(
     sql: string,
     params?: unknown[],
   ): Promise<{ changes: number; lastId?: number }> {
     return databaseService.run(sql, params);
   }
-
-  async dbGetOneRow(
-    sql: string,
-    params?: unknown[],
-  ): Promise<unknown[] | undefined> {
-    return databaseService
-      .query(sql, params)
-      .then((result: QueryExecResult[]) => result[0]?.values[0]);
-  }
 }

src/views/AccountViewView.vue

@@ -1352,7 +1352,7 @@ export default class AccountViewView extends Vue {
   async processIdentity() {
     let account: Account | undefined = undefined;
     const platformService = PlatformServiceFactory.getInstance();
-    const dbAccount = await platformService.dbQuery(
+    const dbAccount = await platformService.dbQueryRaw(
       "SELECT * FROM accounts WHERE did = ?",
       [this.activeDid],
     );

src/views/ClaimCertificateView.vue

@@ -91,7 +91,7 @@ export default class ClaimCertificateView extends Vue {
     confirmerIds: Array<string>,
   ) {
     const platformService = PlatformServiceFactory.getInstance();
-    const dbAllContacts = await platformService.dbQuery(
+    const dbAllContacts = await platformService.dbQueryRaw(
       "SELECT * FROM contacts",
     );
     let allContacts = databaseUtil.mapQueryResultToValues(

src/views/ClaimReportCertificateView.vue

@@ -73,7 +73,7 @@ export default class ClaimReportCertificateView extends Vue {
     claimData: endorserServer.GenericCredWrapper<endorserServer.GenericVerifiableCredential>,
   ) {
     const platformService = PlatformServiceFactory.getInstance();
-    const dbAllContacts = await platformService.dbQuery(
+    const dbAllContacts = await platformService.dbQueryRaw(
       "SELECT * FROM contacts",
     );
     let allContacts = databaseUtil.mapQueryResultToValues(

src/views/ClaimView.vue

@@ -623,7 +623,7 @@ export default class ClaimView extends Vue {
     this.activeDid = settings.activeDid || "";
     this.apiServer = settings.apiServer || "";
     const platformService = PlatformServiceFactory.getInstance();
-    const dbAllContacts = await platformService.dbQuery(
+    const dbAllContacts = await platformService.dbQueryRaw(
       "SELECT * FROM contacts",
     );
     this.allContacts = databaseUtil.mapQueryResultToValues(

src/views/ConfirmGiftView.vue

@@ -537,7 +537,7 @@ export default class ConfirmGiftView extends Vue {
     this.activeDid = settings.activeDid || "";
     this.apiServer = settings.apiServer || "";
     const platformService = PlatformServiceFactory.getInstance();
-    const dbAllContacts = await platformService.dbQuery(
+    const dbAllContacts = await platformService.dbQueryRaw(
       "SELECT * FROM contacts",
     );
     this.allContacts = databaseUtil.mapQueryResultToValues(

src/views/ContactAmountsView.vue

@@ -157,7 +157,7 @@ export default class ContactAmountssView extends Vue {
     try {
       const contactDid = this.$route.query["contactDid"] as string;
       const platformService = PlatformServiceFactory.getInstance();
-      const dbContact = await platformService.dbQuery(
+      const dbContact = await platformService.dbQueryRaw(
         "SELECT * FROM contacts WHERE did = ?",
         [contactDid],
       );

src/views/ContactEditView.vue

@@ -223,7 +223,7 @@ export default class ContactEditView extends Vue {
   async created() {
     const contactDid = this.$route.params.did;
     const platformService = PlatformServiceFactory.getInstance();
-    const dbContact = await platformService.dbQuery(
+    const dbContact = await platformService.dbQueryRaw(
       "SELECT * FROM contacts WHERE did = ?",
       [contactDid],
     );

src/views/ContactGiftingView.vue

@@ -108,7 +108,7 @@ export default class ContactGiftingView extends Vue {
       this.activeDid = settings.activeDid || "";
 
       const platformService = PlatformServiceFactory.getInstance();
-      const dbAllContacts = await platformService.dbQuery(
+      const dbAllContacts = await platformService.dbQueryRaw(
         "SELECT * FROM contacts ORDER BY name",
       );
       this.allContacts = databaseUtil.mapQueryResultToValues(

src/views/ContactImportView.vue

@@ -412,7 +412,7 @@ export default class ContactImportView extends Vue {
     this.contactsSelected = new Array(this.contactsImporting.length).fill(true);
 
     const platformService = PlatformServiceFactory.getInstance();
-    const dbAllContacts = await platformService.dbQuery(
+    const dbAllContacts = await platformService.dbQueryRaw(
       "SELECT * FROM contacts",
     );
     let baseContacts = databaseUtil.mapQueryResultToValues(

src/views/ContactQRScanFullView.vue

@@ -443,7 +443,7 @@ export default class ContactQRScan extends Vue {
 
       // Check if contact already exists
       const platformService = PlatformServiceFactory.getInstance();
-      const dbAllContacts = await platformService.dbQuery(
+      const dbAllContacts = await platformService.dbQueryRaw(
         "SELECT * FROM contacts WHERE did = ?",
         [contact.did],
       );

src/views/ContactQRScanShowView.vue

@@ -770,7 +770,7 @@ export default class ContactQRScanShow extends Vue {
 
       // Check if contact already exists
       const platformService = PlatformServiceFactory.getInstance();
-      const dbAllContacts = await platformService.dbQuery(
+      const dbAllContacts = await platformService.dbQueryRaw(
         "SELECT * FROM contacts WHERE did = ?",
         [contact.did],
       );

src/views/ContactsView.vue

@@ -468,7 +468,7 @@ export default class ContactsView extends Vue {
     }
 
     const platformService = PlatformServiceFactory.getInstance();
-    const dbAllContacts = await platformService.dbQuery(
+    const dbAllContacts = await platformService.dbQueryRaw(
       "SELECT * FROM contacts ORDER BY name",
     );
     this.contacts = databaseUtil.mapQueryResultToValues(
@@ -846,7 +846,7 @@ export default class ContactsView extends Vue {
       }
 
       const platformService = PlatformServiceFactory.getInstance();
-      const dbAllContacts = await platformService.dbQuery(
+      const dbAllContacts = await platformService.dbQueryRaw(
         "SELECT * FROM contacts ORDER BY name",
       );
       this.contacts = databaseUtil.mapQueryResultToValues(

src/views/DIDView.vue

@@ -376,7 +376,7 @@ export default class DIDView extends Vue {
     if (!this.viewingDid) return;
 
     const platformService = PlatformServiceFactory.getInstance();
-    const dbContacts = await platformService.dbQuery(
+    const dbContacts = await platformService.dbQueryRaw(
       "SELECT * FROM contacts WHERE did = ?",
       [this.viewingDid],
     );

src/views/DiscoverView.vue

@@ -407,7 +407,7 @@ export default class DiscoverView extends Vue {
     this.searchBox = settings.searchBoxes?.[0] || null;
 
     const platformService = PlatformServiceFactory.getInstance();
-    const dbContacts = await platformService.dbQuery("SELECT * FROM contacts");
+    const dbContacts = await platformService.dbQueryRaw("SELECT * FROM contacts");
     this.allContacts = databaseUtil.mapQueryResultToValues(dbContacts) as unknown as Contact[];
     if (USE_DEXIE_DB) {
       this.allContacts = await db.contacts.toArray();

src/views/GiftedDetailsView.vue

@@ -440,7 +440,7 @@ export default class GiftedDetails extends Vue {
       (this.recipientDid && !this.recipientName)
     ) {
       const platformService = PlatformServiceFactory.getInstance();
-      const dbContacts = await platformService.dbQuery(
+      const dbContacts = await platformService.dbQueryRaw(
         "SELECT * FROM contacts",
       );
       let allContacts = databaseUtil.mapQueryResultToValues(

src/views/HomeView.vue

@@ -530,7 +530,7 @@ export default class HomeView extends Vue {
       this.apiServer = settings.apiServer || "";
       this.activeDid = settings.activeDid || "";
       const platformService = PlatformServiceFactory.getInstance();
-      const dbContacts = await platformService.dbQuery(
+      const dbContacts = await platformService.dbQueryRaw(
         "SELECT * FROM contacts",
       );
       this.allContacts = databaseUtil.mapQueryResultToValues(
@@ -666,7 +666,7 @@ export default class HomeView extends Vue {
    */
   private async loadContacts() {
     const platformService = PlatformServiceFactory.getInstance();
-    const dbContacts = await platformService.dbQuery("SELECT * FROM contacts");
+    const dbContacts = await platformService.dbQueryRaw("SELECT * FROM contacts");
     this.allContacts = databaseUtil.mapQueryResultToValues(
       dbContacts,
     ) as unknown as Contact[];

src/views/ImportDerivedAccountView.vue

@@ -129,7 +129,7 @@ export default class ImportAccountView extends Vue {
       [];
     const platformService = PlatformServiceFactory.getInstance();
     const qmarks = selectedArray.map(() => "?").join(",");
-    const queryResult = await platformService.dbQuery(
+    const queryResult = await platformService.dbQueryRaw(
       `SELECT * FROM accounts WHERE did IN (${qmarks})`,
       selectedArray,
     );

src/views/InviteOneView.vue

@@ -193,7 +193,7 @@ export default class InviteOneView extends Vue {
       this.invites = response.data.data;
 
       const platformService = PlatformServiceFactory.getInstance();
-      const queryResult = await platformService.dbQuery(
+      const queryResult = await platformService.dbQueryRaw(
         "SELECT * FROM contacts",
       );
       let baseContacts = databaseUtil.mapQueryResultToValues(

src/views/LogView.vue

@@ -81,7 +81,7 @@ export default class LogView extends Vue {
 
       let allLogs: Log[] = [];
       const platformService = PlatformServiceFactory.getInstance();
-      const queryResult = await platformService.dbQuery(
+      const queryResult = await platformService.dbQueryRaw(
         "SELECT * FROM logs ORDER BY date DESC",
       );
       this.logs = databaseUtil.mapQueryResultToValues(

src/views/NewActivityView.vue

@@ -208,7 +208,7 @@ export default class NewActivityView extends Vue {
         settings.lastAckedOfferToUserProjectsJwtId || "";
 
       const platformService = PlatformServiceFactory.getInstance();
-      const queryResult = await platformService.dbQuery(
+      const queryResult = await platformService.dbQueryRaw(
         "SELECT * FROM contacts",
       );
       this.allContacts = databaseUtil.mapQueryResultToValues(

src/views/OfferDetailsView.vue

@@ -418,7 +418,7 @@ export default class OfferDetailsView extends Vue {
     if (this.recipientDid && !this.recipientName) {
       let allContacts: Contact[] = [];
       const platformService = PlatformServiceFactory.getInstance();
-      const queryResult = await platformService.dbQuery(
+      const queryResult = await platformService.dbQueryRaw(
         "SELECT * FROM contacts",
       );
       allContacts = databaseUtil.mapQueryResultToValues(

src/views/ProjectViewView.vue

@@ -787,7 +787,7 @@ export default class ProjectViewView extends Vue {
     this.activeDid = settings.activeDid || "";
     this.apiServer = settings.apiServer || "";
     const platformService = PlatformServiceFactory.getInstance();
-    const queryResult = await platformService.dbQuery("SELECT * FROM contacts");
+    const queryResult = await platformService.dbQueryRaw("SELECT * FROM contacts");
     this.allContacts = databaseUtil.mapQueryResultToValues(
       queryResult,
     ) as unknown as Contact[];

src/views/ProjectsView.vue

@@ -336,7 +336,7 @@ export default class ProjectsView extends Vue {
       this.givenName = settings.firstName || "";
 
       const platformService = PlatformServiceFactory.getInstance();
-      const queryResult = await platformService.dbQuery(
+      const queryResult = await platformService.dbQueryRaw(
         "SELECT * FROM contacts",
       );
       this.allContacts = databaseUtil.mapQueryResultToValues(

src/views/QuickActionBvcEndView.vue

@@ -201,7 +201,7 @@ export default class QuickActionBvcBeginView extends Vue {
     this.activeDid = settings.activeDid || "";
 
     const platformService = PlatformServiceFactory.getInstance();
-    const contactQueryResult = await platformService.dbQuery(
+    const contactQueryResult = await platformService.dbQueryRaw(
       "SELECT * FROM contacts",
     );
     this.allContacts = databaseUtil.mapQueryResultToValues(
@@ -229,7 +229,7 @@ export default class QuickActionBvcBeginView extends Vue {
         suppressMilliseconds: true,
       }) || "";
 
-    const queryResult = await platformService.dbQuery(
+    const queryResult = await platformService.dbQueryRaw(
       "SELECT did FROM accounts",
     );
     this.allMyDids =

src/views/RecentOffersToUserProjectsView.vue

@@ -128,7 +128,7 @@ export default class RecentOffersToUserView extends Vue {
         settings.lastAckedOfferToUserProjectsJwtId || "";
 
       const contactQueryResult =
-        await PlatformServiceFactory.getInstance().dbQuery(
+        await PlatformServiceFactory.getInstance().dbQueryRaw(
           "SELECT * FROM contacts",
         );
       this.allContacts = databaseUtil.mapQueryResultToValues(

src/views/RecentOffersToUserView.vue

@@ -119,7 +119,7 @@ export default class RecentOffersToUserView extends Vue {
       this.lastAckedOfferToUserJwtId = settings.lastAckedOfferToUserJwtId || "";
 
       const contactQueryResult =
-        await PlatformServiceFactory.getInstance().dbQuery(
+        await PlatformServiceFactory.getInstance().dbQueryRaw(
           "SELECT * FROM contacts",
         );
       this.allContacts = databaseUtil.mapQueryResultToValues(

src/views/ShareMyContactInfoView.vue

@@ -78,7 +78,7 @@ export default class ShareMyContactInfoView extends Vue {
     const account = await retrieveFullyDecryptedAccount(activeDid);
 
     const platformService = PlatformServiceFactory.getInstance();
-    const contactQueryResult = await platformService.dbQuery(
+    const contactQueryResult = await platformService.dbQueryRaw(
       "SELECT COUNT(*) FROM contacts",
     );
     let numContacts =

src/views/SharedPhotoView.vue

@@ -111,7 +111,7 @@ export default class SharedPhotoView extends Vue {
       this.activeDid = settings.activeDid;
 
       const platformService = PlatformServiceFactory.getInstance();
-      const tempQuery = await platformService.dbQuery(
+      const tempQuery = await platformService.dbQueryRaw(
         "SELECT * FROM temp WHERE id = ?",
         [SHARED_PHOTO_BASE64_KEY],
       );

src/views/TestView.vue

@@ -425,7 +425,7 @@ export default class Help extends Vue {
           this.fileName = (file as File).name;
 
           const platformService = PlatformServiceFactory.getInstance();
-          const tempQuery = await platformService.dbQuery(
+          const tempQuery = await platformService.dbQueryRaw(
             "SELECT * FROM temp WHERE id = ?",
             [SHARED_PHOTO_BASE64_KEY],
           );
@@ -602,7 +602,7 @@ export default class Help extends Vue {
     try {
       const isSelect = this.sqlQuery.trim().toLowerCase().startsWith("select");
       if (isSelect) {
-        this.sqlResult = await platformService.dbQuery(this.sqlQuery);
+        this.sqlResult = await platformService.dbQueryRaw(this.sqlQuery);
       } else {
         this.sqlResult = await platformService.dbExec(this.sqlQuery);
       }

src/views/UserProfileView.vue

@@ -140,7 +140,7 @@ export default class UserProfileView extends Vue {
 
   async mounted() {
     const platformService = PlatformServiceFactory.getInstance();
-    const settingsQuery = await platformService.dbQuery(
+    const settingsQuery = await platformService.dbQueryRaw(
       "SELECT * FROM settings",
     );
     let settings = databaseUtil.mapQueryResultToValues(
@@ -153,7 +153,7 @@ export default class UserProfileView extends Vue {
     this.partnerApiServer =
       settings[0]?.partnerApiServer || this.partnerApiServer;
 
-    const contactQuery = await platformService.dbQuery(
+    const contactQuery = await platformService.dbQueryRaw(
       "SELECT * FROM contacts",
     );
     this.allContacts = databaseUtil.mapQueryResultToValues(