chore(release): 0.7.31

.github/workflows/create-artifact-windows-appx.yml

@@ -0,0 +1,32 @@
+name: Create artifact [WINDOWS APPX]
+
+on: 
+  workflow_dispatch: {}
+
+jobs:
+  build:
+    runs-on: windows-2022
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v4
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      
+      - name: Install dependencies
+        run: npm i
+        
+      - name: "Build"
+        run: npm run build:appx
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: windows-build
+          retention-days: 3
+          path: |
+            build
+            !build/*-unpacked
+            !build/.icon-ico

CHANGELOG.md

@@ -2,6 +2,45 @@
 
 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.31](https://github.com/antares-sql/antares/compare/v0.7.31-beta.5...v0.7.31) (2025-02-11)
+
+### [0.7.31-beta.5](https://github.com/antares-sql/antares/compare/v0.7.31-beta.4...v0.7.31-beta.5) (2025-02-09)
+
+
+### Bug Fixes
+
+* **devtoolsInstaller:** improve file path handling and increase chromium version ([7595e89](https://github.com/antares-sql/antares/commit/7595e892238d2a93c454e9c1f236915fb458eed1))
+* improve BLOB primary fields management, fixes [#938](https://github.com/antares-sql/antares/issues/938) ([72f8d42](https://github.com/antares-sql/antares/commit/72f8d4249f7f587d3e92b46cf7709ddab42107d4))
+* **Linux:** restored AppImage auto updates ([0479e53](https://github.com/antares-sql/antares/commit/0479e5307c9a9d5f791e1c61fa772d331f6f7f1f))
+* replace 'this.addNotification' with 'addNotification' in useResultTables.ts ([580bef7](https://github.com/antares-sql/antares/commit/580bef76ba390fc85df0892265f31392b80301bd))
+* unable to delete rows from context menu ([0f93d70](https://github.com/antares-sql/antares/commit/0f93d70417871f02f9f64f203f6654fa1bf2004b))
+
+
+### Improvements
+
+* improve button styles of notes ([48cfa67](https://github.com/antares-sql/antares/commit/48cfa67889bd83228c109b7966c4acea4e542fc6))
+* **MySQL:** long loading in table settings when no checks present ([9cda38e](https://github.com/antares-sql/antares/commit/9cda38e9d10e3000473863560d8be8f426a5ed17))
+
+### [0.7.31-beta.4](https://github.com/antares-sql/antares/compare/v0.7.31-beta.3...v0.7.31-beta.4) (2025-01-31)
+
+
+### Bug Fixes
+
+* **Linux:** missing window management icons ([d34e56a](https://github.com/antares-sql/antares/commit/d34e56a517784dea16a7a53bc2249072a3b96596))
+
+### [0.7.31-beta.3](https://github.com/antares-sql/antares/compare/v0.7.31-beta.2...v0.7.31-beta.3) (2025-01-31)
+
+
+### Features
+
+* implement a better query splitter for SQL queries, fixes [#926](https://github.com/antares-sql/antares/issues/926) ([96ae09f](https://github.com/antares-sql/antares/commit/96ae09fecad0c1fc8926d5dcf64cc779abe5ed49))
+* **Linux:** update title bar for better Linux experience ([8e54f7b](https://github.com/antares-sql/antares/commit/8e54f7b80135768a33934bc9336239dee38401a5))
+
+
+### Bug Fixes
+
+* **MySQL:** adjust utf8mb3 encoding to resolve compatibility issue, fixes [#646](https://github.com/antares-sql/antares/issues/646) ([27387f1](https://github.com/antares-sql/antares/commit/27387f18a107fc6c09afec5f85134496ce764355))
+
 ### [0.7.31-beta.2](https://github.com/antares-sql/antares/compare/v0.7.31-beta.1...v0.7.31-beta.2) (2025-01-30)
 
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "antares",
-  "version": "0.7.31-beta.2",
+  "version": "0.7.31",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "antares",
-      "version": "0.7.31-beta.2",
+      "version": "0.7.31",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -22,6 +22,7 @@
         "babel-loader": "~8.2.3",
         "better-sqlite3": "~10.0.0",
         "chalk": "~4.1.2",
+        "ciaplu": "^2.2.0",
         "cpu-features": "^0.0.10",
         "cross-env": "~7.0.2",
         "css-loader": "~6.5.0",
@@ -5608,6 +5609,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/ciaplu": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ciaplu/-/ciaplu-2.2.0.tgz",
+      "integrity": "sha512-7y8s0GMFpIKqX2kwiOEYbaX3P9tPIbX4x41uw8GZjkZ+y0QZrpY3PFjE2Ed6BOeFxcCWi7b85MYHeiRrVrlSOQ==",
+      "license": "MIT"
+    },
     "node_modules/clean-css": {
       "version": "5.3.2",
       "license": "MIT",
@@ -20345,6 +20352,11 @@
       "version": "3.9.0",
       "dev": true
     },
+    "ciaplu": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ciaplu/-/ciaplu-2.2.0.tgz",
+      "integrity": "sha512-7y8s0GMFpIKqX2kwiOEYbaX3P9tPIbX4x41uw8GZjkZ+y0QZrpY3PFjE2Ed6BOeFxcCWi7b85MYHeiRrVrlSOQ=="
+    },
     "clean-css": {
       "version": "5.3.2",
       "requires": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "antares",
   "productName": "Antares",
-  "version": "0.7.31-beta.2",
+  "version": "0.7.31",
   "description": "A modern, fast and productivity driven SQL client with a focus in UX.",
   "license": "MIT",
   "repository": "https://github.com/antares-sql/antares.git",
@@ -131,6 +131,7 @@
     "babel-loader": "~8.2.3",
     "better-sqlite3": "~10.0.0",
     "chalk": "~4.1.2",
+    "ciaplu": "^2.2.0",
     "cpu-features": "^0.0.10",
     "cross-env": "~7.0.2",
     "css-loader": "~6.5.0",

scripts/devtoolsInstaller.js

@@ -1,5 +1,5 @@
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-nocheck
+// @ts-check
 const fs = require('fs');
 const path = require('path');
 const https = require('https');
@@ -7,13 +7,18 @@ const unzip = require('unzip-crx-3');
 const { antares } = require('../package.json');
 
 const extensionID = antares.devtoolsId;
+const chromiumVersion = '124';
 const destFolder = path.resolve(__dirname, `../misc/${extensionID}`);
-const filePath = path.resolve(__dirname, `${destFolder}${extensionID}.crx`);
-const fileUrl = `https://clients2.google.com/service/update2/crx?response=redirect&acceptformat=crx2,crx3&x=id%3D${extensionID}%26uc&prodversion=32`;
+const filePath = path.resolve(__dirname, `${destFolder}/${extensionID}.crx`);
+const fileUrl = `https://clients2.google.com/service/update2/crx?response=redirect&acceptformat=crx2,crx3&x=id%3D${extensionID}%26uc&prodversion=${chromiumVersion}`;
+
+if (!fs.existsSync(destFolder))
+   fs.mkdirSync(destFolder, { recursive: true });
+
 const fileStream = fs.createWriteStream(filePath);
 
 const downloadFile = url => {
-   return new Promise((resolve, reject) => {
+   return /** @type {Promise<void>} */(new Promise((resolve, reject) => {
       const request = https.get(url);
 
       request.on('response', response => {
@@ -33,7 +38,7 @@ const downloadFile = url => {
       });
       request.on('error', reject);
       request.end();
-   });
+   }));
 };
 
 (async () => {

src/common/interfaces/antares.ts

@@ -34,6 +34,7 @@ export interface ClientParams {
       | { databasePath: string; readonly: boolean };
    poolSize?: number;
    logger?: () => void;
+   querySplitter?: (sql: string, clieng?: string) => string[];
 }
 
 /**

src/common/libs/langDetector.ts

@@ -1,3 +1,5 @@
+import { match } from 'ciaplu';
+
 function isJSON (str: string) {
    try {
       if (!['{', '['].includes(str.trim()[0]))
@@ -176,17 +178,13 @@ function isMD (str: string) {
 }
 
 export function langDetector (str: string) {
-   if (!str || !str.trim().length)
-      return 'text';
-   if (isJSON(str))
-      return 'json';
-   if (isHTML(str))
-      return 'html';
-   if (isSVG(str))
-      return 'svg';
-   if (isXML(str))
-      return 'xml';
-   if (isMD(str))
-      return 'markdown';
-   return 'text';
+   return match(str)
+      .when(() => !str || !str.trim().length, () => 'text')
+      .when(isJSON, () => 'json')
+      .when(isHTML, () => 'html')
+      .when(isSVG, () => 'svg')
+      .when(isXML, () => 'xml')
+      .when(isMD, () => 'markdown')
+      .otherwise(() => 'text')
+      .return();
 }

src/common/libs/mimeFromHex.ts

@@ -1,45 +1,25 @@
+import { match } from 'ciaplu';
+
 export function mimeFromHex (hex: string) {
-   switch (hex.substring(0, 4)) { // 2 bytes
-      case '424D':
-         return { ext: 'bmp', mime: 'image/bmp' };
-      case '1F8B':
-         return { ext: 'tar.gz', mime: 'application/gzip' };
-      case '0B77':
-         return { ext: 'ac3', mime: 'audio/vnd.dolby.dd-raw' };
-      case '7801':
-         return { ext: 'dmg', mime: 'application/x-apple-diskimage' };
-      case '4D5A':
-         return { ext: 'exe', mime: 'application/x-msdownload' };
-      case '1FA0':
-      case '1F9D':
-         return { ext: 'Z', mime: 'application/x-compress' };
-      default:
-         switch (hex.substring(0, 6)) { // 3 bytes
-            case 'FFD8FF':
-               return { ext: 'jpg', mime: 'image/jpeg' };
-            case '4949BC':
-               return { ext: 'jxr', mime: 'image/vnd.ms-photo' };
-            case '425A68':
-               return { ext: 'bz2', mime: 'application/x-bzip2' };
-            default:
-               switch (hex) { // 4 bites
-                  case '89504E47':
-                     return { ext: 'png', mime: 'image/png' };
-                  case '47494638':
-                     return { ext: 'gif', mime: 'image/gif' };
-                  case '25504446':
-                     return { ext: 'pdf', mime: 'application/pdf' };
-                  case '504B0304':
-                     return { ext: 'zip', mime: 'application/zip' };
-                  case '425047FB':
-                     return { ext: 'bpg', mime: 'image/bpg' };
-                  case '4D4D002A':
-                     return { ext: 'tif', mime: 'image/tiff' };
-                  case '00000100':
-                     return { ext: 'ico', mime: 'image/x-icon' };
-                  default:
-                     return { ext: '', mime: 'unknown ' + hex };
-               }
-         }
-   }
+   return match(hex.substring(0, 4)) // 2 bytes
+      .with('424D', () => ({ ext: 'bmp', mime: 'image/bmp' }))
+      .with('1F8B', () => ({ ext: 'tar.gz', mime: 'application/gzip' }))
+      .with('0B77', () => ({ ext: 'ac3', mime: 'audio/vnd.dolby.dd-raw' }))
+      .with('7801', () => ({ ext: 'dmg', mime: 'application/x-apple-diskimage' }))
+      .with('4D5A', () => ({ ext: 'exe', mime: 'application/x-msdownload' }))
+      .when((val) => ['1FA0', '1F9D'].includes(val), () => ({ ext: 'Z', mime: 'application/x-compress' }))
+      .extracting(() => hex.substring(0, 6)) // 3 bytes
+      .with('FFD8FF', () => ({ ext: 'jpg', mime: 'image/jpeg' }))
+      .with('4949BC', () => ({ ext: 'jxr', mime: 'image/vnd.ms-photo' }))
+      .with('425A68', () => ({ ext: 'bz2', mime: 'application/x-bzip2' }))
+      .extracting(() => hex) // 4 bytes
+      .with('89504E47', () => ({ ext: 'png', mime: 'image/png' }))
+      .with('47494638', () => ({ ext: 'gif', mime: 'image/gif' }))
+      .with('25504446', () => ({ ext: 'pdf', mime: 'application/pdf' }))
+      .with('504B0304', () => ({ ext: 'zip', mime: 'application/zip' }))
+      .with('425047FB', () => ({ ext: 'bpg', mime: 'image/bpg' }))
+      .with('4D4D002A', () => ({ ext: 'tif', mime: 'image/tiff' }))
+      .with('00000100', () => ({ ext: 'ico', mime: 'image/x-icon' }))
+      .otherwise(() => ({ ext: '', mime: 'unknown ' + hex }))
+      .return();
 }

src/common/libs/querySplitter.ts

@@ -0,0 +1,86 @@
+import { ClientCode } from 'common/interfaces/antares';
+
+export const querySplitter =(sql: string, dbType: ClientCode): string[] => {
+   const queries: string[] = [];
+   let currentQuery = '';
+   let insideBlock = false;
+   let insideString = false;
+   let stringDelimiter: string | null = null;
+   let insideDollarTag = false;
+   let dollarTagDelimiter: string | null = null;
+
+   // Regex patterns for BEGIN-END blocks, dollar tags in PostgreSQL, and semicolons
+   const beginRegex = /\bBEGIN\b/i;
+   const endRegex = /\bEND\b;/i;
+   const dollarTagRegex = /\$(\w+)?\$/; // Matches $tag$ or $$
+
+   // Split on semicolons, keeping semicolons attached to the lines
+   const lines = sql.split(/(?<=;)/);
+
+   for (let line of lines) {
+      line = line.trim();
+
+      if (!line) continue;
+
+      for (let i = 0; i < line.length; i++) {
+         const char = line[i];
+
+         // Handle string boundaries
+         if ((char === '\'' || char === '"') && (!insideString || char === stringDelimiter)) {
+            if (!insideString) {
+               insideString = true;
+               stringDelimiter = char;
+            }
+            else {
+               insideString = false;
+               stringDelimiter = null;
+            }
+         }
+
+         currentQuery += char;
+
+         if (dbType === 'pg') {
+         // Handle dollar-quoted blocks in PostgreSQL
+            if (!insideString && line.slice(i).match(dollarTagRegex)) {
+               const match = line.slice(i).match(dollarTagRegex);
+               if (match) {
+                  const tag = match[0];
+                  if (!insideDollarTag) {
+                     insideDollarTag = true;
+                     dollarTagDelimiter = tag;
+                     currentQuery += tag;
+                     i += tag.length - 1;
+                  }
+                  else if (dollarTagDelimiter === tag) {
+                     insideDollarTag = false;
+                     dollarTagDelimiter = null;
+                     currentQuery += tag;
+                     i += tag.length - 1;
+                  }
+               }
+            }
+         }
+
+         // Check BEGIN-END blocks
+         if (!insideString && !insideDollarTag) {
+            if (beginRegex.test(line))
+               insideBlock = true;
+
+            if (insideBlock && endRegex.test(line))
+               insideBlock = false;
+         }
+      }
+
+      // Append the query if we encounter a semicolon outside a BEGIN-END block, outside a string, and outside dollar tags
+      if (!insideBlock && !insideString && !insideDollarTag && /;\s*$/.test(line)) {
+         queries.push(currentQuery.trim());
+         currentQuery = '';
+      }
+   }
+
+   // Add any remaining query
+   if (currentQuery.trim())
+      queries.push(currentQuery.trim());
+
+   return queries;
+};

src/main/libs/clients/BaseClient.ts

@@ -2,27 +2,9 @@ import * as antares from 'common/interfaces/antares';
 import mysql from 'mysql2/promise';
 import * as pg from 'pg';
 import SSH2Promise = require('@fabio286/ssh2-promise');
+import { querySplitter } from 'common/libs/querySplitter';
 
-export type LoggerLevel = 'query' | 'error'
-
-const ipcLogger = ({ content, cUid, level }: {content: string; cUid: string; level: LoggerLevel}) => {
-   if (level === 'error') {
-      if (process.type !== undefined) {
-         const mainWindow = require('electron').webContents.fromId(1);
-         mainWindow.send('non-blocking-exception', { cUid, message: content, date: new Date() });
-      }
-      if (process.env.NODE_ENV === 'development' && process.type === 'browser') console.log(content);
-   }
-   else if (level === 'query') {
-      // Remove comments, newlines and multiple spaces
-      const escapedSql = content.replace(/(\/\*(.|[\r\n])*?\*\/)|(--(.*|[\r\n]))/gm, '').replace(/\s\s+/g, ' ');
-      if (process.type !== undefined) {
-         const mainWindow = require('electron').webContents.fromId(1);
-         mainWindow.send('query-log', { cUid, sql: escapedSql, date: new Date() });
-      }
-      if (process.env.NODE_ENV === 'development' && process.type === 'browser') console.log(escapedSql);
-   }
-};
+import { ipcLogger, LoggerLevel } from '../misc/ipcLogger';
 
 /**
  * As Simple As Possible Query Builder Core
@@ -34,6 +16,7 @@ export abstract class BaseClient {
    protected _poolSize: number;
    protected _ssh?: SSH2Promise;
    protected _logger: (args: {content: string; cUid: string; level: LoggerLevel}) => void;
+   protected _querySplitter: (sql: string, client: antares.ClientCode) => string[];
    protected _queryDefaults: antares.QueryBuilderObject;
    protected _query: antares.QueryBuilderObject;
 
@@ -43,6 +26,7 @@ export abstract class BaseClient {
       this._params = args.params;
       this._poolSize = args.poolSize || undefined;
       this._logger = args.logger || ipcLogger;
+      this._querySplitter = args.querySplitter || querySplitter;
 
       this._queryDefaults = {
          schema: '',

src/main/libs/clients/FirebirdSQLClient.ts

@@ -245,10 +245,10 @@ export class FirebirdSQLClient extends BaseClient {
             name: db.name,
             size: schemaSize,
             tables: remappedTables,
-            functions: [],
+            functions: [] as null[],
             procedures: remappedProcedures,
             triggers: remappedTriggers,
-            schedulers: []
+            schedulers: [] as null[]
          };
       });
    }
@@ -337,7 +337,7 @@ export class FirebirdSQLClient extends BaseClient {
 
          return {
             name: field.FIELD_NAME.trim(),
-            key: null,
+            key: null as null,
             type: fieldType,
             schema: schema,
             table: table,
@@ -346,14 +346,14 @@ export class FirebirdSQLClient extends BaseClient {
             datePrecision: field.FIELD_NAME.trim() === 'TIMESTAMP' ? 4 : null,
             charLength: ![...NUMBER, ...FLOAT].includes(fieldType) ? field.FIELD_LENGTH : null,
             nullable: !field.NOT_NULL,
-            unsigned: null,
-            zerofill: null,
+            unsigned: null as null,
+            zerofill: null as null,
             order: field.FIELD_POSITION+1,
             default: defaultValue,
             charset: field.CHARSET,
-            collation: null,
+            collation: null as null,
             autoIncrement: false,
-            onUpdate: null,
+            onUpdate: null as null,
             comment: field.DESCRIPTION?.trim()
          };
       });
@@ -457,7 +457,7 @@ export class FirebirdSQLClient extends BaseClient {
             table: table,
             field: field.FKCOLUMN_NAME.trim(),
             position: field.KEY_SEQ,
-            constraintPosition: null,
+            constraintPosition: null as null,
             constraintName: field.FK_NAME.trim(),
             refSchema: schema,
             refTable: field.PKTABLE_NAME.trim(),
@@ -1041,9 +1041,7 @@ export class FirebirdSQLClient extends BaseClient {
       const resultsArr = [];
       let paramsArr = [];
       const queries = args.split
-         ? sql.split(/((?:[^;'"]*(?:"(?:\\.|[^"])*"|'(?:\\.|[^'])*')[^;'"]*)+)|;/gm)
-            .filter(Boolean)
-            .map(q => q.trim())
+         ? this._querySplitter(sql, 'firebird')
          : [sql];
 
       let connection: firebird.Database | firebird.Transaction;

src/main/libs/clients/MySQLClient.ts

@@ -4,7 +4,9 @@ import dataTypes from 'common/data-types/mysql';
 import * as antares from 'common/interfaces/antares';
 import * as mysql from 'mysql2/promise';
 
+import * as EncodingToCharset from '../../../../node_modules/mysql2/lib/constants/encoding_charset.js';
 import { BaseClient } from './BaseClient';
+EncodingToCharset.utf8mb3 = 192; // To fix https://github.com/sidorares/node-mysql2/issues/1398 until not included in mysql2
 
 export class MySQLClient extends BaseClient {
    private _schema?: string;
@@ -1753,9 +1755,7 @@ export class MySQLClient extends BaseClient {
       const resultsArr: antares.QueryResult[] = [];
       let paramsArr = [];
       const queries = args.split
-         ? sql.split(/((?:[^;'"]*(?:"(?:\\.|[^"])*"|'(?:\\.|[^'])*')[^;'"]*)+)|;/gm)
-            .filter(Boolean)
-            .map(q => q.trim())
+         ? this._querySplitter(sql, 'mysql')
          : [sql];
 
       const connection = await this.getConnection(args);

src/main/libs/clients/PostgreSQLClient.ts

@@ -466,7 +466,7 @@ export class PostgreSQLClient extends BaseClient {
                procedures: remappedProcedures,
                triggers: remappedTriggers,
                triggerFunctions: remappedTriggerFunctions,
-               schedulers: []
+               schedulers: [] as null[]
             };
          }
          else {
@@ -532,7 +532,7 @@ export class PostgreSQLClient extends BaseClient {
 
          return {
             name: field.column_name,
-            key: null,
+            key: null as null,
             type: type.toUpperCase(),
             isArray,
             schema: field.table_schema,
@@ -542,14 +542,14 @@ export class PostgreSQLClient extends BaseClient {
             datePrecision: field.datetime_precision,
             charLength: field.character_maximum_length,
             nullable: field.is_nullable.includes('YES'),
-            unsigned: null,
-            zerofill: null,
+            unsigned: null as null,
+            zerofill: null as null,
             order: field.ordinal_position,
             default: field.column_default,
             charset: field.character_set_name,
             collation: field.collation_name,
             autoIncrement: false,
-            onUpdate: null,
+            onUpdate: null as null,
             comment: field.column_comment
          };
       });
@@ -1252,9 +1252,9 @@ export class PostgreSQLClient extends BaseClient {
       return results.rows.map(async row => {
          if (!row.pg_get_functiondef) {
             return {
-               definer: null,
+               definer: null as null,
                sql: '',
-               parameters: [],
+               parameters: [] as null[],
                name: routine,
                comment: '',
                security: 'DEFINER',
@@ -1303,8 +1303,8 @@ export class PostgreSQLClient extends BaseClient {
             name: routine,
             comment: '',
             security: row.pg_get_functiondef.includes('SECURITY DEFINER') ? 'DEFINER' : 'INVOKER',
-            deterministic: null,
-            dataAccess: null,
+            deterministic: null as null,
+            dataAccess: null as null,
             language: row.pg_get_functiondef.match(/(?<=LANGUAGE )(.*)(?<=[\S+\n\r\s])/gm)[0]
          };
       })[0];
@@ -1368,9 +1368,9 @@ export class PostgreSQLClient extends BaseClient {
       return results.rows.map(async row => {
          if (!row.pg_get_functiondef) {
             return {
-               definer: null,
+               definer: null as null,
                sql: '',
-               parameters: [],
+               parameters: [] as null[],
                name: func,
                comment: '',
                security: 'DEFINER',
@@ -1418,8 +1418,8 @@ export class PostgreSQLClient extends BaseClient {
             name: func,
             comment: '',
             security: row.pg_get_functiondef.includes('SECURITY DEFINER') ? 'DEFINER' : 'INVOKER',
-            deterministic: null,
-            dataAccess: null,
+            deterministic: null as null,
+            dataAccess: null as null,
             language: row.pg_get_functiondef.match(/(?<=LANGUAGE )(.*)(?<=[\S+\n\r\s])/gm)[0],
             returns: row.pg_get_functiondef.match(/(?<=RETURNS )(.*)(?<=[\S+\n\r\s])/gm)[0].replace('SETOF ', '').toUpperCase()
          };
@@ -1665,9 +1665,7 @@ export class PostgreSQLClient extends BaseClient {
       const resultsArr: antares.QueryResult[] = [];
       let paramsArr = [];
       const queries = args.split
-         ? sql.split(/(?!\B'[^']*);(?![^']*'\B)/gm)
-            .filter(Boolean)
-            .map(q => q.trim())
+         ? this._querySplitter(sql, 'pg')
          : [sql];
 
       let connection: pg.Client | pg.PoolClient;

src/main/libs/clients/SQLiteClient.ts

@@ -124,10 +124,10 @@ export class SQLiteClient extends BaseClient {
                name: db.name,
                size: schemaSize,
                tables: remappedTables,
-               functions: [],
-               procedures: [],
+               functions: [] as null[],
+               procedures: [] as null[],
                triggers: remappedTriggers,
-               schedulers: []
+               schedulers: [] as null[]
             };
          }
          else {
@@ -166,22 +166,22 @@ export class SQLiteClient extends BaseClient {
 
          return {
             name: field.name,
-            key: null,
+            key: null as null,
             type: type.trim(),
             schema: schema,
             table: table,
             numLength: [...NUMBER, ...FLOAT].includes(type) ? length : null,
-            datePrecision: null,
+            datePrecision: null as null,
             charLength: ![...NUMBER, ...FLOAT].includes(type) ? length : null,
             nullable: !field.notnull,
-            unsigned: null,
-            zerofill: null,
+            unsigned: null as null,
+            zerofill: null as null,
             order: typeof field.cid === 'string' ? +field.cid + 1 : field.cid + 1,
             default: field.dflt_value,
-            charset: null,
-            collation: null,
+            charset: null as null,
+            collation: null as null,
             autoIncrement: false,
-            onUpdate: null,
+            onUpdate: null as null,
             comment: ''
          };
       });
@@ -267,7 +267,7 @@ export class SQLiteClient extends BaseClient {
             table: table,
             field: field.from,
             position: field.id + 1,
-            constraintPosition: null,
+            constraintPosition: null as null,
             constraintName: field.id,
             refSchema: schema,
             refTable: field.table,
@@ -629,9 +629,7 @@ export class SQLiteClient extends BaseClient {
       const resultsArr = [];
       let paramsArr = [];
       const queries = args.split
-         ? sql.split(/((?:[^;'"]*(?:"(?:\\.|[^"])*"|'(?:\\.|[^'])*')[^;'"]*)+)|;/gm)
-            .filter(Boolean)
-            .map(q => q.trim())
+         ? this._querySplitter(sql, 'sqlite')
          : [sql];
 
       let connection: sqlite.Database;

src/main/libs/misc/ipcLogger.ts

@@ -0,0 +1,20 @@
+export type LoggerLevel = 'query' | 'error'
+
+export const ipcLogger = ({ content, cUid, level }: {content: string; cUid: string; level: LoggerLevel}) => {
+   if (level === 'error') {
+      if (process.type !== undefined) {
+         const mainWindow = require('electron').webContents.fromId(1);
+         mainWindow.send('non-blocking-exception', { cUid, message: content, date: new Date() });
+      }
+      if (process.env.NODE_ENV === 'development' && process.type === 'browser') console.log(content);
+   }
+   else if (level === 'query') {
+      // Remove comments, newlines and multiple spaces
+      const escapedSql = content.replace(/(\/\*(.|[\r\n])*?\*\/)|(--(.*|[\r\n]))/gm, '').replace(/\s\s+/g, ' ');
+      if (process.type !== undefined) {
+         const mainWindow = require('electron').webContents.fromId(1);
+         mainWindow.send('query-log', { cUid, sql: escapedSql, date: new Date() });
+      }
+      if (process.env.NODE_ENV === 'development' && process.type === 'browser') console.log(escapedSql);
+   }
+};

src/main/main.ts

@@ -43,7 +43,8 @@ async function createMainWindow () {
          spellcheck: false
       },
       autoHideMenuBar: true,
-      titleBarStyle: isLinux ? 'default' :'hidden',
+      frame: !isLinux,
+      titleBarStyle: 'hidden',
       titleBarOverlay: isWindows
          ? {
             color: appTheme === 'dark' ? '#3f3f3f' : '#fff',
@@ -127,8 +128,8 @@ app.on('ready', async () => {
    if (isWindows)
       mainWindow.show();
 
-   if (isDevelopment && !isWindows)// Because on Windows you can open devtools from title-bar
-      mainWindow.webContents.openDevTools();
+   // if (isDevelopment && !isWindows)
+   //    mainWindow.webContents.openDevTools();
 
    process.on('uncaughtException', error => {
       mainWindow.webContents.send('unhandled-exception', error);

src/renderer/components/FakerSelect.vue

@@ -127,7 +127,7 @@ const fakerGroups = computed(() => {
       localType.value = 'datetime';
    else if (TIME.includes(props.type))
       localType.value = 'time';
-   else if (UUID.includes(props.type))
+   else if (UUID.includes(props.type) || (BLOB.includes(props.type) && props.field.key === 'pri'))
       localType.value = 'uuid';
    else
       localType.value = 'none';
@@ -177,7 +177,7 @@ const inputProps = () => {
       return { type: 'text', mask: datetimeMask };
    }
 
-   if (BLOB.includes(props.type))
+   if (BLOB.includes(props.type) && props.field.key !== 'pri')
       return { type: 'file', mask: false };
 
    if (BIT.includes(props.type))

src/renderer/components/ScratchpadNote.vue

@@ -47,65 +47,50 @@
             <div class="tile-history-buttons">
                <button
                   v-if="note.type === 'todo' && !note.isArchived"
-                  class="btn btn-link pl-1"
+                  class="btn btn-dark tooltip tooltip-left"
+                  :data-tooltip="t('general.archive')"
                   @click.stop="$emit('archive-note', note.uid)"
                >
-                  <BaseIcon
-                     icon-name="mdiCheck"
-                     class="pr-1"
-                     :size="22"
-                  /> {{ t('general.archive') }}
+                  <BaseIcon icon-name="mdiCheck" :size="22" />
                </button>
                <button
                   v-if="note.type === 'todo' && note.isArchived"
-                  class="btn btn-link pl-1"
+                  class="btn btn-dark tooltip tooltip-left"
+                  :data-tooltip="t('general.undo')"
                   @click.stop="$emit('restore-note', note.uid)"
                >
-                  <BaseIcon
-                     icon-name="mdiRestore"
-                     class="pr-1"
-                     :size="22"
-                  /> {{ t('general.undo') }}
+                  <BaseIcon icon-name="mdiRestore" :size="22" />
                </button>
                <button
                   v-if="note.type === 'query'"
-                  class="btn btn-link pl-1"
+                  class="btn btn-dark tooltip tooltip-left"
+                  :data-tooltip="t('general.select')"
                   @click.stop="$emit('select-query', note.note)"
                >
-                  <BaseIcon
-                     icon-name="mdiOpenInApp"
-                     class="pr-1"
-                     :size="22"
-                  /> {{ t('general.select') }}
+                  <BaseIcon icon-name="mdiOpenInApp" :size="22" />
                </button>
                <button
                   v-if="note.type === 'query'"
-                  class="btn btn-link pl-1"
+                  class="btn btn-dark tooltip tooltip-left"
+                  :data-tooltip="t('general.copy')"
                   @click.stop="copyText(note.note)"
                >
-                  <BaseIcon
-                     icon-name="mdiContentCopy"
-                     class="pr-1"
-                     :size="22"
-                  /> {{ t('general.copy') }}
+                  <BaseIcon icon-name="mdiContentCopy" :size="18" />
                </button>
                <button
                   v-if=" !note.isArchived"
-                  class="btn btn-link pl-1"
+                  class="btn btn-dark tooltip tooltip-left"
+                  :data-tooltip="t('general.edit')"
                   @click.stop="$emit('edit-note')"
                >
-                  <BaseIcon
-                     icon-name="mdiPencil"
-                     class="pr-1"
-                     :size="22"
-                  /> {{ t('general.edit') }}
+                  <BaseIcon icon-name="mdiPencil" :size="22" />
                </button>
-               <button class="btn btn-link pl-1" @click.stop="$emit('delete-note', note.uid)">
-                  <BaseIcon
-                     icon-name="mdiDeleteForever"
-                     class="pr-1"
-                     :size="22"
-                  /> {{ t('general.delete') }}
+               <button
+                  class="btn btn-dark tooltip tooltip-left"
+                  :data-tooltip="t('general.delete')"
+                  @click.stop="$emit('delete-note', note.uid)"
+               >
+                  <BaseIcon icon-name="mdiDeleteForever" :size="22" />
                </button>
             </div>
          </div>
@@ -278,11 +263,14 @@ const highlightWord = (string: string) => {
 
           button {
              font-size: 0.7rem;
-             height: 1rem;
              line-height: 1rem;
              display: inline-flex;
              align-items: center;
              justify-content: center;
+             margin: 0 5px;
+             padding: 0;
+             height: 24px;
+             width: 24px;
           }
        }
      }

src/renderer/components/TheTitleBar.vue

@@ -1,6 +1,5 @@
 <template>
    <div
-      v-if="!isLinux"
       id="titlebar"
       @dblclick="toggleFullScreen"
    >
@@ -21,16 +20,27 @@
             class="titlebar-element"
             @click="openDevTools"
          >
-            <BaseIcon icon-name="mdiBugPlayOutline" :size="24" />
+            <BaseIcon icon-name="mdiBugPlayOutline" :size="18" />
          </div>
          <div
             v-if="isDevelopment"
             class="titlebar-element"
             @click="reload"
          >
-            <BaseIcon icon-name="mdiRefresh" :size="24" />
+            <BaseIcon icon-name="mdiRefresh" :size="18" />
          </div>
          <div v-if="isWindows" :style="'width: 140px;'" />
+         <div v-if="isLinux" class="d-flex">
+            <div class="titlebar-element" @click="minimize">
+               <BaseIcon icon-name="mdiWindowMinimize" :size="18" />
+            </div>
+            <div class="titlebar-element" @click="toggleFullScreen">
+               <BaseIcon :icon-name="isMaximized ? 'mdiWindowRestore' : 'mdiWindowMaximize'" :size="18" />
+            </div>
+            <div class="titlebar-element" @click="closeApp">
+               <BaseIcon icon-name="mdiClose" :size="18" />
+            </div>
+         </div>
       </div>
    </div>
 </template>
@@ -74,6 +84,18 @@ const windowTitle = computed(() => {
    return [connectionName, ...breadcrumbs].join(' • ');
 });
 
+const openDevTools = () => {
+   w.value.webContents.openDevTools();
+};
+
+const reload = () => {
+   w.value.reload();
+};
+
+const minimize = () => {
+   w.value.minimize();
+};
+
 const toggleFullScreen = () => {
    if (isMaximized.value)
       w.value.unmaximize();
@@ -81,12 +103,8 @@ const toggleFullScreen = () => {
       w.value.maximize();
 };
 
-const openDevTools = () => {
-   w.value.webContents.openDevTools();
-};
-
-const reload = () => {
-   w.value.reload();
+const closeApp = () => {
+   ipcRenderer.send('close-app');
 };
 
 const onResize = () => {

src/renderer/components/WorkspaceTabPropsTable.vue

@@ -458,6 +458,8 @@ const getFieldsData = async () => {
       addNotification({ status: 'error', message: err.stack });
    }
 
+   isLoading.value = false;
+
    if (workspace.value.customizations.tableCheck) {
       try { // Table checks
          const { status, response } = await Tables.getTableChecks(params);
@@ -478,8 +480,6 @@ const getFieldsData = async () => {
          addNotification({ status: 'error', message: err.stack });
       }
    }
-
-   isLoading.value = false;
 };
 
 const saveChanges = async () => {

src/renderer/components/WorkspaceTabQueryTable.vue

@@ -538,7 +538,7 @@ const closeContext = () => {
 };
 
 const showDeleteConfirmModal = (e: any) => {
-   if (e.code !== 'Delete') return;
+   if (e && e.code !== 'Delete') return;
    if (e && e.path && ['INPUT', 'TEXTAREA', 'SELECT'].includes(e.path[0].tagName))
       return;
    if (selectedRows.value.length === 0) return;
@@ -563,6 +563,7 @@ const deleteSelected = () => {
       table: getTable(resultsetIndex.value),
       rows
    };
+   console.log(params);
    emit('delete-selected', params);
 };
 

src/renderer/components/WorkspaceTabQueryTableRow.vue

@@ -440,7 +440,7 @@ const editON = async (field: string) => {
       return;
    }
 
-   if (BLOB.includes(type)) {
+   if (BLOB.includes(type) && props.fields[field].key !== 'pri') {
       isBlobEditor.value = true;
       editingContent.value = content || '';
       fileToUpload.value = null;
@@ -458,9 +458,12 @@ const editON = async (field: string) => {
             };
          }
       }
+
       emit('start-editing', field);
       return;
    }
+   else if (BLOB.includes(type) && props.fields[field].key === 'pri')// Disable edit on BLOB primary until we are sure it's not problematic
+      return;
 
    // Inline editable fields
    editingContent.value = originalContent.value;

src/renderer/composables/useResultTables.ts

@@ -56,10 +56,10 @@ export function useResultTables (uid: string, reloadTable: () => void) {
          if (status === 'success')
             reloadTable();
          else
-            this.addNotification({ status: 'error', message: response });
+            addNotification({ status: 'error', message: response });
       }
       catch (err) {
-         this.addNotification({ status: 'error', message: err.stack });
+         addNotification({ status: 'error', message: err.stack });
          isQuering.value = false;
       }
    }

src/renderer/scss/_variables.scss

@@ -29,13 +29,7 @@ $explorebar-width: 14rem;
 $footer-height: 1.5rem;
 
 @function get-excluding-size() {
-  @if $platform == linux {
-    @return $footer-height;
-  }
-
-  @else {
-    @return $footer-height + $titlebar-height;
-  }
+  @return $footer-height + $titlebar-height;
 }
 
 /* stylelint-disable-next-line function-no-unknown */

src/renderer/scss/main.scss

@@ -20,6 +20,7 @@
 
 body {
   user-select: none;
+  background-color: #000;
 }
 
 a {

src/renderer/untyped.d.ts

@@ -3,6 +3,7 @@
 declare module '@/App.vue';
 declare module 'v-mask';
 declare module 'json2php';
+declare module '*/encoding_charset.js';
 declare module 'vuedraggable' {// <- to export as default
   const draggableComponent: import('vue').DefineComponent<{
     list: {

webpack.main.config.js

@@ -1,8 +1,7 @@
 const path = require('path');
-const webpack = require('webpack');
 const ProgressPlugin = require('progress-webpack-plugin');
 
-const { dependencies, devDependencies, version } = require('./package.json');
+const { dependencies, devDependencies } = require('./package.json');
 
 const externals = Object.keys(dependencies).concat(Object.keys(devDependencies));
 const isDevMode = process.env.NODE_ENV === 'development';
@@ -48,13 +47,7 @@ module.exports = { // Main
       }
    },
    plugins: [
-      new ProgressPlugin(true),
-      new webpack.DefinePlugin({
-         'process.env': {
-            PACKAGE_VERSION: `"${version}"`,
-            DISTRIBUTION: `"${process.env.DISTRIBUTION || 'none'}"`
-         }
-      })
+      new ProgressPlugin(true)
    ],
    module: {
       rules: [