From 964570247ff5b7b8317419730eec5bed4f0f0580 Mon Sep 17 00:00:00 2001
From: Fabio Di Stasio <fabio286@gmail.com>
Date: Wed, 17 Mar 2021 16:51:26 +0100
Subject: [PATCH] feat(PostgreSQL): database in connection parameters

---
 src/common/customizations/defaults.js         |  7 +++-
 src/common/customizations/index.js            |  5 +++
 src/common/customizations/mysql.js            |  4 ++
 src/common/customizations/postgresql.js       | 15 ++++---
 src/main/ipc-handlers/connection.js           |  6 +++
 src/main/libs/clients/PostgreSQLClient.js     |  3 +-
 .../components/ModalEditConnection.vue        | 28 ++++++++++---
 .../components/ModalNewConnection.vue         | 42 +++++++++++--------
 8 files changed, 80 insertions(+), 30 deletions(-)
 create mode 100644 src/common/customizations/index.js

diff --git a/src/common/customizations/defaults.js b/src/common/customizations/defaults.js
index 9a53c36a..b2e6d2e3 100644
--- a/src/common/customizations/defaults.js
+++ b/src/common/customizations/defaults.js
@@ -1,5 +1,10 @@
 module.exports = {
+   // Defaults
+   defaultPort: null,
+   defaultUser: null,
+   defaultDatabase: null,
    // Core
+   database: false,
    collations: false,
    engines: false,
    // Tools
@@ -7,7 +12,7 @@ module.exports = {
    usersManagement: false,
    variables: false,
    // Structure
-   databases: true,
+   schemas: false,
    tables: false,
    views: false,
    triggers: false,
diff --git a/src/common/customizations/index.js b/src/common/customizations/index.js
new file mode 100644
index 00000000..304889a4
--- /dev/null
+++ b/src/common/customizations/index.js
@@ -0,0 +1,5 @@
+module.exports = {
+   maria: require('./mysql'),
+   mysql: require('./mysql'),
+   pg: require('./postgresql')
+};
diff --git a/src/common/customizations/mysql.js b/src/common/customizations/mysql.js
index d01906db..254c4634 100644
--- a/src/common/customizations/mysql.js
+++ b/src/common/customizations/mysql.js
@@ -2,6 +2,10 @@ const defaults = require('./defaults');
 
 module.exports = {
    ...defaults,
+   // Defaults
+   defaultPort: 3306,
+   defaultUser: 'root',
+   defaultDatabase: null,
    // Core
    collations: true,
    engines: true,
diff --git a/src/common/customizations/postgresql.js b/src/common/customizations/postgresql.js
index 79ac60d1..3b8aefc5 100644
--- a/src/common/customizations/postgresql.js
+++ b/src/common/customizations/postgresql.js
@@ -2,17 +2,20 @@ const defaults = require('./defaults');
 
 module.exports = {
    ...defaults,
+   // Defaults
+   defaultPort: 5432,
+   defaultUser: 'postgres',
+   defaultDatabase: 'postgres',
    // Core
-   collations: false,
-   engines: false,
+   database: true,
    // Tools
    processesList: true,
    // Structure
    tables: true,
-   views: true,
-   triggers: true,
-   routines: true,
-   functions: true,
+   views: false,
+   triggers: false,
+   routines: false,
+   functions: false,
    schedulers: false,
    // Settings
    databaseEdit: false,
diff --git a/src/main/ipc-handlers/connection.js b/src/main/ipc-handlers/connection.js
index 77a6de2a..62276b55 100644
--- a/src/main/ipc-handlers/connection.js
+++ b/src/main/ipc-handlers/connection.js
@@ -11,6 +11,9 @@ export default connections => {
          password: conn.password
       };
 
+      if (conn.database)
+         params.database = conn.database;
+
       if (conn.ssl) {
          params.ssl = {
             key: conn.key ? fs.readFileSync(conn.key) : null,
@@ -50,6 +53,9 @@ export default connections => {
          password: conn.password
       };
 
+      if (conn.database)
+         params.database = conn.database;
+
       if (conn.ssl) {
          params.ssl = {
             key: conn.key ? fs.readFileSync(conn.key) : null,
diff --git a/src/main/libs/clients/PostgreSQLClient.js b/src/main/libs/clients/PostgreSQLClient.js
index 16092a42..59de7acb 100644
--- a/src/main/libs/clients/PostgreSQLClient.js
+++ b/src/main/libs/clients/PostgreSQLClient.js
@@ -75,7 +75,8 @@ export class PostgreSQLClient extends AntaresCore {
    async connect () {
       if (!this._poolSize) {
          const client = new Client(this._params);
-         this._connection = client.connect();
+         await client.connect();
+         this._connection = client;
       }
       else {
          const pool = new Pool({ ...this._params, max: this._poolSize });
diff --git a/src/renderer/components/ModalEditConnection.vue b/src/renderer/components/ModalEditConnection.vue
index f431cf48..6a2a5f5e 100644
--- a/src/renderer/components/ModalEditConnection.vue
+++ b/src/renderer/components/ModalEditConnection.vue
@@ -63,11 +63,11 @@
                                        PostgreSQL
                                     </option>
                                     <!-- <option value="mssql">
-                                 Microsoft SQL
-                              </option>
-                              <option value="oracledb">
-                                 Oracle DB
-                              </option> -->
+                                       Microsoft SQL
+                                    </option>
+                                    <option value="oracledb">
+                                       Oracle DB
+                                    </option> -->
                                  </select>
                               </div>
                            </div>
@@ -97,6 +97,18 @@
                                  >
                               </div>
                            </div>
+                           <div v-if="customizations.database" class="form-group">
+                              <div class="col-4 col-sm-12">
+                                 <label class="form-label">{{ $t('word.database') }}</label>
+                              </div>
+                              <div class="col-8 col-sm-12">
+                                 <input
+                                    v-model="localConnection.database"
+                                    class="form-input"
+                                    type="text"
+                                 >
+                              </div>
+                           </div>
                            <div class="form-group">
                               <div class="col-4 col-sm-12">
                                  <label class="form-label">{{ $t('word.user') }}</label>
@@ -247,6 +259,7 @@
 
 <script>
 import { mapActions } from 'vuex';
+import customizations from 'common/customizations';
 import Connection from '@/ipc-api/Connection';
 import ModalAskCredentials from '@/components/ModalAskCredentials';
 import BaseToast from '@/components/BaseToast';
@@ -274,6 +287,11 @@ export default {
          selectedTab: 'general'
       };
    },
+   computed: {
+      customizations () {
+         return customizations[this.connection.client];
+      }
+   },
    created () {
       this.localConnection = Object.assign({}, this.connection);
       window.addEventListener('keydown', this.onKey);
diff --git a/src/renderer/components/ModalNewConnection.vue b/src/renderer/components/ModalNewConnection.vue
index 7501a169..f4602884 100644
--- a/src/renderer/components/ModalNewConnection.vue
+++ b/src/renderer/components/ModalNewConnection.vue
@@ -101,6 +101,18 @@
                                  >
                               </div>
                            </div>
+                           <div v-if="customizations.database" class="form-group">
+                              <div class="col-4 col-sm-12">
+                                 <label class="form-label">{{ $t('word.database') }}</label>
+                              </div>
+                              <div class="col-8 col-sm-12">
+                                 <input
+                                    v-model="connection.database"
+                                    class="form-input"
+                                    type="text"
+                                 >
+                              </div>
+                           </div>
                            <div class="form-group">
                               <div class="col-4 col-sm-12">
                                  <label class="form-label">{{ $t('word.user') }}</label>
@@ -251,6 +263,7 @@
 
 <script>
 import { mapActions } from 'vuex';
+import customizations from 'common/customizations';
 import Connection from '@/ipc-api/Connection';
 import { uidGen } from 'common/libs/uidGen';
 import ModalAskCredentials from '@/components/ModalAskCredentials';
@@ -270,8 +283,9 @@ export default {
             name: '',
             client: 'mysql',
             host: '127.0.0.1',
-            port: '3306',
-            user: 'root',
+            database: null,
+            port: null,
+            user: null,
             password: '',
             ask: false,
             uid: uidGen('C'),
@@ -291,7 +305,13 @@ export default {
          selectedTab: 'general'
       };
    },
+   computed: {
+      customizations () {
+         return customizations[this.connection.client];
+      }
+   },
    created () {
+      this.setDefaults();
       window.addEventListener('keydown', this.onKey);
 
       setTimeout(() => {
@@ -307,21 +327,9 @@ export default {
          addConnection: 'connections/addConnection'
       }),
       setDefaults () {
-         switch (this.connection.client) {
-            case 'mysql':
-               this.connection.port = '3306';
-               break;
-            case 'mssql':
-               this.connection.port = '1433';
-               break;
-            case 'pg':
-               this.connection.user = 'postgres';
-               this.connection.port = '5432';
-               break;
-            case 'oracledb':
-               this.connection.port = '1521';
-               break;
-         }
+         this.connection.user = this.customizations.defaultUser;
+         this.connection.port = this.customizations.defaultPort;
+         this.connection.database = this.customizations.defaultDatabase;
       },
       async startTest () {
          this.isTesting = true;