cleanup

Author: stevensJourney

packages/drizzle-driver/src/sqlite/PowerSyncSQLitePreparedQuery.ts

@@ -1,5 +1,5 @@
-import type { QueryResult } from '@powersync/common';
-import { Column, DriverValueDecoder, getTableName, SQL } from 'drizzle-orm';
+import type { LockContext, QueryResult } from '@powersync/common';
+import { Column, DriverValueDecoder, SQL, getTableName } from 'drizzle-orm';
 import type { Cache } from 'drizzle-orm/cache/core';
 import type { WithCacheConfig } from 'drizzle-orm/cache/core/types';
 import { entityKind, is } from 'drizzle-orm/entity';
@@ -70,10 +70,7 @@ export class PowerSyncSQLitePreparedQuery<
   async run(placeholderValues?: Record<string, unknown>): Promise<QueryResult> {
     const params = fillPlaceholders(this.query.params, placeholderValues ?? {});
     this.logger.logQuery(this.query.sql, params);
-    /**
-     * Run operations are teated as potential mutations, so they use the write context.
-     */
-    return this.contextProvider.useWriteContext(async (ctx) => {
+    return this.useContext(async (ctx) => {
       const rs = await ctx.execute(this.query.sql, params);
       return rs;
     });
@@ -90,7 +87,6 @@ export class PowerSyncSQLitePreparedQuery<
     }
 
     const rows = (await this.values(placeholderValues)) as unknown[][];
-
     if (customResultMapper) {
       const mapped = customResultMapper(rows) as T['all'];
       return mapped;
@@ -128,20 +124,22 @@ export class PowerSyncSQLitePreparedQuery<
     const params = fillPlaceholders(this.query.params, placeholderValues ?? {});
     this.logger.logQuery(this.query.sql, params);
 
-    if (this.readOnly) {
-      return await this.contextProvider.useReadContext(async (ctx) => {
-        return await ctx.executeRaw(this.query.sql, params);
-      });
-    } else {
-      return await this.contextProvider.useWriteContext(async (ctx) => {
-        return await ctx.executeRaw(this.query.sql, params);
-      });
-    }
+    return await this.useContext(async (ctx) => {
+      return await ctx.executeRaw(this.query.sql, params);
+    });
   }
 
   isResponseInArrayMode(): boolean {
     return this._isResponseInArrayMode;
   }
+
+  protected useContext<T>(callback: LockCallback<T>): Promise<T> {
+    if (this.readOnly) {
+      return this.contextProvider.useReadContext(callback);
+    } else {
+      return this.contextProvider.useWriteContext(callback);
+    }
+  }
 }
 
 /**