feat: implement null handling for executeBatch

Author: chrispader

package/src/index.ts

@@ -3,6 +3,7 @@ import { HybridNitroSQLite } from './nitro'
 import { open } from './operations/session'
 import { execute, executeAsync } from './operations/execute'
 import { init } from './OnLoad'
+import { executeBatch, executeBatchAsync } from './operations/executeBatch'
 export type * from './types'
 export { typeORMDriver } from './typeORM'
 
@@ -18,6 +19,8 @@ export const NitroSQLite = {
   transaction,
   execute,
   executeAsync,
+  executeBatch,
+  executeBatchAsync,
 }
 
 export { open } from './operations/session'

package/src/operations/executeBatch.ts

@@ -0,0 +1,62 @@
+import { NITRO_SQLITE_NULL, isSimpleNullHandlingEnabled } from '../nullHandling'
+import { HybridNitroSQLite } from '../nitro'
+import type {
+  NativeSQLiteQueryParams,
+  BatchQueryResult,
+  BatchQueryCommand,
+  NativeBatchQueryCommand,
+  SQLiteValue,
+  SQLiteQueryParamItem,
+} from '../types'
+
+export function executeBatch(
+  dbName: string,
+  commands: BatchQueryCommand[]
+): BatchQueryResult {
+  const transformedCommands = isSimpleNullHandlingEnabled()
+    ? toNativeBatchQueryCommands(commands)
+    : (commands as NativeBatchQueryCommand[])
+
+  const result = HybridNitroSQLite.executeBatch(dbName, transformedCommands)
+  return result
+}
+
+export async function executeBatchAsync(
+  dbName: string,
+  commands: BatchQueryCommand[]
+): Promise<BatchQueryResult> {
+  const transformedCommands = isSimpleNullHandlingEnabled()
+    ? toNativeBatchQueryCommands(commands)
+    : (commands as NativeBatchQueryCommand[])
+
+  const result = await HybridNitroSQLite.executeBatchAsync(
+    dbName,
+    transformedCommands
+  )
+  return result
+}
+
+function replaceWithNativeNull(value: SQLiteQueryParamItem): SQLiteValue {
+  if (value === undefined || value === null) {
+    return NITRO_SQLITE_NULL
+  }
+  return value
+}
+
+function toNativeBatchQueryCommands(
+  commands: BatchQueryCommand[]
+): NativeBatchQueryCommand[] {
+  return commands.map((command) => {
+    const transformedParams = command.params?.map((param) => {
+      if (Array.isArray(param)) {
+        return param.map((p) => replaceWithNativeNull(p))
+      }
+      return replaceWithNativeNull(param)
+    }) as NativeSQLiteQueryParams | NativeSQLiteQueryParams[]
+
+    return {
+      query: command.query,
+      params: transformedParams,
+    }
+  })
+}

package/src/operations/session.ts

@@ -10,6 +10,7 @@ import type {
   QueryResultRow,
 } from '../types'
 import { execute, executeAsync } from './execute'
+import { executeBatch, executeBatchAsync } from './executeBatch'
 
 export function open(
   options: NitroSQLiteConnectionOptions
@@ -33,9 +34,9 @@ export function open(
       params?: SQLiteQueryParams
     ): Promise<QueryResult<Row>> => executeAsync(options.name, query, params),
     executeBatch: (commands: BatchQueryCommand[]) =>
-      HybridNitroSQLite.executeBatch(options.name, commands),
+      executeBatch(options.name, commands),
     executeBatchAsync: (commands: BatchQueryCommand[]) =>
-      HybridNitroSQLite.executeBatchAsync(options.name, commands),
+      executeBatchAsync(options.name, commands),
     loadFile: (location: string) =>
       HybridNitroSQLite.loadFile(options.name, location),
     loadFileAsync: (location: string) =>

package/src/specs/NitroSQLite.nitro.ts

@@ -2,8 +2,8 @@ import type { HybridObject } from 'react-native-nitro-modules'
 import type {
   BatchQueryResult,
   FileLoadResult,
-  BatchQueryCommand,
   NativeSQLiteQueryParams,
+  NativeBatchQueryCommand,
 } from '../types'
 import type { NativeQueryResult } from './NativeQueryResult.nitro'
 
@@ -29,10 +29,13 @@ export interface NitroSQLite
     query: string,
     params?: NativeSQLiteQueryParams
   ): Promise<NativeQueryResult>
-  executeBatch(dbName: string, commands: BatchQueryCommand[]): BatchQueryResult
+  executeBatch(
+    dbName: string,
+    commands: NativeBatchQueryCommand[]
+  ): BatchQueryResult
   executeBatchAsync(
     dbName: string,
-    commands: BatchQueryCommand[]
+    commands: NativeBatchQueryCommand[]
   ): Promise<BatchQueryResult>
   loadFile(dbName: string, location: string): FileLoadResult
   loadFileAsync(dbName: string, location: string): Promise<FileLoadResult>

package/src/types.ts

@@ -36,6 +36,8 @@ export type SQLiteValue =
   | string
   | ArrayBuffer
   | SQLiteNullValue
+
+/** Used internally to transform the query params into a native format without nullish values */
 export type NativeSQLiteQueryParams = SQLiteValue[]
 
 /**
@@ -91,6 +93,14 @@ export interface BatchQueryCommand {
   params?: SQLiteQueryParams | SQLiteQueryParams[]
 }
 
+/**
+ * Used internally to transform the batch query commands into a native format without nullish values
+ */
+export interface NativeBatchQueryCommand {
+  query: string
+  params?: NativeSQLiteQueryParams | NativeSQLiteQueryParams[]
+}
+
 /**
  * status: 0 or undefined for correct execution, 1 for error
  * message: if status === 1, here you will find error description