From 76d92cd106b0409e8752c43d7d587d09dd3e1e32 Mon Sep 17 00:00:00 2001
From: Fabio Di Stasio <fabio286@gmail.com>
Date: Wed, 24 Feb 2021 12:46:31 +0100
Subject: [PATCH] fix: issue managing function/routine parameters

---
 README.md                                     |  2 +-
 package.json                                  | 10 +++----
 src/common/db-properties/mysql.js             |  1 +
 src/main/libs/clients/MySQLClient.js          |  2 +-
 src/renderer/components/Workspace.vue         |  4 +--
 .../WorkspacePropsFunctionParamsModal.vue     | 28 +++++++++---------
 .../WorkspacePropsRoutineParamsModal.vue      | 28 +++++++++---------
 .../components/WorkspacePropsTabFunction.vue  |  7 +++++
 .../components/WorkspacePropsTabRoutine.vue   | 29 +++++++++++++++++--
 src/renderer/components/WorkspaceQueryTab.vue |  9 ++++--
 .../store/modules/workspaces.store.js         | 12 ++++----
 11 files changed, 88 insertions(+), 44 deletions(-)
 create mode 100644 src/common/db-properties/mysql.js

diff --git a/README.md b/README.md
index 33ec2a35..d852d684 100644
--- a/README.md
+++ b/README.md
@@ -74,8 +74,8 @@ Depending on your distribution, you will need to run the following command:
 
 - [x] MySQL/MariaDB
 - [ ] PostgreSQL
-- [ ] MSSQL
 - [ ] SQLite
+- [ ] MSSQL
 - [ ] OracleDB
 - [ ] More...
 
