chore(release): 0.1.8

build(deps): bump pgsql-ast-parser from 7.2.1 to 8.1.1

.github/workflows/build-linux.yml

@@ -1,4 +1,4 @@
-name: Build/release
+name: Build/release [linux]
 
 on: push
 
@@ -8,8 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        # os: [macos-latest, ubuntu-latest, windows-latest]
-        os: [macos-latest, ubuntu-latest]
+        os: [ubuntu-latest]
 
     steps:
       - name: Check out Git repository

.github/workflows/build-mac.yml

@@ -0,0 +1,26 @@
+name: Build/release [mac]
+
+on: push
+
+jobs:
+  release:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [macos-latest]
+
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v1
+
+      - name: Install Node.js, NPM and Yarn
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12
+
+      - name: Build/release Electron app
+        uses: samuelmeuli/action-electron-builder@v1
+        with:
+          github_token: ${{ secrets.github_token }}
+          release: ${{ startsWith(github.ref, 'refs/tags/v') }}

.github/workflows/build-win.yml

@@ -0,0 +1,26 @@
+name: Build/release [windows]
+
+on: push
+
+jobs:
+  release:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [windows-latest]
+
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v1
+
+      - name: Install Node.js, NPM and Yarn
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12
+
+      - name: Build/release Electron app
+        uses: samuelmeuli/action-electron-builder@v1
+        with:
+          github_token: ${{ secrets.github_token }}
+          release: ${{ startsWith(github.ref, 'refs/tags/v') }}

CHANGELOG.md

