@syncular/dialect-react-native-nitro-sqlite 0.0.1-73 → 0.0.1-89

package/dist/index.js

@@ -111,12 +111,16 @@ class NitroSqliteConnection {
     async executeQuery(compiledQuery) {
         const { sql, parameters } = compiledQuery;
         const params = parameters;
-        // Determine if this is a SELECT / RETURNING query
-        const isSelect = /^\s*(select|pragma|explain|with)\b/i.test(sql);
+        const hasReturning = /\breturning\b/i.test(sql);
+        const isSelectLike = /^\s*(select|pragma|explain|with)\b/i.test(sql);
         // Execute the query
         const result = this.#db.execute(sql, params);
-        if (isSelect) {
-            return { rows: (result.results ?? []) };
+        if (isSelectLike || hasReturning) {
+            const rows = (result.results ?? []);
+            return {
+                rows,
+                ...(hasReturning ? { numAffectedRows: BigInt(rows.length) } : {}),
+            };
         }
         // For INSERT, UPDATE, DELETE — return affected rows info
         return {

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@syncular/dialect-react-native-nitro-sqlite",
-  "version": "0.0.1-73",
+  "version": "0.0.1-89",
   "description": "React Native Nitro SQLite dialect for the Syncular client",
   "license": "MIT",
   "author": "Benjamin Kniffler",

package/src/index.test.ts

@@ -0,0 +1,122 @@
+import { afterEach, beforeEach, describe, expect, it } from 'bun:test';
+import type { Kysely } from 'kysely';
+import type {
+  BatchQueryCommand,
+  BatchQueryResult,
+  FileLoadResult,
+  QueryResult as NitroQueryResult,
+  NitroSQLiteConnection,
+  SQLiteValue,
+  Transaction,
+} from 'react-native-nitro-sqlite';
+import { createNitroSqliteDb } from './index';
+
+interface TestDb {
+  tasks: {
+    id: string;
+    title: string;
+  };
+}
+
+function createNitroResult<Row extends Record<string, SQLiteValue>>(
+  rows: Row[],
+  rowsAffected: number,
+  insertId?: number
+): NitroQueryResult<Row> {
+  return {
+    name: 'FakeNitroResult',
+    toString: () => 'FakeNitroResult',
+    equals: () => false,
+    dispose: () => {},
+    rowsAffected,
+    insertId,
+    results: rows,
+  };
+}
+
+class FakeNitroDatabase implements NitroSQLiteConnection {
+  readonly executedSql: string[] = [];
+  closed = false;
+
+  close(): void {
+    this.closed = true;
+  }
+
+  delete(): void {}
+
+  attach(_dbNameToAttach: string, _alias: string, _location?: string): void {}
+
+  detach(_alias: string): void {}
+
+  async transaction<Result>(
+    transactionCallback: (tx: Transaction) => Promise<Result>
+  ): Promise<Result> {
+    const transaction: Transaction = {
+      commit: () => createNitroResult<Record<string, SQLiteValue>>([], 0),
+      rollback: () => createNitroResult<Record<string, SQLiteValue>>([], 0),
+      execute: (query, params) => this.execute(query, params),
+      executeAsync: async (query, params) => this.execute(query, params),
+    };
+    return transactionCallback(transaction);
+  }
+
+  execute<
+    Row extends Record<string, SQLiteValue> = Record<string, SQLiteValue>,
+  >(query: string, _params?: SQLiteValue[]): NitroQueryResult<Row> {
+    this.executedSql.push(query);
+    if (/\breturning\b/i.test(query)) {
+      return createNitroResult([{ id: 'task-1', title: 'after' } as Row], 1, 1);
+    }
+    return createNitroResult([], 1, 1);
+  }
+
+  async executeAsync<
+    Row extends Record<string, SQLiteValue> = Record<string, SQLiteValue>,
+  >(query: string, params?: SQLiteValue[]): Promise<NitroQueryResult<Row>> {
+    return this.execute<Row>(query, params);
+  }
+
+  executeBatch(_commands: BatchQueryCommand[]): BatchQueryResult {
+    return { rowsAffected: 0 };
+  }
+
+  async executeBatchAsync(
+    _commands: BatchQueryCommand[]
+  ): Promise<BatchQueryResult> {
+    return { rowsAffected: 0 };
+  }
+
+  loadFile(_location: string): FileLoadResult {
+    return {};
+  }
+
+  async loadFileAsync(_location: string): Promise<FileLoadResult> {
+    return {};
+  }
+}
+
+describe('nitro sqlite dialect RETURNING behavior', () => {
+  let fakeDb: FakeNitroDatabase;
+  let db: Kysely<TestDb>;
+
+  beforeEach(() => {
+    fakeDb = new FakeNitroDatabase();
+    db = createNitroSqliteDb<TestDb>({ database: fakeDb });
+  });
+
+  afterEach(async () => {
+    await db.destroy();
+  });
+
+  it('returns rows for non-select UPDATE ... RETURNING queries', async () => {
+    const updated = await db
+      .updateTable('tasks')
+      .set({ title: 'after' })
+      .where('id', '=', 'task-1')
+      .returning(['id', 'title'])
+      .executeTakeFirstOrThrow();
+
+    expect(updated).toEqual({ id: 'task-1', title: 'after' });
+    expect(fakeDb.executedSql).toHaveLength(1);
+  });
+});

package/src/index.ts

@@ -185,14 +185,18 @@ class NitroSqliteConnection implements DatabaseConnection {
     const { sql, parameters } = compiledQuery;
     const params = parameters as SQLiteValue[];
 
-    // Determine if this is a SELECT / RETURNING query
-    const isSelect = /^\s*(select|pragma|explain|with)\b/i.test(sql);
+    const hasReturning = /\breturning\b/i.test(sql);
+    const isSelectLike = /^\s*(select|pragma|explain|with)\b/i.test(sql);
 
     // Execute the query
     const result = this.#db.execute(sql, params);
 
-    if (isSelect) {
-      return { rows: (result.results ?? []) as R[] };
+    if (isSelectLike || hasReturning) {
+      const rows = (result.results ?? []) as R[];
+      return {
+        rows,
+        ...(hasReturning ? { numAffectedRows: BigInt(rows.length) } : {}),
+      };
     }
 
     // For INSERT, UPDATE, DELETE — return affected rows info