From ad0bad8486c3d67ec14ec1aed3d8aff6cce9df87 Mon Sep 17 00:00:00 2001
From: Fabio <fabio286@gmail.com>
Date: Fri, 11 Sep 2020 18:01:07 +0200
Subject: [PATCH] fix: wrong field names when join tables

---
 src/main/libs/AntaresConnector.js             |   2 +-
 .../components/WorkspaceConnectPanel.vue      |   2 +-
 src/renderer/components/WorkspaceQueryTab.vue | 106 +++++++++---------
 .../components/WorkspaceQueryTable.vue        |   4 +-
 src/renderer/i18n/en-US.js                    |   3 +-
 5 files changed, 61 insertions(+), 56 deletions(-)

diff --git a/src/main/libs/AntaresConnector.js b/src/main/libs/AntaresConnector.js
index b144b279..7be976d5 100644
--- a/src/main/libs/AntaresConnector.js
+++ b/src/main/libs/AntaresConnector.js
@@ -292,7 +292,7 @@ export class AntaresConnector {
             case 'maria':
             case 'mysql': {
                const { rows, report, fields } = await new Promise((resolve, reject) => {
-                  this._connection.query(query, (err, response, fields) => {
+                  this._connection.query({ sql: query, nestTables: false }, (err, response, fields) => {
                      if (err)
                         reject(err);
                      else {
diff --git a/src/renderer/components/WorkspaceConnectPanel.vue b/src/renderer/components/WorkspaceConnectPanel.vue
index df2345f1..74ecab47 100644
--- a/src/renderer/components/WorkspaceConnectPanel.vue
+++ b/src/renderer/components/WorkspaceConnectPanel.vue
@@ -5,7 +5,7 @@
             <i class="mdi mdi-48px mdi-power-plug-off" />
          </div>
          <p class="empty-title h5">
-            {{ $t('word.disconnected') }}
+            {{ isConnecting ? $t('word.connecting') : $t('word.disconnected') }}
          </p>
          <div class="empty-action">
             <button
diff --git a/src/renderer/components/WorkspaceQueryTab.vue b/src/renderer/components/WorkspaceQueryTab.vue
index bcd85fab..2db1f995 100644
--- a/src/renderer/components/WorkspaceQueryTab.vue
+++ b/src/renderer/components/WorkspaceQueryTab.vue
@@ -85,12 +85,15 @@ export default {
          setTabFields: 'workspaces/setTabFields',
          setTabKeyUsage: 'workspaces/setTabKeyUsage'
       }),
-      getTable (index) {
+      getResultParams (index) {
          const resultsWithRows = this.results.filter(result => result.rows);
 
-         if (resultsWithRows[index] && resultsWithRows[index].fields && resultsWithRows[index].fields.length)
-            return resultsWithRows[index].fields[0].orgTable;
-         return '';
+         if (resultsWithRows[index] && resultsWithRows[index].fields && resultsWithRows[index].fields.length) {
+            return resultsWithRows[index].fields.map(field => {
+               return { table: field.orgTable, schema: field.db };
+            }).filter((val, i, arr) => arr.findIndex(el => el.schema === val.schema && el.table === val.table) === i);
+         }
+         return [];
       },
       async runQuery (query) {
          if (!query) return;
@@ -112,68 +115,69 @@ export default {
                let selectedFields = [];
                const fieldsArr = [];
                const keysArr = [];
-               let index = 0;
+               let qI = 0;
 
-               for (let i = 0; i < this.results.length; i++) {
-                  if (this.results[i].rows) { // if is a select
-                     const table = this.getTable(index);
+               for (const result of this.results) { // cycle queries
+                  let fI = 0;
 
-                     selectedFields = this.results[i].fields.map(field => field.orgName);
-                     const selectedSchema = this.results[i].fields[0].db;
-                     this.resultsCount += this.results[i].rows.length;
+                  if (result.rows) { // if is a select
+                     const paramsArr = this.getResultParams(qI);
 
-                     try { // Table data
-                        const params = {
-                           uid: this.connection.uid,
-                           schema: selectedSchema,
-                           table
-                        };
+                     selectedFields = result.fields.map(field => field.orgName);
+                     this.resultsCount += result.rows.length;
 
-                        const { status, response } = await Tables.getTableColumns(params);
+                     for (const paramObj of paramsArr) {
+                        try { // Table data
+                           const params = {
+                              uid: this.connection.uid,
+                              ...paramObj
+                           };
 
-                        if (status === 'success') {
-                           let fields = response.filter(field => selectedFields.includes(field.name));
-                           if (selectedFields.length) {
-                              fields = fields.map((field, index) => {
-                                 return { ...field, alias: this.results[i].fields[index].name };
-                              });
+                           const { status, response } = await Tables.getTableColumns(params);
+
+                           if (status === 'success') {
+                              let fields = response.filter(field => selectedFields.includes(field.name));
+                              if (selectedFields.length) {
+                                 fields = fields.map(field => {
+                                    return { ...field, alias: result.fields[fI++].name };
+                                 });
+                              }
+
+                              fieldsArr.push(fields);
                            }
-
-                           fieldsArr.push(fields);
+                           else
+                              this.addNotification({ status: 'error', message: response });
+                        }
+                        catch (err) {
+                           this.addNotification({ status: 'error', message: err.stack });
                         }
-                        else
-                           this.addNotification({ status: 'error', message: response });
-                     }
-                     catch (err) {
-                        this.addNotification({ status: 'error', message: err.stack });
-                     }
 
-                     try { // Key usage (foreign keys)
-                        const params = {
-                           uid: this.connection.uid,
-                           schema: selectedSchema,
-                           table
-                        };
+                        try { // Key usage (foreign keys)
+                           const params = {
+                              uid: this.connection.uid,
+                              ...paramObj
+                           };
 
-                        const { status, response } = await Tables.getKeyUsage(params);
-                        if (status === 'success')
-                           keysArr.push(response);
-                        else
-                           this.addNotification({ status: 'error', message: response });
-                     }
-                     catch (err) {
-                        this.addNotification({ status: 'error', message: err.stack });
+                           const { status, response } = await Tables.getKeyUsage(params);
+                           if (status === 'success')
+                              keysArr.push(response);
+                           else
+                              this.addNotification({ status: 'error', message: response });
+                        }
+                        catch (err) {
+                           this.addNotification({ status: 'error', message: err.stack });
+                        }
                      }
                   }
-                  else if (this.results[i].report) { // if is a query without output
-                     this.affectedCount += this.results[i].report.affectedRows;
+                  else if (result.report) { // if is a query without output
+                     this.affectedCount += result.report.affectedRows;
                   }
 
-                  index++;
+                  qI++;
                }
 
-               this.setTabFields({ cUid: this.connection.uid, tUid: this.tabUid, fields: fieldsArr });
-               this.setTabKeyUsage({ cUid: this.connection.uid, tUid: this.tabUid, keyUsage: keysArr });
+               this.setTabFields({ cUid: this.connection.uid, tUid: this.tabUid, fields: [fieldsArr.flat()] });
+               this.setTabKeyUsage({ cUid: this.connection.uid, tUid: this.tabUid, keyUsage: [keysArr.flat()] });
             }
             else
                this.addNotification({ status: 'error', message: response });
diff --git a/src/renderer/components/WorkspaceQueryTable.vue b/src/renderer/components/WorkspaceQueryTable.vue
index cfc8f7e4..54ba8b37 100644
--- a/src/renderer/components/WorkspaceQueryTable.vue
+++ b/src/renderer/components/WorkspaceQueryTable.vue
@@ -26,8 +26,8 @@
          <div class="thead">
             <div class="tr">
                <div
-                  v-for="field in fields"
-                  :key="field.name"
+                  v-for="(field, index) in fields"
+                  :key="index"
                   class="th c-hand"
                >
                   <div ref="columnResize" class="column-resizable">
diff --git a/src/renderer/i18n/en-US.js b/src/renderer/i18n/en-US.js
index 0c376073..d3890831 100644
--- a/src/renderer/i18n/en-US.js
+++ b/src/renderer/i18n/en-US.js
@@ -38,7 +38,8 @@ module.exports = {
       add: 'Add',
       data: 'Data',
       properties: 'Properties',
-      insert: 'Insert'
+      insert: 'Insert',
+      connecting: 'Connecting'
    },
    message: {
       appWelcome: 'Welcome to Antares SQL Client!',