Merge branch 'main' into test/array-buffers

Author: chrispader

README.md

@@ -258,7 +258,6 @@ import {
   open,
   NitroSQLiteError,
   typeORMDriver,
-  enableSimpleNullHandling, // no-op from 9.3.0
 } from 'react-native-nitro-sqlite'
 import type { QueryResult, BatchQueryCommand, NitroSQLiteConnection, ... } from 'react-native-nitro-sqlite'
 ```

example/src/tests/unit/common.ts

@@ -1,8 +1,5 @@
 import { Chance } from 'chance'
-import {
-  enableSimpleNullHandling,
-  NitroSQLiteError,
-} from 'react-native-nitro-sqlite'
+import { NitroSQLiteError } from 'react-native-nitro-sqlite'
 import { resetTestDb } from '../db'
 import chai from 'chai'
 
@@ -22,6 +19,5 @@ export const expect = chai.expect
 export const chance = new Chance()
 
 export function setupTestDb() {
-  enableSimpleNullHandling(false)
   resetTestDb()
 }

package/cpp/specs/HybridNitroSQLiteQueryResult.cpp

@@ -20,10 +20,6 @@ SQLiteQueryResults HybridNitroSQLiteQueryResult::getResults() {
   return _results;
 };
 
-std::optional<NitroSQLiteQueryResultRows> HybridNitroSQLiteQueryResult::getRows() {
-  return _rows;
-}
-
 std::optional<SQLiteQueryTableMetadata> HybridNitroSQLiteQueryResult::getMetadata() {
   return _metadata;
 }

package/cpp/specs/HybridNitroSQLiteQueryResult.hpp

@@ -13,44 +13,19 @@ class HybridNitroSQLiteQueryResult : public HybridNitroSQLiteQueryResultSpec {
   HybridNitroSQLiteQueryResult() : HybridObject(TAG) {}
   HybridNitroSQLiteQueryResult(SQLiteQueryResults results, std::optional<double> insertId, double rowsAffected,
                                std::optional<SQLiteQueryTableMetadata> metadata)
-      : HybridObject(TAG), _insertId(insertId), _rowsAffected(rowsAffected), _results(std::move(results)), _metadata(metadata) {
-    if (_results.empty()) {
-      // Empty rows: empty vector, length 0, item callback always returns null
-      auto emptyItem = [](double /* idx */) -> std::shared_ptr<Promise<std::optional<SQLiteQueryResultRow>>> {
-        return Promise<std::optional<SQLiteQueryResultRow>>::async([]() -> std::optional<SQLiteQueryResultRow> { return std::nullopt; });
-      };
-      _rows = NitroSQLiteQueryResultRows(SQLiteQueryResults{}, 0.0, std::move(emptyItem));
-      return;
-    }
-
-    auto rows = _results;
-    auto itemFunction = [rows](double idx) -> std::shared_ptr<Promise<std::optional<SQLiteQueryResultRow>>> {
-      return Promise<std::optional<SQLiteQueryResultRow>>::async([rows, idx]() -> std::optional<SQLiteQueryResultRow> {
-        const auto index = static_cast<size_t>(idx);
-        if (index >= rows.size()) {
-          return std::nullopt;
-        }
-        return rows[index];
-      });
-    };
-
-    const auto length = static_cast<double>(rows.size());
-    _rows = NitroSQLiteQueryResultRows(std::move(rows), length, std::move(itemFunction));
-  }
+      : HybridObject(TAG), _insertId(insertId), _rowsAffected(rowsAffected), _results(std::move(results)), _metadata(metadata) {}
 
 private:
   std::optional<double> _insertId;
   double _rowsAffected;
   SQLiteQueryResults _results;
-  std::optional<NitroSQLiteQueryResultRows> _rows;
   std::optional<SQLiteQueryTableMetadata> _metadata;
 
 public:
   // Properties
   std::optional<double> getInsertId() override;
   double getRowsAffected() override;
   SQLiteQueryResults getResults() override;
-  std::optional<NitroSQLiteQueryResultRows> getRows() override;
   std::optional<SQLiteQueryTableMetadata> getMetadata() override;
 };
 

package/nitrogen/generated/shared/c++/HybridNitroSQLiteQueryResultSpec.cpp

@@ -21,9 +21,6 @@ export const NitroSQLite = {
   executeBatchAsync,
 }
 
-/** NOOP on NitroSQLite versions >= 9.3.0 */
-export function enableSimpleNullHandling() {}
-
 export { open } from './operations/session'
 export { default as NitroSQLiteError } from './NitroSQLiteError'
 export type * from './types'

package/nitrogen/generated/shared/c++/HybridNitroSQLiteQueryResultSpec.hpp

@@ -1,15 +1,16 @@
 import { HybridNitroSQLite } from '../nitro'
 import type { QueryResult, QueryResultRow, SQLiteQueryParams } from '../types'
 import NitroSQLiteError from '../NitroSQLiteError'
+import type { NitroSQLiteQueryResult } from '../specs/NitroSQLiteQueryResult.nitro'
 
 export function execute<Row extends QueryResultRow = never>(
   dbName: string,
   query: string,
   params?: SQLiteQueryParams,
 ): QueryResult<Row> {
   try {
-    const result = HybridNitroSQLite.execute(dbName, query, params)
-    return result as QueryResult<Row>
+    const nativeResult = HybridNitroSQLite.execute(dbName, query, params)
+    return buildJSQueryResult<Row>(nativeResult)
   } catch (error) {
     throw NitroSQLiteError.fromError(error)
   }
@@ -21,9 +22,35 @@ export async function executeAsync<Row extends QueryResultRow = never>(
   params?: SQLiteQueryParams,
 ): Promise<QueryResult<Row>> {
   try {
-    const result = await HybridNitroSQLite.executeAsync(dbName, query, params)
-    return result as QueryResult<Row>
+    const nativeResult = await HybridNitroSQLite.executeAsync(
+      dbName,
+      query,
+      params,
+    )
+    return buildJSQueryResult<Row>(nativeResult)
   } catch (error) {
     throw NitroSQLiteError.fromError(error)
   }
 }
+
+function buildJSQueryResult<Row extends QueryResultRow = never>(
+  result: NitroSQLiteQueryResult,
+): QueryResult<Row> {
+  const resultWithRows = result as QueryResult<Row>
+
+  resultWithRows.rows = {
+    _array: result.results as Row[],
+    length: result.results.length,
+    item: (idx: number) => result.results[idx] as Row | undefined,
+  }
+
+  return resultWithRows
+
+  // return Object.assign(result, {
+  //   rows: {
+  //     _array: result.results,
+  //     length: result.results.length,
+  //     item: (idx: number) => result.results[idx],
+  //   },
+  // })
+}

package/nitrogen/generated/shared/c++/NitroSQLiteQueryResultRows.hpp

@@ -19,9 +19,6 @@ export interface NitroSQLiteQueryResult
   /** Query results */
   readonly results: Record<string, SQLiteValue>[]
 
-  /** Query results in a row format for TypeORM compatibility */
-  readonly rows?: NitroSQLiteQueryResultRows
-
   /** Table metadata */
   readonly metadata?: Record<string, NitroSQLiteQueryColumnMetadata>
 }
@@ -33,20 +30,6 @@ export interface NitroSQLiteQueryResult
 
 // type NitroQueryResultRow = Record<string, SQLiteValue>
 
-export type NitroSQLiteQueryResultRows<
-  Row extends Record<string, SQLiteValue> = Record<string, SQLiteValue>,
-> = {
-  /** Raw array with all dataset */
-  _array: Row[]
-  /** The lengh of the dataset */
-  length: number
-  /** A convenience function to acess the index based the row object
-   * @param idx the row index
-   * @returns the row structure identified by column names
-   */
-  item: (idx: number) => Row | undefined
-}
-
 export type NitroSQLiteQueryColumnMetadata = {
   /** The name used for this column for this result set */
   name: string