Merge branch 'main' into fix/add-transaction-locks

Author: chrispader

package/cpp/NitroSQLiteException.hpp

@@ -3,8 +3,10 @@
 #include <exception>
 #include <iostream>
 #include <string>
+#include <optional>
+
+const std::string NITRO_SQLITE_EXCEPTION_PREFIX = "[NativeNitroSQLiteException]";
 
-const std::string NITRO_SQLITE_EXCEPTION_PREFIX = "[NitroSQLiteException]";
 
 enum NitroSQLiteExceptionType {
   UnknownError,
@@ -35,7 +37,7 @@ class NitroSQLiteException : public std::exception {
   explicit NitroSQLiteException(const std::string& message) : NitroSQLiteException(NitroSQLiteExceptionType::UnknownError, message) {}
   NitroSQLiteException(const NitroSQLiteExceptionType& type, const char* message) : NitroSQLiteException(type, std::string(message)) {}
   NitroSQLiteException(const NitroSQLiteExceptionType& type, const std::string& message)
-      : _exceptionString(NITRO_SQLITE_EXCEPTION_PREFIX + " [" + typeToString(type) + "] " + message) {}
+      : _exceptionString(NITRO_SQLITE_EXCEPTION_PREFIX + "[" + typeToString(type) + "] " + message) {}
 
 private:
   const std::string _exceptionString;

package/src/NitroSQLiteError.ts

@@ -1,5 +1,4 @@
 const NITRO_SQLITE_ERROR_NAME = 'NitroSQLiteError' as const
-const NITRO_SQLITE_ERROR_PREFIX = '[NitroSQLite] ' as const
 
 /**
  * Custom error class for NitroSQLite operations
@@ -9,7 +8,6 @@ export default class NitroSQLiteError extends Error {
   constructor(message: string, options?: ErrorOptions) {
     super(message, options)
     this.name = NITRO_SQLITE_ERROR_NAME
-    this.message = NITRO_SQLITE_ERROR_PREFIX + message
 
     // Maintains proper prototype chain for instanceof checks
     Object.setPrototypeOf(this, NitroSQLiteError.prototype)

package/src/operations/executeBatch.ts

@@ -45,20 +45,16 @@ export async function executeBatchAsync(
     ? toNativeBatchQueryCommands(commands)
     : (commands as NativeBatchQueryCommand[])
 
-  try {
-    return queueOperationAsync(dbName, async () => {
-      try {
-        return await HybridNitroSQLite.executeBatchAsync(
-          dbName,
-          transformedCommands,
-        )
-      } catch (error) {
-        throw NitroSQLiteError.fromError(error)
-      }
-    })
-  } catch (error) {
-    throw NitroSQLiteError.fromError(error)
-  }
+  return queueOperationAsync(dbName, async () => {
+    try {
+      return await HybridNitroSQLite.executeBatchAsync(
+        dbName,
+        transformedCommands,
+      )
+    } catch (error) {
+      throw NitroSQLiteError.fromError(error)
+    }
+  })
 }
 
 function toNativeBatchQueryCommands(

package/src/operations/transaction.ts

@@ -61,37 +61,33 @@ export const transaction = async <Result = void>(
     return execute(dbName, 'ROLLBACK')
   }
 
-  try {
-    return await queueOperationAsync(dbName, async () => {
-      try {
-        await executeAsync(
-          dbName,
-          isExclusive ? 'BEGIN EXCLUSIVE TRANSACTION' : 'BEGIN TRANSACTION',
-        )
+  return await queueOperationAsync(dbName, async () => {
+    try {
+      await executeAsync(
+        dbName,
+        isExclusive ? 'BEGIN EXCLUSIVE TRANSACTION' : 'BEGIN TRANSACTION',
+      )
 
-        const result = await transactionCallback({
-          commit,
-          execute: executeOnTransaction,
-          executeAsync: executeAsyncOnTransaction,
-          rollback,
-        })
+      const result = await transactionCallback({
+        commit,
+        execute: executeOnTransaction,
+        executeAsync: executeAsyncOnTransaction,
+        rollback,
+      })
 
-        if (!isFinalized) commit()
+      if (!isFinalized) commit()
 
-        return result
-      } catch (executionError) {
-        if (!isFinalized) {
-          try {
-            rollback()
-          } catch (rollbackError) {
-            throw rollbackError
-          }
-        }
+      return result
+    } catch (executionError) {
+      if (isFinalized) {
+        throw NitroSQLiteError.fromError(executionError)
+      }
 
-        throw executionError
+      try {
+        return rollback()
+      } catch (rollbackError) {
+        throw NitroSQLiteError.fromError(rollbackError)
       }
-    })
-  } catch (error) {
-    throw NitroSQLiteError.fromError(error)
-  }
+    }
+  })
 }