fix(ios): transaction fix

nativescript-community · Jan 3, 2024 · 187bd04 · 187bd04
1 parent e175831
commit 187bd04
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/src/sqlite/sqlite.ios.ts b/src/sqlite/sqlite.ios.ts
@@ -411,7 +411,7 @@ async function transactionRaw<T = any>(db: FMDatabase, action: (cancel?: () => v
         if (isFirstTransaction) {
             execRaw(db, 'ROLLBACK TRANSACTION');
         }
-        throwError(`transaction: ${e}`);
+        throwError(e);
         return null;
     }
 }
@@ -478,12 +478,21 @@ export class SQLiteDatabase implements ISQLiteDatabase {
     _isInTransaction = false;
     async transaction<T = any>(action: (cancel?: () => void) => Promise<T>): Promise<T> {
         let res;
-        if (!this._isInTransaction) {
-            this._isInTransaction = true;
-            res = transactionRaw(this.db, action, true);
-            this._isInTransaction = false;
-        } else {
-            res = transactionRaw(this.db, action, false);
+        let shouldFinishTransaction = false;
+        try {
+            if (!this._isInTransaction) {
+                this._isInTransaction = shouldFinishTransaction = true;
+                res = await transactionRaw(this.db, action, true);
+            }
+            else {
+                res = await transactionRaw(this.db, action, false);
+            }
+        } catch(error) {
+            throw error;
+        } finally {
+            if (shouldFinishTransaction) {
+                this._isInTransaction = false;
+            }
         }
         return res;
     }