chore(release): 0.7.23-beta.0

fix: shortcut not working on mac os

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: [fabio286]
+github: [antares-sql,fabio286]
 patreon: #fabio286
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
@@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
 liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
-custom: ['https://paypal.me/fabiodistasio']
+custom: ['https://paypal.me/fabiodistasio']

.husky/commit-msg

@@ -0,0 +1 @@
+npx --no -- commitlint --edit $1

.husky/pre-commit

@@ -0,0 +1 @@
+npm run lint

.stylelintrc

@@ -5,14 +5,14 @@
   ],
   "fix": true,
   "formatter": "verbose",
+  "customSyntax": "postcss-html",
   "plugins": [
     "stylelint-scss"
   ],
   "rules": {
     "at-rule-no-unknown": null,
     "no-descending-specificity": null,
-    "font-family-no-missing-generic-family-keyword": null,
-    "declaration-colon-newline-after": "always-multi-line"
+    "font-family-no-missing-generic-family-keyword": null
   },
   "syntax": "scss"
 }

CHANGELOG.md

@@ -2,6 +2,47 @@
 
 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.7.23-beta.0](https://github.com/antares-sql/antares/compare/v0.7.22...v0.7.23-beta.0) (2024-03-21)
+
+
+### Bug Fixes
+
+* CSV export does not escape strings when needed, fixes [#770](https://github.com/antares-sql/antares/issues/770) ([dd5b417](https://github.com/antares-sql/antares/commit/dd5b41716a10cf9500f2c611b232f5b5b0756a68))
+* query result sort not working with aliased tables, fixes [#765](https://github.com/antares-sql/antares/issues/765) ([de9dac3](https://github.com/antares-sql/antares/commit/de9dac3e8abf3b3261f8c54c88cf2386a5be2207))
+* shortcut not working on mac os ([0bb5ced](https://github.com/antares-sql/antares/commit/0bb5cedda6a67ccbeea8c127b799f533395101a2))
+
+### [0.7.22](https://github.com/antares-sql/antares/compare/v0.7.22-beta.2...v0.7.22) (2024-02-26)
+
+
+### Bug Fixes
+
+* delete record modal pressing del when editing a field, fixes [#767](https://github.com/antares-sql/antares/issues/767) ([586f901](https://github.com/antares-sql/antares/commit/586f901bae9a80c0e53ac1d804cbae3f05e26d8e))
+
+### [0.7.22-beta.2](https://github.com/antares-sql/antares/compare/v0.7.22-beta.1...v0.7.22-beta.2) (2024-02-18)
+
+
+### Features
+
+* **MySQL:** option to enable single connection mode ([d3f71e6](https://github.com/antares-sql/antares/commit/d3f71e65cef88838f03f95a4b34e197fb61878f8))
+
+### [0.7.22-beta.1](https://github.com/antares-sql/antares/compare/v0.7.22-beta.0...v0.7.22-beta.1) (2024-02-12)
+
+
+### Features
+
+* update dutch translation + fix spelling mistake ([30ada13](https://github.com/antares-sql/antares/commit/30ada13663e88f89beb3dd7291010837059585d5))
+
+
+### Bug Fixes
+
+* some issues related to previous commit ([259d051](https://github.com/antares-sql/antares/commit/259d051a21e334496d3a52b662f1855ba9a9046d))
+* unable to edit tables containing SET fields, fixes [#755](https://github.com/antares-sql/antares/issues/755) ([d698f27](https://github.com/antares-sql/antares/commit/d698f2798a2423f86e6d786dd3ab80439b372a08))
+
+
+### Improvements
+
+* **MySQL:** improvements in connection handling ([876d5ea](https://github.com/antares-sql/antares/commit/876d5ea48185334e9e2fc981c4282a9c42d22b10))
+
 ### [0.7.22-beta.0](https://github.com/antares-sql/antares/compare/v0.7.21...v0.7.22-beta.0) (2024-02-04)
 
 

README.md

@@ -101,7 +101,7 @@ On macOS you can run `.dmg` distribution following [this guide](https://support.
 
 - 🌍 [Translate Antares](https://github.com/Fabio286/antares/wiki/Translate-Antares)
 - 📖 [Contributors Guide](https://github.com/Fabio286/antares/wiki/Contributors-Guide)
-- 🚧 [Project Board](https://github.com/antares-sql/antares/projects/1)
+- 🚧 [Project Board](https://github.com/orgs/antares-sql/projects/3/views/2)
 
 ## Contributors ✨
 

commitlint.config.js

@@ -0,0 +1,33 @@
+module.exports = {
+   extends: ['@commitlint/config-conventional'],
+   rules: {
+      //   TODO Add Scope Enum Here
+      // 'scope-enum': [2, 'always', ['yourscope', 'yourscope']],
+      'type-enum': [
+         2,
+         'always',
+         [
+            'feat',
+            'fix',
+            'docs',
+            'chore',
+            'style',
+            'refactor',
+            'build',
+            'ci',
+            'test',
+            'revert',
+            'perf'
+         ]
+      ],
+      'subject-case': [
+         2,
+         'never',
+         [
+            'upper-case',
+            'pascal-case',
+            'start-case'
+         ]
+      ]
+   }
+};

package.json

@@ -1,7 +1,7 @@
 {
   "name": "antares",
   "productName": "Antares",
-  "version": "0.7.22-beta.0",
+  "version": "0.7.23-beta.0",
   "description": "A modern, fast and productivity driven SQL client with a focus in UX.",
   "license": "MIT",
   "repository": "https://github.com/antares-sql/antares.git",
@@ -25,7 +25,8 @@
     "lint": "eslint . --ext .js,.ts,.vue && stylelint \"./src/**/*.{css,scss,sass,vue}\"",
     "lint:fix": "eslint . --ext .js,.ts,.vue --fix && stylelint \"./src/**/*.{css,scss,sass,vue}\" --fix",
     "contributors:add": "all-contributors add",
-    "contributors:generate": "all-contributors generate"
+    "contributors:generate": "all-contributors generate",
+    "prepare": "husky"
   },
   "author": "Fabio Di Stasio <info@fabiodistasio.it>",
   "main": "./dist/main.js",
@@ -124,39 +125,63 @@
     "@jamescoyle/vue-icon": "~0.1.2",
     "@mdi/js": "~7.2.96",
     "@turf/helpers": "~6.5.0",
+    "@vue/compiler-sfc": "~3.2.33",
     "@vueuse/core": "~10.4.1",
     "ace-builds": "~1.24.1",
-    "better-sqlite3": "^8.0.1",
+    "babel-loader": "~8.2.3",
+    "better-sqlite3": "~9.4.1",
+    "chalk": "~4.1.2",
+    "cross-env": "~7.0.2",
+    "css-loader": "~6.5.0",
     "electron-log": "~5.0.1",
     "electron-store": "~8.1.0",
     "electron-updater": "~4.6.5",
     "electron-window-state": "~5.0.3",
     "encoding": "~0.1.13",
+    "file-loader": "~6.2.0",
     "floating-vue": "~2.0.0-beta.20",
+    "html-webpack-plugin": "~5.5.0",
     "json2php": "~0.0.7",
     "leaflet": "~1.7.1",
-    "marked": "~4.0.19",
-    "moment": "~2.29.4",
-    "mysql2": "~3.5.2",
+    "marked": "~12.0.0",
+    "mini-css-extract-plugin": "~2.4.5",
+    "moment": "~2.30.1",
+    "mysql2": "~3.9.1",
     "node-firebird": "~1.1.4",
-    "pg": "~8.11.1",
+    "node-loader": "~2.0.0",
+    "pg": "~8.11.3",
     "pg-connection-string": "~2.5.0",
     "pg-query-stream": "~4.2.3",
     "pgsql-ast-parser": "~7.2.1",
-    "pinia": "~2.1.6",
+    "pinia": "~2.1.7",
+    "postcss-html": "~1.5.0",
+    "progress-webpack-plugin": "~1.0.12",
+    "rimraf": "~3.0.2",
+    "sass": "~1.42.1",
+    "sass-loader": "~12.3.0",
     "source-map-support": "~0.5.20",
     "spectre.css": "~0.5.9",
     "sql-formatter": "~13.0.0",
     "sql-highlight": "~4.4.0",
+    "style-loader": "~3.3.1",
+    "tree-kill": "~1.2.2",
+    "ts-loader": "~9.2.8",
+    "typescript": "~4.6.3",
+    "unzip-crx-3": "~0.2.0",
     "v-mask": "~2.3.0",
-    "vue": "~3.3.4",
+    "vue": "~3.4.19",
     "vue-i18n": "~9.2.2",
-    "vuedraggable": "~4.1.0"
+    "vue-loader": "~16.8.3",
+    "vuedraggable": "~4.1.0",
+    "webpack": "~5.72.0",
+    "webpack-cli": "~4.9.1"
   },
   "devDependencies": {
     "@babel/eslint-parser": "~7.15.7",
     "@babel/preset-env": "~7.15.8",
     "@babel/preset-typescript": "~7.16.7",
+    "@commitlint/cli": "~19.0.3",
+    "@commitlint/config-conventional": "~19.0.3",
     "@playwright/test": "~1.28.1",
     "@types/better-sqlite3": "~7.5.0",
     "@types/leaflet": "~1.7.9",
@@ -166,13 +191,8 @@
     "@types/ssh2": "~1.11.6",
     "@typescript-eslint/eslint-plugin": "~5.18.0",
     "@typescript-eslint/parser": "~5.18.0",
-    "@vue/compiler-sfc": "~3.2.33",
     "all-contributors-cli": "~6.20.0",
-    "babel-loader": "~8.2.3",
-    "chalk": "~4.1.2",
-    "cross-env": "~7.0.2",
-    "css-loader": "~6.5.0",
-    "electron": "~22.3.27",
+    "electron": "~26.6.9",
     "electron-builder": "~24.6.4",
     "eslint": "~7.32.0",
     "eslint-config-standard": "~16.0.3",
@@ -181,32 +201,16 @@
     "eslint-plugin-promise": "~5.2.0",
     "eslint-plugin-simple-import-sort": "~10.0.0",
     "eslint-plugin-vue": "~8.0.3",
-    "file-loader": "~6.2.0",
-    "html-webpack-plugin": "~5.5.0",
-    "mini-css-extract-plugin": "~2.4.5",
-    "node-loader": "~2.0.0",
+    "husky": "~9.0.11",
     "playwright": "~1.28.1",
     "playwright-core": "~1.28.1",
-    "postcss-html": "~1.5.0",
-    "progress-webpack-plugin": "~1.0.12",
-    "rimraf": "~3.0.2",
-    "sass": "~1.42.1",
-    "sass-loader": "~12.3.0",
     "standard-version": "~9.3.1",
-    "style-loader": "~3.3.1",
     "stylelint": "^15.11.0",
     "stylelint-config-recommended-vue": "~1.5.0",
     "stylelint-config-standard": "~34.0.0",
     "stylelint-scss": "~5.3.0",
-    "tree-kill": "~1.2.2",
-    "ts-loader": "~9.2.8",
     "ts-node": "~10.9.1",
-    "typescript": "~4.6.3",
-    "unzip-crx-3": "~0.2.0",
     "vue-eslint-parser": "~8.3.0",
-    "vue-loader": "~16.8.3",
-    "webpack": "~5.72.0",
-    "webpack-cli": "~4.9.1",
     "webpack-dev-server": "~4.11.1",
     "xvfb-maybe": "~0.2.1"
   }

src/common/customizations/defaults.ts

@@ -19,6 +19,7 @@ export const defaults: Customizations = {
    sshConnection: false,
    fileConnection: false,
    cancelQueries: false,
+   singleConnectionMode: false,
    // Tools
    processesList: false,
    usersManagement: false,

src/common/customizations/mysql.ts

@@ -29,6 +29,7 @@ export const customizations: Customizations = {
    sslConnection: true,
    sshConnection: true,
    cancelQueries: true,
+   singleConnectionMode: true,
    // Tools
    processesList: true,
    // Structure

src/common/interfaces/antares.ts

@@ -52,6 +52,7 @@ export interface ConnectionParams {
    password: string;
    ask: boolean;
    readonly: boolean;
+   singleConnectionMode: boolean;
    ssl: boolean;
    cert?: string;
    key?: string;

src/common/interfaces/customizations.ts

@@ -19,6 +19,7 @@ export interface Customizations {
    sshConnection?: boolean;
    fileConnection?: boolean;
    cancelQueries?: boolean;
+   singleConnectionMode?: boolean;
    // Tools
    processesList?: boolean;
    usersManagement?: boolean;

src/main/ipc-handlers/connection.ts

@@ -146,7 +146,7 @@ export default (connections: Record<string, antares.Client>) => {
             uid: conn.uid,
             client: conn.client,
             params,
-            poolSize: 5
+            poolSize: conn.singleConnectionMode ? 0 : 5
          });
 
          await connection.connect();

src/main/libs/ShortcutRegister.ts

@@ -70,23 +70,21 @@ export class ShortcutRegister {
    }
 
    private setLocalShortcuts () {
+      const isMenuVisible = process.platform === 'darwin';
+      const submenu = [];
       for (const shortcut of this.shortcuts) {
          if (shortcut.os.includes(process.platform)) {
             for (const key of shortcut.keys) {
                try {
-                  this._menu.append(new MenuItem({
-                     label: '.',
-                     visible: false,
-                     submenu: [{
-                        label: String(key),
-                        accelerator: key,
-                        visible: false,
-                        click: () => {
-                           this._mainWindow.webContents.send(shortcut.event);
-                           if (isDevelopment) console.log('LOCAL EVENT:', shortcut);
-                        }
-                     }]
-                  }));
+                  submenu.push({
+                     label: String(shortcut.event),
+                     accelerator: key,
+                     visible: isMenuVisible,
+                     click: () => {
+                        this._mainWindow.webContents.send(shortcut.event);
+                        if (isDevelopment) console.log('LOCAL EVENT:', shortcut);
+                     }
+                  });
                }
                catch (error) {
                   if (isDevelopment) console.log(error);
@@ -96,6 +94,11 @@ export class ShortcutRegister {
             }
          }
       }
+      this._menu.append(new MenuItem({
+         label: 'Shortcut',
+         visible: isMenuVisible,
+         submenu
+      }));
    }
 
    private setGlobalShortcuts () {

src/main/libs/clients/MySQLClient.ts

@@ -12,6 +12,7 @@ export class MySQLClient extends BaseClient {
    private _connectionsToCommit: Map<string, mysql.Connection | mysql.PoolConnection>;
    private _keepaliveTimer: NodeJS.Timer;
    private _keepaliveMs: number;
+   private sqlMode?: string[];
    _connection?: mysql.Connection | mysql.Pool;
    _params: mysql.ConnectionOptions & {schema: string; ssl?: mysql.SslOptions; ssh?: SSHConfig; readonly: boolean};
 
@@ -58,6 +59,10 @@ export class MySQLClient extends BaseClient {
       this._keepaliveMs = 10*60*1000;
    }
 
+   private get isPool () {
+      return 'getConnection' in this._connection;
+   }
+
    private _getType (field: mysql.FieldPacket & { columnType?: number; columnLength?: number }) {
       let name = this.types[field.columnType];
       let length = field.columnLength;
@@ -181,9 +186,32 @@ export class MySQLClient extends BaseClient {
 
    async connect () {
       if (!this._poolSize)
-         this._connection = await this.getConnection();
+         this._connection = await this.getSingleConnection();
       else
          this._connection = await this.getConnectionPool();
+
+      // ANSI_QUOTES check
+      const [response] = await this._connection.query<mysql.RowDataPacket[]>('SHOW GLOBAL VARIABLES LIKE \'%sql_mode%\'');
+      this.sqlMode = response[0]?.Value?.split(',');
+      const hasAnsiQuotes = this.sqlMode.includes('ANSI') || this.sqlMode.includes('ANSI_QUOTES');
+
+      if (hasAnsiQuotes)
+         await this._connection.query(`SET SESSION sql_mode = '${this.sqlMode.filter((m: string) => !['ANSI', 'ANSI_QUOTES'].includes(m)).join(',')}'`);
+
+      if (this._params.readonly)
+         await this._connection.query('SET SESSION TRANSACTION READ ONLY');
+
+      if (this._poolSize) {
+         const hasAnsiQuotes = this.sqlMode.includes('ANSI') || this.sqlMode.includes('ANSI_QUOTES');
+
+         this._connection.on('connection', conn => {
+            if (this._params.readonly)
+               conn.query('SET SESSION TRANSACTION READ ONLY');
+
+            if (hasAnsiQuotes)
+               conn.query(`SET SESSION sql_mode = '${this.sqlMode.filter((m: string) => !['ANSI', 'ANSI_QUOTES'].includes(m)).join(',')}'`);
+         });
+      }
    }
 
    destroy () {
@@ -196,7 +224,7 @@ export class MySQLClient extends BaseClient {
       }
    }
 
-   async getConnection () {
+   async getSingleConnection () {
       const dbConfig = await this.getDbConfig();
       const connection = await mysql.createConnection({
          ...dbConfig,
@@ -208,17 +236,6 @@ export class MySQLClient extends BaseClient {
          }
       });
 
-      // ANSI_QUOTES check
-      const [response] = await connection.query<mysql.RowDataPacket[]>('SHOW GLOBAL VARIABLES LIKE \'%sql_mode%\'');
-      const sqlMode: string[] = response[0]?.Value?.split(',');
-      const hasAnsiQuotes = sqlMode.includes('ANSI') || sqlMode.includes('ANSI_QUOTES');
-
-      if (this._params.readonly)
-         await connection.query('SET SESSION TRANSACTION READ ONLY');
-
-      if (hasAnsiQuotes)
-         await connection.query(`SET SESSION sql_mode = '${sqlMode.filter((m: string) => !['ANSI', 'ANSI_QUOTES'].includes(m)).join(',')}'`);
-
       return connection;
    }
 
@@ -227,6 +244,7 @@ export class MySQLClient extends BaseClient {
       const connection = mysql.createPool({
          ...dbConfig,
          connectionLimit: this._poolSize,
+         enableKeepAlive: true,
          typeCast: (field, next) => {
             if (field.type === 'DATETIME')
                return field.string();
@@ -235,25 +253,6 @@ export class MySQLClient extends BaseClient {
          }
       });
 
-      // ANSI_QUOTES check
-      const [res] = await connection.query<mysql.RowDataPacket[]>('SHOW GLOBAL VARIABLES LIKE \'%sql_mode%\'');
-      const sqlMode: string[] = res[0]?.Value?.split(',');
-      const hasAnsiQuotes = sqlMode.includes('ANSI') || sqlMode.includes('ANSI_QUOTES');
-
-      if (hasAnsiQuotes)
-         await connection.query(`SET SESSION sql_mode = '${sqlMode.filter((m: string) => !['ANSI', 'ANSI_QUOTES'].includes(m)).join(',')}'`);
-
-      if (this._params.readonly)
-         await connection.query('SET SESSION TRANSACTION READ ONLY');
-
-      connection.on('connection', conn => {
-         if (this._params.readonly)
-            conn.query('SET SESSION TRANSACTION READ ONLY');
-
-         if (hasAnsiQuotes)
-            conn.query(`SET SESSION sql_mode = '${sqlMode.filter((m: string) => !['ANSI', 'ANSI_QUOTES'].includes(m)).join(',')}'`);
-      });
-
       this._keepaliveTimer = setInterval(async () => {
          await this.keepAlive();
       }, this._keepaliveMs);
@@ -261,6 +260,43 @@ export class MySQLClient extends BaseClient {
       return connection;
    }
 
+   async getConnection (args?: antares.QueryParams, retry?: boolean): Promise<mysql.Pool | mysql.PoolConnection | mysql.Connection> {
+      let connection;
+
+      try {
+         if (args && !args.autocommit && args.tabUid) { // autocommit OFF
+            if (this._connectionsToCommit.has(args.tabUid))
+               connection = this._connectionsToCommit.get(args.tabUid);
+            else {
+               connection = await this.getSingleConnection();
+               await connection.query('SET SESSION autocommit=0');
+               this._connectionsToCommit.set(args.tabUid, connection);
+            }
+         }
+         else// autocommit ON
+            connection = this.isPool ? await (this._connection as mysql.Pool).getConnection() : this._connection;
+
+         if (args && args.tabUid && this.isPool) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            this._runningConnections.set(args.tabUid, (connection as any).connection.connectionId);
+         }
+
+         if (args && args.schema)
+            await connection.query(`USE \`${args.schema}\``);
+
+         return connection;
+      }
+      catch (error) {
+         if (error.code === 'ECONNRESET' && !retry) {
+            this.destroy();
+            await this.connect();
+            return this.getConnection(args, true);
+         }
+         else
+            throw new Error(error.message);
+      }
+   }
+
    private async keepAlive () {
       try {
          const connection = await (this._connection as mysql.Pool).getConnection();
@@ -591,7 +627,7 @@ export class MySQLClient extends BaseClient {
       return rows.map((field) => {
          const numLengthMatch = field.COLUMN_TYPE.match(/int\(([^)]+)\)/);
          const numLength = numLengthMatch ? +numLengthMatch.pop() : field.NUMERIC_PRECISION || null;
-         const enumValues = /(enum)/.test(field.COLUMN_TYPE)
+         const enumValues = /(enum|set)/.test(field.COLUMN_TYPE)
             ? field.COLUMN_TYPE.match(/\(([^)]+)\)/)[0].slice(1, -1)
             : null;
 
@@ -1648,28 +1684,7 @@ export class MySQLClient extends BaseClient {
             .map(q => q.trim())
          : [sql];
 
-      let connection: mysql.Connection | mysql.Pool | mysql.PoolConnection;
-      const isPool = 'getConnection' in this._connection;
-
-      if (!args.autocommit && args.tabUid) { // autocommit OFF
-         if (this._connectionsToCommit.has(args.tabUid))
-            connection = this._connectionsToCommit.get(args.tabUid);
-         else {
-            connection = await this.getConnection();
-            await connection.query('SET SESSION autocommit=0');
-            this._connectionsToCommit.set(args.tabUid, connection);
-         }
-      }
-      else// autocommit ON
-         connection = isPool ? await (this._connection as mysql.Pool).getConnection() : this._connection;
-
-      if (args.tabUid && isPool) {
-         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-         this._runningConnections.set(args.tabUid, (connection as any).connection.connectionId);
-      }
-
-      if (args.schema)
-         await connection.query(`USE \`${args.schema}\``);
+      const connection = await this.getConnection(args);
 
       for (const query of queries) {
          if (!query) continue;
@@ -1729,7 +1744,7 @@ export class MySQLClient extends BaseClient {
                            });
                         }
                         catch (err) {
-                           if (isPool && args.autocommit) {
+                           if (this.isPool && args.autocommit) {
                               (connection as mysql.PoolConnection).release();
                               this._runningConnections.delete(args.tabUid);
                            }
@@ -1741,7 +1756,7 @@ export class MySQLClient extends BaseClient {
                            keysArr = keysArr ? [...keysArr, ...response] : response;
                         }
                         catch (err) {
-                           if (isPool && args.autocommit) {
+                           if (this.isPool && args.autocommit) {
                               (connection as mysql.PoolConnection).release();
                               this._runningConnections.delete(args.tabUid);
                            }
@@ -1759,7 +1774,7 @@ export class MySQLClient extends BaseClient {
                   keys: keysArr
                });
             }).catch((err) => {
-               if (isPool && args.autocommit) {
+               if (this.isPool && args.autocommit) {
                   (connection as mysql.PoolConnection).release();
                   this._runningConnections.delete(args.tabUid);
                }
@@ -1776,7 +1791,7 @@ export class MySQLClient extends BaseClient {
          });
       }
 
-      if (isPool && args.autocommit) {
+      if (this.isPool && args.autocommit) {
          (connection as mysql.PoolConnection).release();
          this._runningConnections.delete(args.tabUid);
       }

src/renderer/components/ModalHistory.vue

@@ -115,7 +115,7 @@
                      <BaseIcon icon-name="mdiHistory" :size="48" />
                   </div>
                   <p class="empty-title h5">
-                     {{ t('database.thereIsNoQueriesYet') }}
+                     {{ t('database.thereAreNoQueriesYet') }}
                   </p>
                </div>
             </div>

src/renderer/components/TheSettingBar.vue

@@ -186,7 +186,7 @@ if (!connectionsArr.value.length)
    .settingbar-top-elements {
       overflow-x: hidden;
       overflow-y: overlay;
-      // max-height: calc((100vh - 3.5rem) - #{$excluding-size});
+      width: 100%;
 
       &::-webkit-scrollbar {
          width: 3px;

src/renderer/components/WorkspaceAddConnectionPanel.vue

@@ -163,22 +163,30 @@
                            >
                         </div>
                      </div>
-                     <div v-if="clientCustomizations.readOnlyMode" class="form-group columns">
+                     <div v-if="clientCustomizations.readOnlyMode" class="form-group columns mb-0">
                         <div class="column col-5 col-sm-12" />
                         <div class="column col-7 col-sm-12">
-                           <label class="form-checkbox form-inline">
+                           <label class="form-checkbox form-inline my-0">
                               <input v-model="connection.readonly" type="checkbox"><i class="form-icon" /> {{ t('connection.readOnlyMode') }}
                            </label>
                         </div>
                      </div>
-                     <div v-if="!clientCustomizations.fileConnection" class="form-group columns">
+                     <div v-if="!clientCustomizations.fileConnection" class="form-group columns mb-0">
                         <div class="column col-5 col-sm-12" />
                         <div class="column col-7 col-sm-12">
-                           <label class="form-checkbox form-inline">
+                           <label class="form-checkbox form-inline my-0">
                               <input v-model="connection.ask" type="checkbox"><i class="form-icon" /> {{ t('connection.askCredentials') }}
                            </label>
                         </div>
                      </div>
+                     <div v-if="clientCustomizations.singleConnectionMode" class="form-group columns mb-0">
+                        <div class="column col-5 col-sm-12" />
+                        <div class="column col-7 col-sm-12">
+                           <label class="form-checkbox form-inline my-0">
+                              <input v-model="connection.singleConnectionMode" type="checkbox"><i class="form-icon" /> {{ t('connection.singleConnection') }}
+                           </label>
+                        </div>
+                     </div>
                   </fieldset>
                </form>
             </div>

src/renderer/components/WorkspaceEditConnectionPanel.vue

@@ -165,22 +165,30 @@
                            >
                         </div>
                      </div>
-                     <div v-if="clientCustomizations.readOnlyMode" class="form-group columns">
+                     <div v-if="clientCustomizations.readOnlyMode" class="form-group columns mb-0">
                         <div class="column col-5 col-sm-12" />
                         <div class="column col-7 col-sm-12">
-                           <label class="form-checkbox form-inline">
+                           <label class="form-checkbox form-inline my-0">
                               <input v-model="localConnection.readonly" type="checkbox"><i class="form-icon" /> {{ t('connection.readOnlyMode') }}
                            </label>
                         </div>
                      </div>
-                     <div v-if="!clientCustomizations.fileConnection" class="form-group columns">
+                     <div v-if="!clientCustomizations.fileConnection" class="form-group columns mb-0">
                         <div class="column col-5 col-sm-12" />
                         <div class="column col-7 col-sm-12">
-                           <label class="form-checkbox form-inline">
+                           <label class="form-checkbox form-inline my-0">
                               <input v-model="localConnection.ask" type="checkbox"><i class="form-icon" /> {{ t('connection.askCredentials') }}
                            </label>
                         </div>
                      </div>
+                     <div v-if="clientCustomizations.singleConnectionMode" class="form-group columns mb-0">
+                        <div class="column col-5 col-sm-12" />
+                        <div class="column col-7 col-sm-12">
+                           <label class="form-checkbox form-inline my-0">
+                              <input v-model="localConnection.singleConnectionMode" type="checkbox"><i class="form-icon" /> {{ t('connection.singleConnection') }}
+                           </label>
+                        </div>
+                     </div>
                   </fieldset>
                </form>
             </div>

src/renderer/components/WorkspaceTabQueryTable.vue

@@ -31,7 +31,7 @@
             :class="{ 'active': resultsetIndex === index }"
             @click="selectResultset(index)"
          >
-            <a>{{ result.fields ? result.fields[0]?.table : '' }} ({{ result.rows.length }})</a>
+            <a>{{ result.fields ? result.fields[0]?.tableAlias ?? result.fields[0]?.table : `${t('general.results')} #${index}` }} ({{ result.rows.length }})</a>
          </li>
       </ul>
       <div ref="table" class="table table-hover">
@@ -44,7 +44,7 @@
                   :title="`${field.type} ${fieldLength(field) ? `(${fieldLength(field)})` : ''}`"
                >
                   <div ref="columnResize" class="column-resizable">
-                     <div class="table-column-title" @click="sort(field.name)">
+                     <div class="table-column-title" @click="sort(field)">
                         <div v-if="field.key" :title="keyName(field.key)">
                            <BaseIcon
                               icon-name="mdiKey"
@@ -56,8 +56,8 @@
                         </div>
                         <span>{{ field.alias || field.name }}</span>
                         <BaseIcon
-                           v-if="isSortable && currentSort === field.name || currentSort === `${field.table}.${field.name}`"
-                           :icon-name="currentSortDir === 'asc' ? 'mdiSortAscending' : 'mdiSortDescending'"
+                           v-if="isSortable && currentSort[resultsetIndex]?.field === field.name || currentSort[resultsetIndex]?.field === `${field.tableAlias || field.table}.${field.name}`"
+                           :icon-name="currentSort[resultsetIndex].dir === 'asc' ? 'mdiSortAscending' : 'mdiSortDescending'"
                            :size="18"
                            class="sort-icon ml-1"
                         />
@@ -314,8 +314,7 @@ const hasFocus = ref(false);
 const contextEvent = ref(null);
 const selectedCell = ref(null);
 const selectedRows = ref([]);
-const currentSort = ref('');
-const currentSortDir = ref('asc');
+const currentSort: Ref<{field: string; dir: 'asc' | 'desc'}[]> = ref([]);
 const resultsetIndex = ref(0);
 const scrollElement = ref(null);
 const rowHeight = ref(23);
@@ -358,14 +357,16 @@ const isHardSort = computed(() => {
 });
 
 const sortedResults = computed(() => {
-   if (currentSort.value && !isHardSort.value) {
+   if (currentSort.value[resultsetIndex.value] && !isHardSort.value) {
+      const sortObj = currentSort.value[resultsetIndex.value];
+
       return [...localResults.value].sort((a: any, b: any) => {
          let modifier = 1;
-         let valA = typeof a[currentSort.value] === 'string' ? a[currentSort.value].toLowerCase() : a[currentSort.value];
+         let valA = typeof a[sortObj.field] === 'string' ? a[sortObj.field].toLowerCase() : a[sortObj.field];
          if (!isNaN(valA)) valA = Number(valA);
-         let valB = typeof b[currentSort.value] === 'string' ? b[currentSort.value].toLowerCase() : b[currentSort.value];
+         let valB = typeof b[sortObj.field] === 'string' ? b[sortObj.field].toLowerCase() : b[sortObj.field];
          if (!isNaN(valB)) valB = Number(valB);
-         if (currentSortDir.value === 'desc') modifier = -1;
+         if (sortObj.dir === 'desc') modifier = -1;
          if (valA < valB) return -1 * modifier;
          if (valA > valB) return 1 * modifier;
          return 0;
@@ -784,32 +785,42 @@ const contextMenu = (event: MouseEvent, cell: any) => {
    isContext.value = true;
 };
 
-const sort = (field: string) => {
+const sort = (field: TableField) => {
    if (!isSortable.value) return;
 
    selectedRows.value = [];
+   let fieldName = field.name;
+   const hasTableInFieldname = Object.keys(localResults.value[0]).find(k => k !== '_antares_id').includes('.');
 
-   if (props.mode === 'query')
-      field = `${getTable(resultsetIndex.value)}.${field}`;
+   if (props.mode === 'query' && hasTableInFieldname)
+      fieldName = `${field.tableAlias || field.table}.${field.name}`;
 
-   if (field === currentSort.value) {
-      if (currentSortDir.value === 'asc')
-         currentSortDir.value = 'desc';
+   if (fieldName === currentSort.value[resultsetIndex.value]?.field) {
+      if (currentSort.value[resultsetIndex.value].dir === 'asc')
+         currentSort.value[resultsetIndex.value].dir = 'desc';
       else
          resetSort();
    }
    else {
-      currentSortDir.value = 'asc';
-      currentSort.value = field;
+      currentSort.value[resultsetIndex.value] = {
+         field: fieldName,
+         dir: 'asc'
+      };
    }
 
-   if (isHardSort.value)
-      emit('hard-sort', { field: currentSort.value, dir: currentSortDir.value });
+   if (isHardSort.value) {
+      emit('hard-sort', {
+         field: currentSort.value[resultsetIndex.value].field,
+         dir: currentSort.value[resultsetIndex.value].dir
+      });
+   }
 };
 
 const resetSort = () => {
-   currentSort.value = '';
-   currentSortDir.value = 'asc';
+   currentSort.value[resultsetIndex.value] = {
+      field: null,
+      dir: 'asc'
+   };
 };
 
 const selectResultset = (index: number) => {

src/renderer/components/WorkspaceTabQueryTableRow.vue

@@ -43,6 +43,7 @@
                   autofocus
                   class="editable-field form-input input-sm px-1"
                   @blur="editOFF"
+                  @keyup.delete.stop
                >
                <BaseSelect
                   v-else-if="inputProps.type === 'boolean'"
@@ -50,6 +51,7 @@
                   :options="['true', 'false']"
                   class="form-select small-select editable-field"
                   @blur="editOFF"
+                  @keyup.delete.stop
                />
                <BaseSelect
                   v-else-if="enumArray"
@@ -58,6 +60,7 @@
                   class="form-select small-select editable-field"
                   dropdown-class="small-select"
                   @blur="editOFF"
+                  @keyup.delete.stop
                />
                <input
                   v-else
@@ -67,6 +70,7 @@
                   autofocus
                   class="editable-field form-input input-sm px-1"
                   @blur="editOFF"
+                  @keyup.delete.stop
                >
             </template>
          </template>
@@ -382,7 +386,7 @@ const isBaseSelectField = computed(() => {
 });
 
 const enumArray = computed(() => {
-   if (props.fields[editingField.value] && props.fields[editingField.value].enumValues)
+   if (props.fields[editingField.value] && props.fields[editingField.value].enumValues && props.fields[editingField.value].type !== 'SET')
       return props.fields[editingField.value].enumValues.replaceAll('\'', '').split(',');
    return false;
 });

src/renderer/i18n/ca-ES.ts

@@ -232,7 +232,7 @@ export const caES = {
       newFunction: 'Nova funció',
       newScheduler: 'Nou planificador',
       newTriggerFunction: 'Nova funció de disparador',
-      thereIsNoQueriesYet: 'Encara no hi ha consultes',
+      thereAreNoQueriesYet: 'Encara no hi ha consultes',
       searchForQueries: 'Cerca consultes',
       killProcess: 'Mata procés',
       exportSchema: 'Exporta esquema',

src/renderer/i18n/cs-CZ.ts

@@ -233,7 +233,7 @@ export const csCZ = {
       newFunction: 'Nová funkce',
       newScheduler: 'Nový scheduler',
       newTriggerFunction: 'Nová trigger funkce',
-      thereIsNoQueriesYet: 'Nejsou tu žádné dotazy',
+      thereAreNoQueriesYet: 'Nejsou tu žádné dotazy',
       searchForQueries: 'Hledání dotazů',
       killProcess: 'Zabít proces',
       exportSchema: 'Exportovat schéma',

src/renderer/i18n/en-US.ts

@@ -116,7 +116,8 @@ export const enUS = {
       readOnlyMode: 'Read-only mode',
       allConnections: 'All connections',
       searchForConnections: 'Search for connections',
-      keepAliveInterval: 'Keep alive interval'
+      keepAliveInterval: 'Keep alive interval',
+      singleConnection: 'Single connection'
    },
    database: { // Database related terms
       schema: 'Schema',
@@ -251,7 +252,7 @@ export const enUS = {
       newFunction: 'New function',
       newScheduler: 'New scheduler',
       newTriggerFunction: 'New trigger function',
-      thereIsNoQueriesYet: 'There is no queries yet',
+      thereAreNoQueriesYet: 'There are no queries yet',
       searchForQueries: 'Search for queries',
       killProcess: 'Kill process',
       exportSchema: 'Export schema',

src/renderer/i18n/fr-FR.ts

@@ -229,7 +229,7 @@ export const frFR = {
       newFunction: 'Nouvelle function',
       newScheduler: 'Nouveau déclencheur',
       newTriggerFunction: 'Nouvelle fonction de déclencheur',
-      thereIsNoQueriesYet: 'Il n\'y a pas encore de requête',
+      thereAreNoQueriesYet: 'Il n\'y a pas encore de requête',
       searchForQueries: 'Rechercher des requêtes',
       killProcess: 'Terminer un processus',
       exportSchema: 'Exporter un schéma',

src/renderer/i18n/id-ID.ts

@@ -227,7 +227,7 @@ export const idID = {
       newFunction: 'Fungsi baru',
       newScheduler: 'Penjadwal baru',
       newTriggerFunction: 'Fungsi pemicu baru',
-      thereIsNoQueriesYet: 'Belum ada kueri',
+      thereAreNoQueriesYet: 'Belum ada kueri',
       searchForQueries: 'Telusuri kueri',
       killProcess: 'Membunuh proses',
       exportSchema: 'Skema ekspor',

src/renderer/i18n/it-IT.ts

@@ -228,7 +228,7 @@ export const itIT = {
       newFunction: 'Nuova funzione',
       newScheduler: 'Nuovo scheduler',
       newTriggerFunction: 'Nuova funzione di trigger',
-      thereIsNoQueriesYet: 'Non ci sono ancora query',
+      thereAreNoQueriesYet: 'Non ci sono ancora query',
       searchForQueries: 'Cerca query',
       killProcess: 'Uccidi processo',
       exportSchema: 'Esporta schema',

src/renderer/i18n/ja-JP.ts

@@ -198,7 +198,7 @@ export const jaJP = {
       newFunction: '新しい関数',
       newScheduler: '新規スケジューラ',
       newTriggerFunction: '新しいトリガー機能',
-      thereIsNoQueriesYet: 'まだ問い合わせはありません',
+      thereAreNoQueriesYet: 'まだ問い合わせはありません',
       searchForQueries: 'クエリの検索',
       killProcess: 'プロセスの停止'
    },

src/renderer/i18n/ko-KR.ts

@@ -228,7 +228,7 @@ export const koKR = {
       newFunction: '새 함수',
       newScheduler: '새 스케줄러',
       newTriggerFunction: '새 트리거 함수',
-      thereIsNoQueriesYet: '아직 쿼리가 없습니다',
+      thereAreNoQueriesYet: '아직 쿼리가 없습니다',
       searchForQueries: '쿼리 검색',
       killProcess: '프로세스 종료',
       exportSchema: '스키마 내보내기',

src/renderer/i18n/nl-NL.ts

@@ -100,7 +100,7 @@ export const nlNL = {
       readOnlyMode: 'Alleen lezen modus',
       untrustedConnection: 'Niet vertrouwde verbinding',
       allConnections: 'Alle verbindingen',
-      searchForConnections: 'Search for connections'
+      searchForConnections: 'Zoek naar verbindingen'
    },
    database: {
       schema: 'Schema',
@@ -233,8 +233,8 @@ export const nlNL = {
       newFunction: 'Nieuwe function',
       newScheduler: 'Nieuwe scheduler',
       newTriggerFunction: 'Nieuwe trigger function',
-      thereIsNoQueriesYet: 'There is no queries yet',
-      searchForQueries: 'Search for queries',
+      thereAreNoQueriesYet: 'Er zijn nog geen queries',
+      searchForQueries: 'Zoek naar queries',
       killProcess: 'Sluit proces af',
       exportSchema: 'Exporteer schema',
       importSchema: 'Importeer schema',

src/renderer/i18n/pt-BR.ts

@@ -231,7 +231,7 @@ export const ptBR = {
       newFunction: 'Nova função',
       newScheduler: 'Novo agendento',
       newTriggerFunction: 'Novo gatinho de função',
-      thereIsNoQueriesYet: 'Nenhuma consulta ainda',
+      thereAreNoQueriesYet: 'Nenhuma consulta ainda',
       searchForQueries: 'Pesquisar por consultas',
       killProcess: 'Matar processo',
       exportSchema: 'Exportar banco de dados',

src/renderer/i18n/ru-RU.ts

@@ -229,7 +229,7 @@ export const ruRU = {
       newFunction: 'Новая функция',
       newScheduler: 'Новый планировщик',
       newTriggerFunction: 'Новая функция триггера',
-      thereIsNoQueriesYet: 'Запросы пока отсутствуют',
+      thereAreNoQueriesYet: 'Запросы пока отсутствуют',
       searchForQueries: 'Поиск по запросам',
       killProcess: 'Убить процесс',
       exportSchema: 'Экспорт схемы',

src/renderer/i18n/uk-UA.ts

@@ -238,7 +238,7 @@ export const ukUA = {
       newFunction: 'Нова функція',
       newScheduler: 'Новий планувальник',
       newTriggerFunction: 'Нова функція тригера',
-      thereIsNoQueriesYet: 'Поки що немає запитів',
+      thereAreNoQueriesYet: 'Поки що немає запитів',
       searchForQueries: 'Пошук запитів',
       killProcess: 'Завершити процес',
       exportSchema: 'Експорт схеми',

src/renderer/i18n/vi-VN.ts

@@ -222,7 +222,7 @@ export const viVN = {
       newFunction: 'Chức năng mới',
       newScheduler: 'Bộ lập lịch mới',
       newTriggerFunction: 'Chức năng kích hoạt mới',
-      thereIsNoQueriesYet: 'Không có truy vấn nào',
+      thereAreNoQueriesYet: 'Không có truy vấn nào',
       searchForQueries: 'Tìm kiếm truy vấn',
       killProcess: 'Huỷ quá trình',
       exportSchema: 'Xuất lược đồ',

src/renderer/i18n/zh-CN.ts

@@ -236,7 +236,7 @@ export const zhCN = {
       newFunction: '新函数',
       newScheduler: '新调度器',
       newTriggerFunction: '新触发器函数',
-      thereIsNoQueriesYet: '目前还没有任何查询',
+      thereAreNoQueriesYet: '目前还没有任何查询',
       searchForQueries: '搜索查询',
       killProcess: '终止进程',
       exportSchema: '导出模式(schema)',

src/renderer/libs/exportRows.ts

@@ -31,7 +31,7 @@ export const exportRows = (args: {
          const csv = [];
          const sd = args.csvOptions.stringDelimiter === 'single'
             ? '\''
-            : args.csvOptions.stringDelimiter === 'single'
+            : args.csvOptions.stringDelimiter === 'double'
                ? '"'
                : '';
 

src/renderer/scss/themes/dark-theme.scss

@@ -415,8 +415,7 @@
     box-shadow: 0 0 1px 0 #000;
 
     .settingbar-top-elements {
-      overflow-x: hidden;
-      overflow-y: overlay;
+      overflow: hidden overlay;
       max-height: calc((100vh - 3.5rem) - #{$excluding-size});
     }
 

src/renderer/scss/themes/light-theme.scss

@@ -164,8 +164,7 @@
     box-shadow: 0 0 1px 0 #000;
 
     .settingbar-top-elements {
-      overflow-x: hidden;
-      overflow-y: overlay;
+      overflow: hidden overlay;
       max-height: calc((100vh - 3.5rem) - #{$excluding-size});
     }
 

src/renderer/stores/application.ts

@@ -55,10 +55,9 @@ export const useApplicationStore = defineStore('application', {
       },
       showScratchpad (tag?: string) {
          this.isScratchpad = true;
-         if (tag) {
-            const { selectedTag } = storeToRefs(useScratchpadStore());
-            selectedTag.value = tag;
-         }
+         if (!tag) tag = 'all';
+         const { selectedTag } = storeToRefs(useScratchpadStore());
+         selectedTag.value = tag;
       },
       hideScratchpad () {
          this.isScratchpad = false;