fix opendb and other query being called together in case of db close

ujjwalguptaofficial · Sep 19, 2023 · bf18bac · bf18bac
1 parent 2f01f0b
commit bf18bac
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/main/connection_helper.ts b/src/main/connection_helper.ts
@@ -94,12 +94,10 @@ export class ConnectionHelper {
             this.isDbIdle_ = true;
             break;
           case API.CloseDb:
+            this.isDbIdle_ = true;
+            this.eventBus_.emit(EVENT.RequestQueueEmpty, []);
             if (this.requestQueue_.length > 0) {
-              this.openDb_();
-            }
-            else {
-              this.isDbIdle_ = true;
-              this.eventBus_.emit(EVENT.RequestQueueEmpty, []);
+              this.openDb_(false);
             }
             break;
         }
@@ -110,8 +108,8 @@ export class ConnectionHelper {
     }
   }
 
-  private openDb_() {
-    this.prcoessExecutionOfQry_({
+  private openDb_(execute = true) {
+    const request = {
       name: API.OpenDb,
       query: {
         name: this.database.name,
@@ -123,7 +121,13 @@ export class ConnectionHelper {
       onError: function (err) {
         console.error(err);
       }
-    }, 0);
+    };
+    if (execute) {
+      this.prcoessExecutionOfQry_(request, 0);
+    }
+    else {
+      this.requestQueue_.splice(0, 0, request);
+    }
   }
 
   private executeMiddleware_(input: WebWorkerRequest) {

diff --git a/src/worker/query_manager.ts b/src/worker/query_manager.ts
@@ -299,7 +299,7 @@ export class QueryManager {
                         this.util
                     ).then((dbFromCache: DbMeta) => {
                         if (dbFromCache) {
-                            dbFromCache.tables.forEach((tableFromCache, index) => {
+                            dbFromCache.tables.forEach((tableFromCache) => {
                                 const targetTable = dbMeta.tables.find(q => q.name === tableFromCache.name);
                                 if (targetTable) {
                                     for (const key in tableFromCache.autoIncColumnValue) {