Set transaction mode (#90)

* bump sqlite3 to [email protected] * 2.6.17 * set transaction mode before begin * 2.7.0 --------- Co-authored-by: Ubuntu <developer@hive.de0cq2v0owxuvngnu2s2vvfqfg.frax.internal.cloudapp.net>
themost-framework · Mar 20, 2024 · 862ca1b · 862ca1b
1 parent dde02fe
commit 862ca1b
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 20 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@themost/sqlite",
-  "version": "2.6.17",
+  "version": "2.7.0",
   "description": "MOST Web Framework SQLite Adapter",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/src/SqliteAdapter.js b/src/SqliteAdapter.js
@@ -198,31 +198,40 @@ class SqliteAdapter {
                     });
                 }
                 else {
+                    // set transaction mode before begin
+                    self.transaction = true;
                     //begin transaction
                     self.rawConnection.run('BEGIN TRANSACTION;', undefined, function (err) {
                         if (err) {
-                            callback(err);
-                            return;
+                            // reset transaction mode
+                            delete self.transaction;
+                            return callback(err);
                         }
-                        //initialize dummy transaction object (for future use)
-                        self.transaction = true;
-                        //execute function
-                        fn.call(self, function (err) {
-                            if (err) {
-                                //rollback transaction
-                                self.rawConnection.run('ROLLBACK;', undefined, function () {
-                                    delete self.transaction;
-                                    return callback(err);
-                                });
-                            }
-                            else {
-                                //commit transaction
+                        try {
+                            // invoke method
+                            fn(function (err) {
+                                if (err) {
+                                    // rollback transaction
+                                    return self.rawConnection.run('ROLLBACK;', undefined, function () {
+                                        // reset transcation mode on error
+                                        delete self.transaction;
+                                        return callback(err);
+                                    });
+                                }
+                                // commit transaction
                                 self.rawConnection.run('COMMIT;', undefined, function (err) {
+                                    // reset transcation mode on error
                                     delete self.transaction;
                                     return callback(err);
                                 });
-                            }
-                        });
+                            });
+                        } catch (invokeError) {
+                            return self.rawConnection.run('ROLLBACK;', undefined, function () {
+                                // reset transcation mode on error
+                                delete self.transaction;
+                                return callback(invokeError);
+                            });
+                        }
                     });
                 }
             }