Revert other changes

Author: simolus3

packages/capacitor/src/adapter/CapacitorSQLiteAdapter.ts

@@ -215,6 +215,19 @@ export class CapacitorSQLiteAdapter extends DBAdapter {
       return result.rows?._array ?? ([] as T[]);
     };
 
+    const getOptional = async <T>(query: string, params?: any[]): Promise<T | null> => {
+      const results = await getAll<T>(query, params);
+      return results.length > 0 ? results[0] : null;
+    };
+
+    const get = async <T>(query: string, params?: any[]): Promise<T> => {
+      const result = await getOptional<T>(query, params);
+      if (!result) {
+        throw new Error(`No results for query: ${query}`);
+      }
+      return result;
+    };
+
     const executeRaw = async (query: string, params?: any[]): Promise<RawQueryResult> => {
       // This is a workaround, we don't support multiple columns of the same name
       const { insertId, rowsAffected, rows } = await execute(query, params);
@@ -256,6 +269,14 @@ export class CapacitorSQLiteAdapter extends DBAdapter {
         return getAll(sql, parameters);
       }
 
+      get<T>(sql: string, parameters?: any[]): Promise<T> {
+        return get(sql, parameters);
+      }
+
+      getOptional<T>(sql: string, parameters?: any[]): Promise<T | null> {
+        return getOptional(sql, parameters);
+      }
+
       execute<T>(query: string, params?: any[] | undefined): Promise<QueryResult<T>> {
         return execute<T>(query, params);
       }

packages/common/src/db/DBAdapter.ts

@@ -105,9 +105,9 @@ export abstract class LockContext implements SqlExecutor, DBGetUtils {
   }
 
   async getOptional<T>(sql: string, parameters?: any[]): Promise<T | null> {
-    const { rows } = await this.execute(sql, parameters);
-    if (rows && rows.length > 0) {
-      return rows.item(0);
+    const { array } = await this.execute<T>(sql, parameters);
+    if (array.length > 0) {
+      return array[0];
     }
 
     return null;

packages/node/src/db/AsyncDatabase.ts

@@ -1,6 +1,10 @@
-import { QueryResult, RawQueryResult } from '@powersync/common';
+import { BaseQueryResult, QueryResult, RawQueryResult } from '@powersync/common';
 import { NodeDatabaseImplementation } from './options.js';
 
+export interface MappedQueryResult extends BaseQueryResult {
+  rows?: unknown[];
+}
+
 export interface AsyncDatabaseOpenOptions {
   path: string;
   isWriter: boolean;
@@ -12,6 +16,7 @@ export interface AsyncDatabaseOpener {
 }
 
 export interface AsyncDatabase {
+  execute: (query: string, params: any[]) => Promise<MappedQueryResult>;
   executeRaw: (query: string, params: any[]) => Promise<RawQueryResult>;
   executeBatch: (query: string, params: any[][]) => Promise<QueryResult<never>>;
   close: () => Promise<void>;

packages/node/src/db/BetterSqliteWorker.ts

@@ -1,5 +1,5 @@
 import type { Database } from 'better-sqlite3';
-import { AsyncDatabase, AsyncDatabaseOpenOptions } from './AsyncDatabase.js';
+import { AsyncDatabase, AsyncDatabaseOpenOptions, MappedQueryResult } from './AsyncDatabase.js';
 import { PowerSyncWorkerOptions } from './SqliteWorker.js';
 import { threadId } from 'node:worker_threads';
 import { QueryResult, queryResultWithoutRows, RawQueryResult, SqliteValue } from '@powersync/common';
@@ -17,6 +17,23 @@ class BlockingAsyncDatabase implements AsyncDatabase {
     this.db.close();
   }
 
+  async execute(query: string, params: any[]): Promise<MappedQueryResult> {
+    const stmt = this.db.prepare(query);
+    if (stmt.reader) {
+      const rows = stmt.all(params);
+      return {
+        rowsAffected: 0,
+        rows
+      };
+    } else {
+      const info = stmt.run(params);
+      return {
+        rowsAffected: info.changes,
+        insertId: Number(info.lastInsertRowid)
+      };
+    }
+  }
+
   async executeRaw(query: string, params: any[]): Promise<RawQueryResult> {
     const stmt = this.db.prepare(query);
     if (stmt.reader) {

packages/node/src/db/NodeSqliteWorker.ts

@@ -1,7 +1,7 @@
 import type { DatabaseSync } from 'node:sqlite';
 import { threadId } from 'node:worker_threads';
 
-import { AsyncDatabase, AsyncDatabaseOpenOptions } from './AsyncDatabase.js';
+import { AsyncDatabase, AsyncDatabaseOpenOptions, MappedQueryResult } from './AsyncDatabase.js';
 import { PowerSyncWorkerOptions } from './SqliteWorker.js';
 import { QueryResult, queryResultWithoutRows, RawQueryResult, SqliteValue } from '@powersync/common';
 
@@ -18,6 +18,15 @@ class BlockingNodeDatabase implements AsyncDatabase {
     this.db.close();
   }
 
+  async execute(query: string, params: any[]): Promise<MappedQueryResult> {
+    const stmt = this.db.prepare(query);
+    const rows = stmt.all(...params);
+    return {
+      rowsAffected: 0,
+      rows
+    };
+  }
+
   async executeRaw(query: string, params: any[]): Promise<RawQueryResult> {
     const stmt = this.db.prepare(query);
     (stmt as any).setReturnArrays(true); // Missing in @types/node, https://nodejs.org/api/sqlite.html#statementsetreturnarraysenabled

packages/node/src/db/RemoteConnection.ts

@@ -1,4 +1,4 @@
-import { QueryResult, LockContext, RawQueryResult } from '@powersync/common';
+import { QueryResult, LockContext, RawQueryResult, SqliteRecord, queryResultFromMapped } from '@powersync/common';
 import { releaseProxy, Remote } from 'comlink';
 import { Worker } from 'node:worker_threads';
 import { AsyncDatabase, AsyncDatabaseOpener } from './AsyncDatabase.js';
@@ -71,6 +71,13 @@ export class RemoteConnection extends LockContext {
     });
   }
 
+  execute<T = SqliteRecord>(query: string, params?: any[] | undefined): Promise<QueryResult<T>> {
+    return this.withRemote(async () => {
+      const results = await this.database.execute(query, params ?? []);
+      return queryResultFromMapped(results, results.rows as T[] | undefined);
+    });
+  }
+
   executeBatch(query: string, params: any[][] = []): Promise<QueryResult<never>> {
     return this.withRemote(async () => {
       return await this.database.executeBatch(query, params ?? []);