From c20bff7bcbe340ac99ebcacaba3359edd61c068a Mon Sep 17 00:00:00 2001
From: Fabio Di Stasio <fabio286@gmail.com>
Date: Thu, 8 Apr 2021 21:49:38 +0200
Subject: [PATCH] fix: deletion of rows from query results

---
 src/main/ipc-handlers/tables.js  | 10 +++++++---
 src/renderer/mixins/tableTabs.js |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/ipc-handlers/tables.js b/src/main/ipc-handlers/tables.js
index f80849cf..6e46b68c 100644
--- a/src/main/ipc-handlers/tables.js
+++ b/src/main/ipc-handlers/tables.js
@@ -157,9 +157,13 @@ export default (connections) => {
 
    ipcMain.handle('delete-table-rows', async (event, params) => {
       if (params.primary) {
-         const idString = params.rows.map(row => typeof row[params.primary] === 'string'
-            ? `"${row[params.primary]}"`
-            : row[params.primary]).join(',');
+         const idString = params.rows.map(row => {
+            const fieldName = Object.keys(row)[0].includes('.') ? `${params.table}.${params.primary}` : params.primary;
+
+            return typeof row[fieldName] === 'string'
+               ? `"${row[fieldName]}"`
+               : row[fieldName];
+         }).join(',');
 
          try {
             const result = await connections[params.uid]
diff --git a/src/renderer/mixins/tableTabs.js b/src/renderer/mixins/tableTabs.js
index bea0538b..3477f54e 100644
--- a/src/renderer/mixins/tableTabs.js
+++ b/src/renderer/mixins/tableTabs.js
@@ -42,6 +42,7 @@ export default {
 
          try {
             const { status, response } = await Tables.deleteTableRows(params);
+            this.isQuering = false;
 
             if (status === 'success')
                this.reloadTable();
@@ -50,9 +51,8 @@ export default {
          }
          catch (err) {
             this.addNotification({ status: 'error', message: err.stack });
+            this.isQuering = false;
          }
-
-         this.isQuering = false;
       }
    }
 };