@@ -2,6 +2,37 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.1.8](https://github.com/Fabio286/antares/compare/v0.1.7...v0.1.8) (2021-05-22)
+
+
+### Bug Fixes
+
+* internal id not removed before row update ([0f10c9e](https://github.com/Fabio286/antares/commit/0f10c9e824b679cfebd8a31085236da3d38a7953))
+* unable to add new ENUM fields ([1e37f2a](https://github.com/Fabio286/antares/commit/1e37f2a96f660a36f2739fea57ca298059e9c31a))
+* unable to delete table rows ([0d61371](https://github.com/Fabio286/antares/commit/0d6137195da9e0e9afe68f6d3ebcd50e913a888e))
+
+
+### Improvements
+
+* improved the way how field default value are handled ([7a766f0](https://github.com/Fabio286/antares/commit/7a766f04e668868e8844aac1d7d445bc2da21558))
+
+### [0.1.7](https://github.com/Fabio286/antares/compare/v0.1.6...v0.1.7) (2021-05-16)
+
+
+### Bug Fixes
+
+* row loses internal id after cell update ([854472c](https://github.com/Fabio286/antares/commit/854472c7a3d8442b1eede12f978cad5aa684094e))
+* **MySQL:** connection loses schema in some conditions ([6b0b8b1](https://github.com/Fabio286/antares/commit/6b0b8b19d7176ef8647d6f401a33315f8732fdf3))
+* issue with ENUM and SET fields on table filler modal ([475397c](https://github.com/Fabio286/antares/commit/475397ca34c5b7d8925e2d97d32216d5b80d8211))
+* issue with ENUM and SET length when creating a new field ([7a62131](https://github.com/Fabio286/antares/commit/7a62131cc707aa1c98bb12513de76229472b7c38))
+* multiple row select on sorted tables not work properly ([c7663be](https://github.com/Fabio286/antares/commit/c7663be338ccb5ff31e241e824593531ad95bd32))
+
+
+### Improvements
+
+* **core:** increased connection pool size to improve performance ([ae103e5](https://github.com/Fabio286/antares/commit/ae103e5477ad190c541d0f29e277c41de6947063))
+* **MySQL:** improved connections pool handling ([434711a](https://github.com/Fabio286/antares/commit/434711a360bd7539d2ec3adec92e7ccc96fa828e))
+
 ### [0.1.6](https://github.com/Fabio286/antares/compare/v0.1.5...v0.1.6) (2021-05-08)
 
 

README.md

@@ -83,7 +83,7 @@ This is a roadmap with major features will come in near future.
 #### • ARM
 
 - [ ] Windows
-- [ ] Linux
+- [x] Linux
 - [ ] MacOS
 
 ## Translations

package.json

@@ -1,20 +1,22 @@
 {
   "name": "antares",
   "productName": "Antares",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "A cross-platform easy to use SQL client.",
   "license": "MIT",
   "repository": "https://github.com/Fabio286/antares.git",
   "scripts": {
     "dev": "cross-env NODE_ENV=development electron-webpack dev",
     "compile": "electron-webpack",
-    "build": "cross-env NODE_ENV=production npm run compile && electron-builder",
-    "build:appx": "npm run build -- --win appx",
+    "build": "cross-env NODE_ENV=production npm run compile",
+    "build:local": "npm run build && electron-builder",
+    "build:appx": "npm run build:local -- --win appx",
     "release": "standard-version",
     "release:pre": "npm run release -- --prerelease alpha",
     "test": "npm run lint",
     "lint": "eslint . --ext .js,.vue && stylelint \"./src/**/*.{css,scss,sass,vue}\"",
-    "lint:fix": "eslint . --ext .js,.vue --fix && stylelint \"./src/**/*.{css,scss,sass,vue}\" --fix"
+    "lint:fix": "eslint . --ext .js,.vue --fix && stylelint \"./src/**/*.{css,scss,sass,vue}\" --fix",
+    "postinstall": "electron-builder install-app-deps"
   },
   "author": "Fabio Di Stasio <fabio286@gmail.com>",
   "build": {
@@ -26,24 +28,28 @@
         "portable"
       ]
     },
-    "dmg": {
-      "contents": [
-        {
-          "x": 130,
-          "y": 220
-        },
-        {
-          "x": 410,
-          "y": 220,
-          "type": "link",
-          "path": "/Applications"
-        }
-      ]
+    "mac": {
+      "target": {
+        "target": "default",
+        "arch": [
+          "x64"
+        ]
+      }
     },
     "linux": {
       "target": [
-        "deb",
-        "AppImage"
+        {
+          "target": "deb",
+          "arch": "x64"
+        },
+        {
+          "target": "AppImage",
+          "arch": [
+            "x64",
+            "armv7l",
+            "arm64"
+          ]
+        }
       ],
       "category": "Development"
     },
@@ -59,6 +65,20 @@
       "identityName": "62514FabioDiStasio.AntaresSQLClient",
       "publisher": "CN=1A2729ED-865C-41D2-9038-39AE2A63AA52",
       "applicationId": "FabioDiStasio.AntaresSQLClient"
+    },
+    "dmg": {
+      "contents": [
+        {
+          "x": 130,
+          "y": 220
+        },
+        {
+          "x": 410,
+          "y": 220,
+          "type": "link",
+          "path": "/Applications"
+        }
+      ]
     }
   },
   "electronWebpack": {
@@ -72,8 +92,8 @@
     "ace-builds": "^1.4.12",
     "electron-log": "^4.3.5",
     "electron-store": "^8.0.0",
-    "electron-updater": "^4.3.5",
-    "faker": "^5.3.1",
+    "electron-updater": "^4.3.9",
+    "faker": "^5.5.3",
     "marked": "^2.0.2",
     "moment": "^2.29.1",
     "mysql2": "^2.2.5",
@@ -85,13 +105,13 @@
     "v-mask": "^2.2.4",
     "vue-i18n": "^8.24.4",
     "vuedraggable": "^2.24.3",
-    "vuex": "^3.6.0"
+    "vuex": "^3.6.2"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.13.14",
+    "@babel/eslint-parser": "^7.14.3",
     "cross-env": "^7.0.2",
-    "electron": "^12.0.7",
-    "electron-builder": "^22.9.1",
+    "electron": "^12.0.9",
+    "electron-builder": "22.10.5",
     "electron-devtools-installer": "^3.2.0",
     "electron-webpack": "^2.8.2",
     "electron-webpack-vue": "^2.4.0",
@@ -101,8 +121,8 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^5.1.0",
     "eslint-plugin-vue": "^7.9.0",
-    "node-sass": "^5.0.0",
-    "sass-loader": "^10.1.1",
+    "sass": "^1.32.13",
+    "sass-loader": "^10.2.0",
     "standard-version": "^9.3.0",
     "stylelint": "^13.13.1",
     "stylelint-config-standard": "^22.0.0",

src/main/ipc-handlers/connection.js

@@ -71,7 +71,7 @@ export default connections => {
          const connection = ClientsFactory.getConnection({
             client: conn.client,
             params,
-            poolSize: 1
+            poolSize: 5
          });
 
          await connection.connect();

src/main/ipc-handlers/schema.js

@@ -128,7 +128,7 @@ export default connections => {
       if (!query) return;
 
       try {
-         const result = await connections[uid].raw(query, { nest: true, details: true });
+         const result = await connections[uid].raw(query, { nest: true, details: true, schema });
 
          return { status: 'success', response: result };
       }

src/main/libs/clients/MySQLClient.js

@@ -1,5 +1,5 @@
 'use strict';
-import mysql from 'mysql2';
+import mysql from 'mysql2/promise';
 import { AntaresCore } from '../AntaresCore';
 import dataTypes from 'common/data-types/mysql';
 
@@ -102,8 +102,10 @@ export class MySQLClient extends AntaresCore {
     * @memberof MySQLClient
     */
    async connect () {
+      delete this._params.application_name;
+
       if (!this._poolSize)
-         this._connection = mysql.createConnection(this._params);
+         this._connection = await mysql.createConnection(this._params);
       else {
          this._connection = mysql.createPool({
             ...this._params,
@@ -307,6 +309,44 @@ export class MySQLClient extends AntaresCore {
          .orderBy({ ORDINAL_POSITION: 'ASC' })
          .run();
 
+      const { rows: fields } = await this.raw(`SHOW CREATE TABLE ${schema}.${table}`);
+
+      const remappedFields = fields.map(row => {
+         let n = 0;
+         return row['Create Table']
+            .split('')
+            .reduce((acc, curr) => {
+               if (curr === ')') n--;
+               if (n !== 0) acc += curr;
+               if (curr === '(') n++;
+               return acc;
+            }, '')
+            .replaceAll('\n', '')
+            .split(',')
+            .map(f => {
+               const fieldArr = f.trim().split(' ');
+               const nameAndType = fieldArr.slice(0, 2);
+
+               if (!nameAndType[0].includes('`')) return false;
+
+               const details = fieldArr.slice(2).join(' ');
+               const defaultValue = details.includes('DEFAULT') ? details.match(/(?<=DEFAULT ).*?$/gs)[0] : null;
+               const typeAndLength = nameAndType[1].replace(')', '').split('(');
+
+               return {
+                  name: nameAndType[0].replaceAll('`', ''),
+                  type: typeAndLength[0].toUpperCase(),
+                  length: typeAndLength[1] ? typeAndLength[1] : null,
+                  default: defaultValue
+               };
+            })
+            .filter(Boolean)
+            .reduce((acc, curr) => {
+               acc[curr.name] = curr;
+               return acc;
+            }, {});
+      })[0];
+
       return rows.map(field => {
          let numLength = field.COLUMN_TYPE.match(/int\(([^)]+)\)/);
          numLength = numLength ? +numLength.pop() : null;
@@ -317,7 +357,7 @@ export class MySQLClient extends AntaresCore {
          return {
             name: field.COLUMN_NAME,
             key: field.COLUMN_KEY.toLowerCase(),
-            type: field.DATA_TYPE.toUpperCase(),
+            type: remappedFields[field.COLUMN_NAME].type,
             schema: field.TABLE_SCHEMA,
             table: field.TABLE_NAME,
             numPrecision: field.NUMERIC_PRECISION,
@@ -329,7 +369,7 @@ export class MySQLClient extends AntaresCore {
             unsigned: field.COLUMN_TYPE.includes('unsigned'),
             zerofill: field.COLUMN_TYPE.includes('zerofill'),
             order: field.ORDINAL_POSITION,
-            default: field.COLUMN_DEFAULT,
+            default: remappedFields[field.COLUMN_NAME].default,
             charset: field.CHARACTER_SET_NAME,
             collation: field.COLLATION_NAME,
             autoIncrement: field.EXTRA.includes('auto_increment'),
@@ -488,7 +528,7 @@ export class MySQLClient extends AntaresCore {
     * @memberof MySQLClient
     */
    async dropView (params) {
-      const sql = `DROP VIEW \`${params.view}\``;
+      const sql = `DROP VIEW \`${this._schema}\`.\`${params.view}\``;
       return await this.raw(sql);
    }
 
@@ -500,10 +540,10 @@ export class MySQLClient extends AntaresCore {
     */
    async alterView (params) {
       const { view } = params;
-      let sql = `ALTER ALGORITHM = ${view.algorithm}${view.definer ? ` DEFINER=${view.definer}` : ''} SQL SECURITY ${view.security} VIEW \`${view.oldName}\` AS ${view.sql} ${view.updateOption ? `WITH ${view.updateOption} CHECK OPTION` : ''}`;
+      let sql = `ALTER ALGORITHM = ${view.algorithm}${view.definer ? ` DEFINER=${view.definer}` : ''} SQL SECURITY ${view.security} VIEW \`${this._schema}\`.\`${view.oldName}\` AS ${view.sql} ${view.updateOption ? `WITH ${view.updateOption} CHECK OPTION` : ''}`;
 
       if (view.name !== view.oldName)
-         sql += `; RENAME TABLE \`${view.oldName}\` TO \`${view.name}\``;
+         sql += `; RENAME TABLE \`${this._schema}\`.\`${view.oldName}\` TO \`${this._schema}\`.\`${view.name}\``;
 
       return await this.raw(sql);
    }
@@ -515,7 +555,7 @@ export class MySQLClient extends AntaresCore {
     * @memberof MySQLClient
     */
    async createView (view) {
-      const sql = `CREATE ALGORITHM = ${view.algorithm} ${view.definer ? `DEFINER=${view.definer} ` : ''}SQL SECURITY ${view.security} VIEW \`${view.name}\` AS ${view.sql} ${view.updateOption ? `WITH ${view.updateOption} CHECK OPTION` : ''}`;
+      const sql = `CREATE ALGORITHM = ${view.algorithm} ${view.definer ? `DEFINER=${view.definer} ` : ''}SQL SECURITY ${view.security} VIEW \`${this._schema}\`.\`${view.name}\` AS ${view.sql} ${view.updateOption ? `WITH ${view.updateOption} CHECK OPTION` : ''}`;
       return await this.raw(sql);
    }
 
@@ -548,7 +588,7 @@ export class MySQLClient extends AntaresCore {
     * @memberof MySQLClient
     */
    async dropTrigger (params) {
-      const sql = `DROP TRIGGER \`${params.trigger}\``;
+      const sql = `DROP TRIGGER \`${this._schema}\`.\`${params.trigger}\``;
       return await this.raw(sql);
    }
 
@@ -581,7 +621,7 @@ export class MySQLClient extends AntaresCore {
     * @memberof MySQLClient
     */
    async createTrigger (trigger) {
-      const sql = `CREATE ${trigger.definer ? `DEFINER=${trigger.definer} ` : ''}TRIGGER \`${trigger.name}\` ${trigger.event1} ${trigger.event2} ON \`${trigger.table}\` FOR EACH ROW ${trigger.sql}`;
+      const sql = `CREATE ${trigger.definer ? `DEFINER=${trigger.definer} ` : ''}TRIGGER \`${this._schema}\`.\`${trigger.name}\` ${trigger.event1} ${trigger.event2} ON \`${trigger.table}\` FOR EACH ROW ${trigger.sql}`;
       return await this.raw(sql, { split: false });
    }
 
@@ -655,7 +695,7 @@ export class MySQLClient extends AntaresCore {
     * @memberof MySQLClient
     */
    async dropRoutine (params) {
-      const sql = `DROP PROCEDURE \`${params.routine}\``;
+      const sql = `DROP PROCEDURE \`${this._schema}\`.\`${params.routine}\``;
       return await this.raw(sql);
    }
 
@@ -782,7 +822,7 @@ export class MySQLClient extends AntaresCore {
     * @memberof MySQLClient
     */
    async dropFunction (params) {
-      const sql = `DROP FUNCTION \`${params.func}\``;
+      const sql = `DROP FUNCTION \`${this._schema}\`.\`${params.func}\``;
       return await this.raw(sql);
    }
 
@@ -822,7 +862,7 @@ export class MySQLClient extends AntaresCore {
 
       const body = func.returns ? func.sql : 'BEGIN\n  RETURN 0;\nEND';
 
-      const sql = `CREATE ${func.definer ? `DEFINER=${func.definer} ` : ''}FUNCTION \`${func.name}\`(${parameters}) RETURNS ${func.returns || 'SMALLINT'}${func.returnsLength ? `(${func.returnsLength})` : ''}
+      const sql = `CREATE ${func.definer ? `DEFINER=${func.definer} ` : ''}FUNCTION \`${this._schema}\`.\`${func.name}\`(${parameters}) RETURNS ${func.returns || 'SMALLINT'}${func.returnsLength ? `(${func.returnsLength})` : ''}
          LANGUAGE SQL
          ${func.deterministic ? 'DETERMINISTIC' : 'NOT DETERMINISTIC'}
          ${func.dataAccess}
@@ -874,7 +914,7 @@ export class MySQLClient extends AntaresCore {
     * @memberof MySQLClient
     */
    async dropEvent (params) {
-      const sql = `DROP EVENT \`${params.scheduler}\``;
+      const sql = `DROP EVENT \`${this._schema}\`.\`${params.scheduler}\``;
       return await this.raw(sql);
    }
 
@@ -890,13 +930,13 @@ export class MySQLClient extends AntaresCore {
       if (scheduler.execution === 'EVERY' && scheduler.every[0].includes('-'))
          scheduler.every[0] = `'${scheduler.every[0]}'`;
 
-      const sql = `ALTER ${scheduler.definer ? ` DEFINER=${scheduler.definer}` : ''} EVENT \`${scheduler.oldName}\` 
+      const sql = `ALTER ${scheduler.definer ? ` DEFINER=${scheduler.definer}` : ''} EVENT \`${this._schema}\`.\`${scheduler.oldName}\` 
       ON SCHEDULE
          ${scheduler.execution === 'EVERY'
       ? `EVERY ${scheduler.every.join(' ')}${scheduler.starts ? ` STARTS '${scheduler.starts}'` : ''}${scheduler.ends ? ` ENDS '${scheduler.ends}'` : ''}`
       : `AT '${scheduler.at}'`}
       ON COMPLETION${!scheduler.preserve ? ' NOT' : ''} PRESERVE
-      ${scheduler.name !== scheduler.oldName ? `RENAME TO \`${scheduler.name}\`` : ''}
+      ${scheduler.name !== scheduler.oldName ? `RENAME TO \`${this._schema}\`.\`${scheduler.name}\`` : ''}
       ${scheduler.state}
       COMMENT '${scheduler.comment}'
       DO ${scheduler.sql}`;
@@ -911,7 +951,7 @@ export class MySQLClient extends AntaresCore {
     * @memberof MySQLClient
     */
    async createEvent (scheduler) {
-      const sql = `CREATE ${scheduler.definer ? ` DEFINER=${scheduler.definer}` : ''} EVENT \`${scheduler.name}\` 
+      const sql = `CREATE ${scheduler.definer ? ` DEFINER=${scheduler.definer}` : ''} EVENT \`${this._schema}\`.\`${scheduler.name}\` 
       ON SCHEDULE
          ${scheduler.execution === 'EVERY'
       ? `EVERY ${scheduler.every.join(' ')}${scheduler.starts ? ` STARTS '${scheduler.starts}'` : ''}${scheduler.ends ? ` ENDS '${scheduler.ends}'` : ''}`
@@ -1048,7 +1088,7 @@ export class MySQLClient extends AntaresCore {
          engine
       } = params;
 
-      const sql = `CREATE TABLE \`${name}\` (\`${name}_ID\` INT NULL) COMMENT='${comment}', COLLATE='${collation}', ENGINE=${engine}`;
+      const sql = `CREATE TABLE \`${this._schema}\`.\`${name}\` (\`${name}_ID\` INT NULL) COMMENT='${comment}', COLLATE='${collation}', ENGINE=${engine}`;
 
       return await this.raw(sql);
    }
@@ -1082,7 +1122,7 @@ export class MySQLClient extends AntaresCore {
       // ADD FIELDS
       additions.forEach(addition => {
          const typeInfo = this._getTypeInfo(addition.type);
-         const length = typeInfo.length ? addition.numLength || addition.charLength || addition.datePrecision : false;
+         const length = typeInfo.length ? addition.enumValues || addition.numLength || addition.charLength || addition.datePrecision : false;
 
          alterColumns.push(`ADD COLUMN \`${addition.name}\` 
             ${addition.type.toUpperCase()}${length ? `(${length})` : ''} 
@@ -1182,7 +1222,7 @@ export class MySQLClient extends AntaresCore {
       sql += alterColumns.join(', ');
 
       // RENAME
-      if (options.name) sql += `; RENAME TABLE \`${table}\` TO \`${options.name}\``;
+      if (options.name) sql += `; RENAME TABLE \`${this._schema}\`.\`${table}\` TO \`${this._schema}\`.\`${options.name}\``;
 
       return await this.raw(sql);
    }
@@ -1273,18 +1313,24 @@ export class MySQLClient extends AntaresCore {
     * @memberof MySQLClient
     */
    async raw (sql, args) {
+      if (process.env.NODE_ENV === 'development') this._logger(sql);// TODO: replace BLOB content with a placeholder
+
       args = {
          nest: false,
          details: false,
          split: true,
          ...args
       };
+
       const nestTables = args.nest ? '.' : false;
       const resultsArr = [];
       let paramsArr = [];
       const queries = args.split ? sql.split(/((?:[^;'"]*(?:"(?:\\.|[^"])*"|'(?:\\.|[^'])*')[^;'"]*)+)|;/gm) : [sql];
+      const isPool = typeof this._connection.getConnection === 'function';
+      const connection = isPool ? await this._connection.getConnection() : this._connection;
 
-      if (process.env.NODE_ENV === 'development') this._logger(sql);// TODO: replace BLOB content with a placeholder
+      if (args.schema)
+         await connection.query(`USE \`${args.schema}\``);
 
       for (const query of queries) {
          if (!query) continue;
@@ -1293,87 +1339,85 @@ export class MySQLClient extends AntaresCore {
          let keysArr = [];
 
          const { rows, report, fields, keys, duration } = await new Promise((resolve, reject) => {
-            this._connection.query({ sql: query, nestTables }, async (err, response, fields) => {
+            connection.query({ sql: query, nestTables }).then(async ([response, fields]) => {
                timeStop = new Date();
                const queryResult = response;
 
-               if (err)
-                  reject(err);
-               else {
-                  let remappedFields = fields
-                     ? fields.map(field => {
-                        if (!field || Array.isArray(field))
-                           return false;
+               let remappedFields = fields
+                  ? fields.map(field => {
+                     if (!field || Array.isArray(field))
+                        return false;
 
-                        const type = this._getType(field);
+                     const type = this._getType(field);
 
+                     return {
+                        name: field.orgName,
+                        alias: field.name,
+                        orgName: field.orgName,
+                        schema: field.schema,
+                        table: field.table,
+                        tableAlias: field.table,
+                        orgTable: field.orgTable,
+                        type: type.name,
+                        length: type.length
+                     };
+                  }).filter(Boolean)
+                  : [];
+
+               if (args.details) {
+                  let cachedTable;
+
+                  if (remappedFields.length) {
+                     paramsArr = remappedFields.map(field => {
+                        if (field.orgTable) cachedTable = field.orgTable;// Needed for some queries on information_schema
                         return {
-                           name: field.orgName,
-                           alias: field.name,
-                           orgName: field.orgName,
-                           schema: field.schema,
-                           table: field.table,
-                           tableAlias: field.table,
-                           orgTable: field.orgTable,
-                           type: type.name,
-                           length: type.length
+                           table: field.orgTable || cachedTable,
+                           schema: field.schema || 'INFORMATION_SCHEMA'
                         };
-                     }).filter(Boolean)
-                     : [];
+                     }).filter((val, i, arr) => arr.findIndex(el => el.schema === val.schema && el.table === val.table) === i);
 
-                  if (args.details) {
-                     let cachedTable;
+                     for (const paramObj of paramsArr) {
+                        if (!paramObj.table || !paramObj.schema) continue;
 
-                     if (remappedFields.length) {
-                        paramsArr = remappedFields.map(field => {
-                           if (field.orgTable) cachedTable = field.orgTable;// Needed for some queries on information_schema
-                           return {
-                              table: field.orgTable || cachedTable,
-                              schema: field.schema || 'INFORMATION_SCHEMA'
-                           };
-                        }).filter((val, i, arr) => arr.findIndex(el => el.schema === val.schema && el.table === val.table) === i);
+                        try { // Column details
+                           const response = await this.getTableColumns(paramObj);
+                           remappedFields = remappedFields.map(field => {
+                              const detailedField = response.find(f => f.name === field.name);
+                              if (detailedField && field.orgTable === paramObj.table && field.schema === paramObj.schema)
+                                 field = { ...field, ...detailedField };
+                              return field;
+                           });
+                        }
+                        catch (err) {
+                           reject(err);
+                        }
 
-                        for (const paramObj of paramsArr) {
-                           if (!paramObj.table || !paramObj.schema) continue;
-
-                           try { // Column details
-                              const response = await this.getTableColumns(paramObj);
-                              remappedFields = remappedFields.map(field => {
-                                 const detailedField = response.find(f => f.name === field.name);
-                                 if (detailedField && field.orgTable === paramObj.table && field.schema === paramObj.schema)
-                                    field = { ...detailedField, ...field };
-                                 return field;
-                              });
-                           }
-                           catch (err) {
-                              reject(err);
-                           }
-
-                           try { // Key usage (foreign keys)
-                              const response = await this.getKeyUsage(paramObj);
-                              keysArr = keysArr ? [...keysArr, ...response] : response;
-                           }
-                           catch (err) {
-                              reject(err);
-                           }
+                        try { // Key usage (foreign keys)
+                           const response = await this.getKeyUsage(paramObj);
+                           keysArr = keysArr ? [...keysArr, ...response] : response;
+                        }
+                        catch (err) {
+                           reject(err);
                         }
                      }
                   }
-
-                  resolve({
-                     duration: timeStop - timeStart,
-                     rows: Array.isArray(queryResult) ? queryResult.some(el => Array.isArray(el)) ? [] : queryResult : false,
-                     report: !Array.isArray(queryResult) ? queryResult : false,
-                     fields: remappedFields,
-                     keys: keysArr
-                  });
                }
-            });
+
+               resolve({
+                  duration: timeStop - timeStart,
+                  rows: Array.isArray(queryResult) ? queryResult.some(el => Array.isArray(el)) ? [] : queryResult : false,
+                  report: !Array.isArray(queryResult) ? queryResult : false,
+                  fields: remappedFields,
+                  keys: keysArr
+               });
+            }).catch(reject);
          });
 
          resultsArr.push({ rows, report, fields, keys, duration });
       }
 
+      if (isPool) connection.release();
+
       return resultsArr.length === 1 ? resultsArr[0] : resultsArr;
    }
 }

src/main/libs/clients/PostgreSQLClient.js

@@ -816,97 +816,6 @@ export class PostgreSQLClient extends AntaresCore {
       return await this.raw(sql, { split: false });
    }
 
-   /**
-    * SHOW CREATE EVENT
-    *
-    * @returns {Array.<Object>} view informations
-    * @memberof PostgreSQLClient
-    */
-   // async getEventInformations ({ schema, scheduler }) {
-   //    const sql = `SHOW CREATE EVENT \`${schema}\`.\`${scheduler}\``;
-   //    const results = await this.raw(sql);
-
-   //    return results.rows.map(row => {
-   //       const schedule = row['Create Event'];
-   //       const execution = schedule.includes('EVERY') ? 'EVERY' : 'ONCE';
-   //       const every = execution === 'EVERY' ? row['Create Event'].match(/(?<=EVERY )(\s*([^\s]+)){0,2}/gs)[0].replaceAll('\'', '').split(' ') : [];
-   //       const starts = execution === 'EVERY' && schedule.includes('STARTS') ? schedule.match(/(?<=STARTS ').*?(?='\s)/gs)[0] : '';
-   //       const ends = execution === 'EVERY' && schedule.includes('ENDS') ? schedule.match(/(?<=ENDS ').*?(?='\s)/gs)[0] : '';
-   //       const at = execution === 'ONCE' && schedule.includes('AT') ? schedule.match(/(?<=AT ').*?(?='\s)/gs)[0] : '';
-
-   //       return {
-   //          definer: row['Create Event'].match(/(?<=DEFINER=).*?(?=\s)/gs)[0],
-   //          sql: row['Create Event'].match(/(?<=DO )(.*)/gs)[0],
-   //          name: row.Event,
-   //          comment: row['Create Event'].match(/(?<=COMMENT ').*?(?=')/gs) ? row['Create Event'].match(/(?<=COMMENT ').*?(?=')/gs)[0] : '',
-   //          state: row['Create Event'].includes('ENABLE') ? 'ENABLE' : row['Create Event'].includes('DISABLE ON SLAVE') ? 'DISABLE ON SLAVE' : 'DISABLE',
-   //          preserve: row['Create Event'].includes('ON COMPLETION PRESERVE'),
-   //          execution,
-   //          every,
-   //          starts,
-   //          ends,
-   //          at
-   //       };
-   //    })[0];
-   // }
-
-   /**
-    * DROP EVENT
-    *
-    * @returns {Array.<Object>} parameters
-    * @memberof PostgreSQLClient
-    */
-   // async dropEvent (params) {
-   //    const sql = `DROP EVENT \`${params.scheduler}\``;
-   //    return await this.raw(sql);
-   // }
-
-   /**
-    * ALTER EVENT
-    *
-    * @returns {Array.<Object>} parameters
-    * @memberof PostgreSQLClient
-    */
-   // async alterEvent (params) {
-   //    const { scheduler } = params;
-
-   //    if (scheduler.execution === 'EVERY' && scheduler.every[0].includes('-'))
-   //       scheduler.every[0] = `'${scheduler.every[0]}'`;
-
-   //    const sql = `ALTER ${scheduler.definer ? ` DEFINER=${scheduler.definer}` : ''} EVENT \`${scheduler.oldName}\`
-   //    ON SCHEDULE
-   //       ${scheduler.execution === 'EVERY'
-   //    ? `EVERY ${scheduler.every.join(' ')}${scheduler.starts ? ` STARTS '${scheduler.starts}'` : ''}${scheduler.ends ? ` ENDS '${scheduler.ends}'` : ''}`
-   //    : `AT '${scheduler.at}'`}
-   //    ON COMPLETION${!scheduler.preserve ? ' NOT' : ''} PRESERVE
-   //    ${scheduler.name !== scheduler.oldName ? `RENAME TO \`${scheduler.name}\`` : ''}
-   //    ${scheduler.state}
-   //    COMMENT '${scheduler.comment}'
-   //    DO ${scheduler.sql}`;
-
-   //    return await this.raw(sql, { split: false });
-   // }
-
-   /**
-    * CREATE EVENT
-    *
-    * @returns {Array.<Object>} parameters
-    * @memberof PostgreSQLClient
-    */
-   // async createEvent (scheduler) {
-   //    const sql = `CREATE ${scheduler.definer ? ` DEFINER=${scheduler.definer}` : ''} EVENT \`${scheduler.name}\`
-   //    ON SCHEDULE
-   //       ${scheduler.execution === 'EVERY'
-   //    ? `EVERY ${scheduler.every.join(' ')}${scheduler.starts ? ` STARTS '${scheduler.starts}'` : ''}${scheduler.ends ? ` ENDS '${scheduler.ends}'` : ''}`
-   //    : `AT '${scheduler.at}'`}
-   //    ON COMPLETION${!scheduler.preserve ? ' NOT' : ''} PRESERVE
-   //    ${scheduler.state}
-   //    COMMENT '${scheduler.comment}'
-   //    DO ${scheduler.sql}`;
-
-   //    return await this.raw(sql, { split: false });
-   // }
-
    /**
     * SELECT * FROM pg_collation
     *
@@ -1250,8 +1159,8 @@ export class PostgreSQLClient extends AntaresCore {
          ...args
       };
 
-      if (args.nest && this._schema !== 'public')
-         await this.use(this._schema);
+      if (args.schema && args.schema !== 'public')
+         await this.use(args.schema);
 
       const resultsArr = [];
       let paramsArr = [];

src/renderer/components/FakerSelect.vue

@@ -66,6 +66,21 @@
          :type="inputProps().type"
          :disabled="!isChecked"
       >
+      <select
+         v-else-if="enumArray"
+         v-model="selectedValue"
+         class="form-select"
+         :disabled="!isChecked"
+         @change="onChange"
+      >
+         <option
+            v-for="val in enumArray"
+            :key="val"
+            :value="val"
+         >
+            {{ val }}
+         </option>
+      </select>
       <input
          v-else
          ref="formInput"
@@ -121,7 +136,8 @@ export default {
          selectedMethod: '',
          selectedValue: '',
          debounceTimeout: null,
-         methodParams: {}
+         methodParams: {},
+         enumArray: null
       };
    },
    computed: {
@@ -150,8 +166,14 @@ export default {
    },
    watch: {
       fieldObj () {
-         if (this.fieldObj)
-            this.selectedValue = this.fieldObj.value;
+         if (this.fieldObj) {
+            if (Array.isArray(this.fieldObj.value)) {
+               this.enumArray = this.fieldObj.value;
+               this.selectedValue = this.fieldObj.value[0];
+            }
+            else
+               this.selectedValue = this.fieldObj.value;
+         }
       },
       selectedGroup () {
          if (this.fakerMethods.length)

src/renderer/components/ForeignKeySelect.vue

@@ -51,7 +51,8 @@ export default {
       }),
       isValidDefault () {
          if (!this.foreignList.length) return true;
-         return this.value === null || this.foreignList.some(foreign => foreign.foreign_column.toString() === this.value.toString());
+         if (this.value === null) return false;
+         return this.foreignList.some(foreign => foreign.foreign_column.toString() === this.value.toString());
       }
    },
    async created () {
@@ -65,7 +66,7 @@ export default {
       try { // Field data
          const { status, response } = await Tables.getTableColumns(params);
          if (status === 'success') {
-            const textField = response.find(field => [...TEXT, ...LONG_TEXT].includes(field.type));
+            const textField = response.find(field => [...TEXT, ...LONG_TEXT].includes(field.type) && field.name !== this.keyUsage.refField);
             foreignDesc = textField ? textField.name : false;
          }
          else

src/renderer/components/ModalFakerRows.vue

@@ -250,10 +250,15 @@ export default {
          if (field.default === 'NULL') fieldDefault = null;
          else {
             if ([...NUMBER, ...FLOAT].includes(field.type))
-               fieldDefault = +field.default;
+               fieldDefault = Number.isNaN(+field.default) ? null : +field.default;
 
-            if ([...TEXT, ...LONG_TEXT].includes(field.type))
-               fieldDefault = field.default ? field.default.substring(1, field.default.length - 1) : '';
+            if ([...TEXT, ...LONG_TEXT].includes(field.type)) {
+               fieldDefault = field.default
+                  ? field.default.includes('\'')
+                     ? field.default.split('\'')[1]
+                     : field.default
+                  : '';
+            }
 
             if ([...TIME, ...DATE].includes(field.type))
                fieldDefault = field.default;
@@ -269,6 +274,9 @@ export default {
                   fieldDefault = moment().format(`YYYY-MM-DD HH:mm:ss${datePrecision}`);
                }
             }
+
+            if (field.enumValues)
+               fieldDefault = field.enumValues.replaceAll('\'', '').split(',');
          }
 
          rowObj[field.name] = { value: fieldDefault };

src/renderer/components/WorkspacePropsTableRow.vue

@@ -96,7 +96,12 @@
                class="cell-content"
                @dblclick="editON($event, localLength, 'length')"
             >
-               {{ localLength }}
+               <span v-if="localRow.enumValues">
+                  {{ localRow.enumValues }}
+               </span>
+               <span v-else>
+                  {{ localLength }}
+               </span>
             </span>
             <input
                v-else-if="localRow.enumValues"
@@ -361,7 +366,7 @@ export default {
          getWorkspace: 'workspaces/getWorkspace'
       }),
       localLength () {
-         return this.localRow.enumValues || this.localRow.numLength || this.localRow.charLength || this.localRow.datePrecision || this.localRow.numPrecision || 0;
+         return this.localRow.numLength || this.localRow.charLength || this.localRow.datePrecision || this.localRow.numPrecision || 0;
       },
       fieldType () {
          const fieldType = this.dataTypes.reduce((acc, group) => [...acc, ...group.types], []).filter(type =>
@@ -445,8 +450,13 @@ export default {
 
          this.defaultValue.onUpdate = this.localRow.onUpdate;
          this.defaultValue.type = this.localRow.defaultType;
-         if (this.defaultValue.type === 'custom')
-            this.defaultValue.custom = this.localRow.default;
+         if (this.defaultValue.type === 'custom') {
+            this.defaultValue.custom = this.localRow.default
+               ? this.localRow.default.includes('\'')
+                  ? this.localRow.default.split('\'')[1]
+                  : this.localRow.default
+               : '';
+         }
          if (this.defaultValue.type === 'expression')
             this.defaultValue.expression = this.localRow.default;
       },
@@ -492,11 +502,13 @@ export default {
             this.localRow.numLength = null;
             this.localRow.charLength = null;
             this.localRow.datePrecision = null;
+            this.localRow.enumValues = '';
 
             if (this.fieldType.length) {
                if (['integer', 'float', 'binary', 'spatial'].includes(this.fieldType.group)) this.localRow.numLength = 11;
-               if (['string', 'other'].includes(this.fieldType.group)) this.localRow.charLength = 15;
+               if (['string'].includes(this.fieldType.group)) this.localRow.charLength = 15;
                if (['time'].includes(this.fieldType.group)) this.localRow.datePrecision = 0;
+               if (['other'].includes(this.fieldType.group)) this.localRow.enumValues = '\'valA\',\'valB\'';
             }
 
             if (!this.fieldType.collation)
@@ -523,7 +535,7 @@ export default {
                   break;
                case 'custom':
                   this.localRow.autoIncrement = false;
-                  this.localRow.default = this.defaultValue.custom;
+                  this.localRow.default = Number.isNaN(+this.defaultValue.custom) ? `'${this.defaultValue.custom}'` : this.defaultValue.custom;
                   break;
                case 'expression':
                   this.localRow.autoIncrement = false;

src/renderer/components/WorkspaceQueryTable.vue

@@ -319,8 +319,6 @@ export default {
       },
       updateField (payload, row) {
          const orgRow = this.localResults.find(lr => lr._id === row._id);
-         delete row._id;
-         delete orgRow._id;
 
          Object.keys(orgRow).forEach(key => { // remap the row
             if (orgRow[key] instanceof Date && moment(orgRow[key]).isValid()) { // if datetime
@@ -370,7 +368,6 @@ export default {
       },
       setNull () {
          const row = this.localResults.find(row => this.selectedRows.includes(row._id));
-         delete row._id;
 
          const params = {
             primary: this.primaryField.name,
@@ -408,15 +405,15 @@ export default {
                this.selectedRows.push(row);
             else {
                const lastID = this.selectedRows.slice(-1)[0];
-               const lastIndex = this.localResults.findIndex(el => el._id === lastID);
-               const clickedIndex = this.localResults.findIndex(el => el._id === row);
+               const lastIndex = this.sortedResults.findIndex(el => el._id === lastID);
+               const clickedIndex = this.sortedResults.findIndex(el => el._id === row);
                if (lastIndex > clickedIndex) {
                   for (let i = clickedIndex; i < lastIndex; i++)
-                     this.selectedRows.push(this.localResults[i]._id);
+                     this.selectedRows.push(this.sortedResults[i]._id);
                }
                else if (lastIndex < clickedIndex) {
                   for (let i = clickedIndex; i > lastIndex; i--)
-                     this.selectedRows.push(this.localResults[i]._id);
+                     this.selectedRows.push(this.sortedResults[i]._id);
                }
             }
          }
@@ -435,6 +432,8 @@ export default {
       sort (field) {
          if (!this.isSortable) return;
 
+         this.selectedRows = [];
+
          if (this.mode === 'query')
             field = `${this.getTable(this.resultsetIndex)}.${field}`;
 

src/renderer/ipc-api/Tables.js

@@ -19,6 +19,7 @@ export default class {
    }
 
    static updateTableCell (params) {
+      delete params.row._id;
       return ipcRenderer.invoke('update-table-cell', params);
    }