diff --git a/package.json b/package.json
index c56b69a5..de2fa201 100644
--- a/package.json
+++ b/package.json
@@ -72,23 +72,23 @@
   "devDependencies": {
     "babel-eslint": "^10.1.0",
     "cross-env": "^7.0.2",
-    "electron": "^11.2.1",
+    "electron": "^11.3.0",
     "electron-builder": "^22.9.1",
     "electron-devtools-installer": "^3.1.1",
     "electron-webpack": "^2.8.2",
     "electron-webpack-vue": "^2.4.0",
-    "eslint": "^7.18.0",
+    "eslint": "^7.20.0",
     "eslint-config-standard": "^16.0.2",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-vue": "^7.5.0",
+    "eslint-plugin-promise": "^4.3.1",
+    "eslint-plugin-vue": "^7.6.0",
     "node-sass": "^5.0.0",
     "sass-loader": "^10.1.1",
     "standard-version": "^9.1.0",
     "stylelint": "^13.9.0",
     "stylelint-config-standard": "^20.0.0",
-    "stylelint-scss": "^3.18.0",
+    "stylelint-scss": "^3.19.0",
     "vue": "^2.6.12",
     "vue-template-compiler": "^2.6.12",
     "webpack": "^4.46.0"
diff --git a/src/common/db-properties/mysql.js b/src/common/db-properties/mysql.js
new file mode 100644
index 00000000..e0a30c5d
--- /dev/null
+++ b/src/common/db-properties/mysql.js
@@ -0,0 +1 @@
+module.exports = [];
diff --git a/src/main/libs/clients/MySQLClient.js b/src/main/libs/clients/MySQLClient.js
index 38efb3a8..1fd25a51 100644
--- a/src/main/libs/clients/MySQLClient.js
+++ b/src/main/libs/clients/MySQLClient.js
@@ -561,7 +561,7 @@ export class MySQLClient extends AntaresCore {
 
                return {
                   name: param[1] ? param[1].replaceAll('`', '') : '',
-                  type: type[0],
+                  type: type[0].replaceAll('\n', ''),
                   length: +type[1],
                   context: param[0] ? param[0].replace('\n', '') : ''
                };
diff --git a/src/renderer/components/Workspace.vue b/src/renderer/components/Workspace.vue
index 6556310d..5d5199ff 100644
--- a/src/renderer/components/Workspace.vue
+++ b/src/renderer/components/Workspace.vue
@@ -109,7 +109,7 @@
          <WorkspaceQueryTab
             v-for="tab of queryTabs"
             :key="tab.uid"
-            :tab-uid="tab.uid"
+            :tab="tab"
             :is-selected="selectedTab === tab.uid"
             :connection="connection"
          />
@@ -221,7 +221,7 @@ export default {
          removeTab: 'workspaces/removeTab'
       }),
       addTab () {
-         this.newTab(this.connection.uid);
+         this.newTab({ uid: this.connection.uid });
 
          if (!this.hasWheelEvent) {
             this.$refs.tabWrap.addEventListener('wheel', e => {
diff --git a/src/renderer/components/WorkspacePropsFunctionParamsModal.vue b/src/renderer/components/WorkspacePropsFunctionParamsModal.vue
index fccd3608..00639395 100644
--- a/src/renderer/components/WorkspacePropsFunctionParamsModal.vue
+++ b/src/renderer/components/WorkspacePropsFunctionParamsModal.vue
@@ -2,7 +2,7 @@
    <ConfirmModal
       :confirm-text="$t('word.confirm')"
       size="medium"
-      @confirm="confirmIndexesChange"
+      @confirm="confirmParametersChange"
       @hide="$emit('hide')"
    >
       <template :slot="'header'">
@@ -34,10 +34,10 @@
                   <div ref="parametersPanel" class="panel-body p-0 pr-1">
                      <div
                         v-for="param in parametersProxy"
-                        :key="param.name"
+                        :key="param._id"
                         class="tile tile-centered c-hand mb-1 p-1"
-                        :class="{'selected-param': selectedParam === param.name}"
-                        @click="selectParameter($event, param.name)"
+                        :class="{'selected-param': selectedParam === param._id}"
+                        @click="selectParameter($event, param._id)"
                      >
                         <div class="tile-icon">
                            <div>
@@ -54,7 +54,7 @@
                            <button
                               class="btn btn-link remove-field p-0 mr-2"
                               :title="$t('word.delete')"
-                              @click.prevent="removeParameter(param.name)"
+                              @click.prevent="removeParameter(param._id)"
                            >
                               <i class="mdi mdi-close" />
                            </button>
@@ -139,6 +139,7 @@
 </template>
 
 <script>
+import { uidGen } from 'common/libs/uidGen';
 import ConfirmModal from '@/components/BaseConfirmModal';
 
 export default {
@@ -162,7 +163,7 @@ export default {
    },
    computed: {
       selectedParamObj () {
-         return this.parametersProxy.find(param => param.name === this.selectedParam);
+         return this.parametersProxy.find(param => param._id === this.selectedParam);
       },
       isChanged () {
          return JSON.stringify(this.localParameters) !== JSON.stringify(this.parametersProxy);
@@ -182,12 +183,12 @@ export default {
       window.removeEventListener('resize', this.getModalInnerHeight);
    },
    methods: {
-      confirmIndexesChange () {
+      confirmParametersChange () {
          this.$emit('parameters-update', this.parametersProxy);
       },
-      selectParameter (event, name) {
-         if (this.selectedParam !== name && !event.target.classList.contains('remove-field'))
-            this.selectedParam = name;
+      selectParameter (event, uid) {
+         if (this.selectedParam !== uid && !event.target.classList.contains('remove-field'))
+            this.selectedParam = uid;
       },
       getModalInnerHeight () {
          const modalBody = document.querySelector('.modal-body');
@@ -196,6 +197,7 @@ export default {
       },
       addParameter () {
          this.parametersProxy = [...this.parametersProxy, {
+            _id: uidGen(),
             name: `Param${this.i++}`,
             type: 'INT',
             context: 'IN',
@@ -209,8 +211,8 @@ export default {
             this.$refs.parametersPanel.scrollTop = this.$refs.parametersPanel.scrollHeight + 60;
          }, 20);
       },
-      removeParameter (name) {
-         this.parametersProxy = this.parametersProxy.filter(param => param.name !== name);
+      removeParameter (uid) {
+         this.parametersProxy = this.parametersProxy.filter(param => param._id !== uid);
 
          if (this.selectedParam === name && this.parametersProxy.length)
             this.resetSelectedID();
@@ -223,7 +225,7 @@ export default {
             this.resetSelectedID();
       },
       resetSelectedID () {
-         this.selectedParam = this.parametersProxy.length ? this.parametersProxy[0].name : '';
+         this.selectedParam = this.parametersProxy.length ? this.parametersProxy[0]._id : '';
       }
    }
 };
diff --git a/src/renderer/components/WorkspacePropsRoutineParamsModal.vue b/src/renderer/components/WorkspacePropsRoutineParamsModal.vue
index 689bfa21..f116a37e 100644
--- a/src/renderer/components/WorkspacePropsRoutineParamsModal.vue
+++ b/src/renderer/components/WorkspacePropsRoutineParamsModal.vue
@@ -2,7 +2,7 @@
    <ConfirmModal
       :confirm-text="$t('word.confirm')"
       size="medium"
-      @confirm="confirmIndexesChange"
+      @confirm="confirmParametersChange"
       @hide="$emit('hide')"
    >
       <template :slot="'header'">
@@ -34,10 +34,10 @@
                   <div ref="parametersPanel" class="panel-body p-0 pr-1">
                      <div
                         v-for="param in parametersProxy"
-                        :key="param.name"
+                        :key="param._id"
                         class="tile tile-centered c-hand mb-1 p-1"
-                        :class="{'selected-param': selectedParam === param.name}"
-                        @click="selectParameter($event, param.name)"
+                        :class="{'selected-param': selectedParam === param._id}"
+                        @click="selectParameter($event, param._id)"
                      >
                         <div class="tile-icon">
                            <div>
@@ -54,7 +54,7 @@
                            <button
                               class="btn btn-link remove-field p-0 mr-2"
                               :title="$t('word.delete')"
-                              @click.prevent="removeParameter(param.name)"
+                              @click.prevent="removeParameter(param._id)"
                            >
                               <i class="mdi mdi-close" />
                            </button>
@@ -170,6 +170,7 @@
 </template>
 
 <script>
+import { uidGen } from 'common/libs/uidGen';
 import ConfirmModal from '@/components/BaseConfirmModal';
 
 export default {
@@ -193,7 +194,7 @@ export default {
    },
    computed: {
       selectedParamObj () {
-         return this.parametersProxy.find(param => param.name === this.selectedParam);
+         return this.parametersProxy.find(param => param._id === this.selectedParam);
       },
       isChanged () {
          return JSON.stringify(this.localParameters) !== JSON.stringify(this.parametersProxy);
@@ -213,12 +214,12 @@ export default {
       window.removeEventListener('resize', this.getModalInnerHeight);
    },
    methods: {
-      confirmIndexesChange () {
+      confirmParametersChange () {
          this.$emit('parameters-update', this.parametersProxy);
       },
-      selectParameter (event, name) {
-         if (this.selectedParam !== name && !event.target.classList.contains('remove-field'))
-            this.selectedParam = name;
+      selectParameter (event, uid) {
+         if (this.selectedParam !== uid && !event.target.classList.contains('remove-field'))
+            this.selectedParam = uid;
       },
       getModalInnerHeight () {
          const modalBody = document.querySelector('.modal-body');
@@ -227,6 +228,7 @@ export default {
       },
       addParameter () {
          this.parametersProxy = [...this.parametersProxy, {
+            _id: uidGen(),
             name: `Param${this.i++}`,
             type: 'INT',
             context: 'IN',
@@ -240,8 +242,8 @@ export default {
             this.$refs.parametersPanel.scrollTop = this.$refs.parametersPanel.scrollHeight + 60;
          }, 20);
       },
-      removeParameter (name) {
-         this.parametersProxy = this.parametersProxy.filter(param => param.name !== name);
+      removeParameter (uid) {
+         this.parametersProxy = this.parametersProxy.filter(param => param._id !== uid);
 
          if (this.selectedParam === name && this.parametersProxy.length)
             this.resetSelectedID();
@@ -254,7 +256,7 @@ export default {
             this.resetSelectedID();
       },
       resetSelectedID () {
-         this.selectedParam = this.parametersProxy.length ? this.parametersProxy[0].name : '';
+         this.selectedParam = this.parametersProxy.length ? this.parametersProxy[0]._id : '';
       }
    }
 };
diff --git a/src/renderer/components/WorkspacePropsTabFunction.vue b/src/renderer/components/WorkspacePropsTabFunction.vue
index 6f68bc5c..37bd33de 100644
--- a/src/renderer/components/WorkspacePropsTabFunction.vue
+++ b/src/renderer/components/WorkspacePropsTabFunction.vue
@@ -75,6 +75,7 @@
 
 <script>
 import { mapGetters, mapActions } from 'vuex';
+import { uidGen } from 'common/libs/uidGen';
 import BaseLoader from '@/components/BaseLoader';
 import QueryEditor from '@/components/QueryEditor';
 import WorkspacePropsFunctionOptionsModal from '@/components/WorkspacePropsFunctionOptionsModal';
@@ -183,6 +184,12 @@ export default {
             const { status, response } = await Functions.getFunctionInformations(params);
             if (status === 'success') {
                this.originalFunction = response;
+
+               this.originalFunction.parameters = [...this.originalFunction.parameters.map(param => {
+                  param._id = uidGen();
+                  return param;
+               })];
+
                this.localFunction = JSON.parse(JSON.stringify(this.originalFunction));
                this.sqlProxy = this.localFunction.sql;
             }
diff --git a/src/renderer/components/WorkspacePropsTabRoutine.vue b/src/renderer/components/WorkspacePropsTabRoutine.vue
index a3e530b1..e1bbdfb4 100644
--- a/src/renderer/components/WorkspacePropsTabRoutine.vue
+++ b/src/renderer/components/WorkspacePropsTabRoutine.vue
@@ -27,7 +27,7 @@
                <button
                   class="btn btn-dark btn-sm disabled"
                   :disabled="isChanged"
-                  @click="false"
+                  @click="runRoutine"
                >
                   <span>{{ $t('word.run') }}</span>
                   <i class="mdi mdi-24px mdi-play ml-1" />
@@ -75,6 +75,7 @@
 
 <script>
 import { mapGetters, mapActions } from 'vuex';
+import { uidGen } from 'common/libs/uidGen';
 import QueryEditor from '@/components/QueryEditor';
 import BaseLoader from '@/components/BaseLoader';
 import WorkspacePropsRoutineOptionsModal from '@/components/WorkspacePropsRoutineOptionsModal';
@@ -165,7 +166,8 @@ export default {
          addNotification: 'notifications/addNotification',
          refreshStructure: 'workspaces/refreshStructure',
          setUnsavedChanges: 'workspaces/setUnsavedChanges',
-         changeBreadcrumbs: 'workspaces/changeBreadcrumbs'
+         changeBreadcrumbs: 'workspaces/changeBreadcrumbs',
+         newTab: 'workspaces/newTab'
       }),
       async getRoutineData () {
          if (!this.routine) return;
@@ -182,6 +184,12 @@ export default {
             const { status, response } = await Routines.getRoutineInformations(params);
             if (status === 'success') {
                this.originalRoutine = response;
+
+               this.originalRoutine.parameters = [...this.originalRoutine.parameters.map(param => {
+                  param._id = uidGen();
+                  return param;
+               })];
+
                this.localRoutine = JSON.parse(JSON.stringify(this.originalRoutine));
                this.sqlProxy = this.localRoutine.sql;
             }
@@ -249,6 +257,23 @@ export default {
       parametersUpdate (parameters) {
          this.localRoutine = { ...this.localRoutine, parameters };
       },
+      runRoutine () { // TODO: create ask for params modal
+         let sql;
+         switch (this.connection.client) { // TODO: move in a better place
+            case 'maria':
+            case 'mysql':
+            case 'pg':
+               sql = `CALL \`${this.originalRoutine.name}\` ()`;
+               break;
+            case 'mssql':
+               sql = `EXEC ${this.originalRoutine.name}`;
+               break;
+            default:
+               sql = `CALL \`${this.originalRoutine.name}\` ()`;
+         }
+
+         this.newTab({ uid: this.connection.uid, content: sql, autorun: !this.originalRoutine.parameters.length });
+      },
       showOptionsModal () {
          this.isOptionsModal = true;
       },
diff --git a/src/renderer/components/WorkspaceQueryTab.vue b/src/renderer/components/WorkspaceQueryTab.vue
index 20a20272..404b6c3b 100644
--- a/src/renderer/components/WorkspaceQueryTab.vue
+++ b/src/renderer/components/WorkspaceQueryTab.vue
@@ -48,7 +48,7 @@
             v-show="!isQuering"
             ref="queryTable"
             :results="results"
-            :tab-uid="tabUid"
+            :tab-uid="tab.uid"
             :conn-uid="connection.uid"
             mode="query"
             @update-field="updateField"
@@ -74,7 +74,7 @@ export default {
    mixins: [tableTabs],
    props: {
       connection: Object,
-      tabUid: String,
+      tab: Object,
       isSelected: Boolean
    },
    data () {
@@ -101,6 +101,8 @@ export default {
       }
    },
    created () {
+      this.query = this.tab.content;
+
       window.addEventListener('keydown', this.onKey);
    },
    mounted () {
@@ -112,6 +114,9 @@ export default {
          window.addEventListener('mousemove', this.resize);
          window.addEventListener('mouseup', this.stopResize);
       });
+
+      if (this.tab.autorun)
+         this.runQuery(this.query);
    },
    beforeDestroy () {
       window.removeEventListener('keydown', this.onKey);
diff --git a/src/renderer/store/modules/workspaces.store.js b/src/renderer/store/modules/workspaces.store.js
index 0a7ec1ac..9bb44090 100644
--- a/src/renderer/store/modules/workspaces.store.js
+++ b/src/renderer/store/modules/workspaces.store.js
@@ -152,7 +152,7 @@ export default {
             }
             : workspace);
       },
-      NEW_TAB (state, { uid, tab }) {
+      NEW_TAB (state, { uid, tab, content, autorun }) {
          tabIndex[uid] = tabIndex[uid] ? ++tabIndex[uid] : 1;
          const newTab = {
             uid: tab,
@@ -160,7 +160,9 @@ export default {
             selected: false,
             type: 'query',
             fields: [],
-            keyUsage: []
+            keyUsage: [],
+            content: content || '',
+            autorun: !!autorun
          };
          state.workspaces = state.workspaces.map(workspace => {
             if (workspace.uid === uid) {
@@ -392,7 +394,7 @@ export default {
          commit('ADD_WORKSPACE', workspace);
 
          if (getters.getWorkspace(uid).tabs.length < 3)
-            dispatch('newTab', uid);
+            dispatch('newTab', { uid });
 
          dispatch('setUnsavedChanges', false);
       },
@@ -430,10 +432,10 @@ export default {
       setSearchTerm ({ commit, getters }, term) {
          commit('SET_SEARCH_TERM', { uid: getters.getSelected, term });
       },
-      newTab ({ commit }, uid) {
+      newTab ({ commit }, { uid, content, autorun }) {
          const tab = uidGen('T');
 
-         commit('NEW_TAB', { uid, tab });
+         commit('NEW_TAB', { uid, tab, content, autorun });
          commit('SELECT_TAB', { uid, tab });
       },
       removeTab ({ commit }, payload) {