chore(release): 0.7.19-beta.2

CHANGELOG.md

@@ -2,6 +2,40 @@
 
 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.19-beta.2](https://github.com/antares-sql/antares/compare/v0.7.19-beta.1...v0.7.19-beta.2) (2023-10-29)
+
+
+### Bug Fixes
+
+* ssh tunnel keep-alive not working properly ([debc1da](https://github.com/antares-sql/antares/commit/debc1da289d5e35d59adf69d094b329cf93af536))
+
+### [0.7.19-beta.1](https://github.com/antares-sql/antares/compare/v0.7.19-beta.0...v0.7.19-beta.1) (2023-10-25)
+
+
+### Features
+
+* **MySQL:** RLIKE and NOT RLIKE regular expression filters, closes [#688](https://github.com/antares-sql/antares/issues/688) ([e4eb27d](https://github.com/antares-sql/antares/commit/e4eb27d503e8f912178359c01c62a9b523d17848))
+
+### [0.7.19-beta.0](https://github.com/antares-sql/antares/compare/v0.7.18...v0.7.19-beta.0) (2023-10-14)
+
+
+### Features
+
+* "now" and "random" options added in datetime related data in insert rows tool, closes [#402](https://github.com/antares-sql/antares/issues/402) ([9f9c63b](https://github.com/antares-sql/antares/commit/9f9c63bfcc3423bfeef143cd835f48c62900a799))
+
+
+### Bug Fixes
+
+* IN and NOT IN filters not working properly, fixes [#687](https://github.com/antares-sql/antares/issues/687) ([c0dcf30](https://github.com/antares-sql/antares/commit/c0dcf30e73a69b25b01ba31d21b27c1983ed2db6))
+* timeout issue on long time sql import ([ddd290c](https://github.com/antares-sql/antares/commit/ddd290c90344241eaa70cb528552e942fd7edec0))
+
+### [0.7.18](https://github.com/antares-sql/antares/compare/v0.7.17...v0.7.18) (2023-10-03)
+
+
+### Bug Fixes
+
+* hotfix for Microsoft Store unauthorized process ([b3b698b](https://github.com/antares-sql/antares/commit/b3b698b3a23a3c848921ab40fc0fec5d8178ef0e))
+
 ### [0.7.17](https://github.com/antares-sql/antares/compare/v0.7.17-beta.2...v0.7.17) (2023-09-30)
 
 ### [0.7.17-beta.2](https://github.com/antares-sql/antares/compare/v0.7.17-beta.1...v0.7.17-beta.2) (2023-09-28)

CODE_OF_CONDUCT.md

@@ -61,7 +61,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-fabio286@gmail.com.
+info@fabiodistasio.it.
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the

package.json

@@ -1,7 +1,7 @@
 {
   "name": "antares",
   "productName": "Antares",
-  "version": "0.7.17",
+  "version": "0.7.19-beta.2",
   "description": "A modern, fast and productivity driven SQL client with a focus in UX.",
   "license": "MIT",
   "repository": "https://github.com/antares-sql/antares.git",
@@ -27,7 +27,7 @@
     "contributors:add": "all-contributors add",
     "contributors:generate": "all-contributors generate"
   },
-  "author": "Fabio Di Stasio <fabio286@gmail.com>",
+  "author": "Fabio Di Stasio <info@fabiodistasio.it>",
   "main": "./dist/main.js",
   "antares": {
     "devtoolsId": "nhdogjmejiglipccpnnnanhbledajbpd"
@@ -146,7 +146,7 @@
     "source-map-support": "~0.5.20",
     "spectre.css": "~0.5.9",
     "sql-formatter": "~13.0.0",
-    "ssh2-promise": "~1.0.2",
+    "@fabio286/ssh2-promise": "~1.0.4-b",
     "v-mask": "~2.3.0",
     "vue": "~3.3.4",
     "vue-i18n": "~9.2.2",
@@ -171,7 +171,7 @@
     "chalk": "~4.1.2",
     "cross-env": "~7.0.2",
     "css-loader": "~6.5.0",
-    "electron": "~22.3.23",
+    "electron": "~22.3.27",
     "electron-builder": "~22.10.3",
     "eslint": "~7.32.0",
     "eslint-config-standard": "~16.0.3",
@@ -193,10 +193,10 @@
     "sass-loader": "~12.3.0",
     "standard-version": "~9.3.1",
     "style-loader": "~3.3.1",
-    "stylelint": "~14.9.1",
+    "stylelint": "^15.11.0",
-    "stylelint-config-recommended-vue": "~1.4.0",
+    "stylelint-config-recommended-vue": "~1.5.0",
-    "stylelint-config-standard": "~26.0.0",
+    "stylelint-config-standard": "~34.0.0",
-    "stylelint-scss": "~4.3.0",
+    "stylelint-scss": "~5.3.0",
     "tree-kill": "~1.2.2",
     "ts-loader": "~9.2.8",
     "ts-node": "~10.9.1",
@@ -208,10 +208,5 @@
     "webpack-cli": "~4.9.1",
     "webpack-dev-server": "~4.11.1",
     "xvfb-maybe": "~0.2.1"
-  },
-  "overrides": {
-    "ssh2-promise": {
-      "ssh2": "github:Fabio286/ssh2"
-    }
   }
 }

src/common/FakerMethods.ts

@@ -51,6 +51,7 @@ export default class {
          { name: 'collation', group: 'database', types: ['string'] },
          { name: 'engine', group: 'database', types: ['string'] },
 
+         { name: 'now', group: 'date', types: ['string', 'datetime'] },
          { name: 'past', group: 'date', types: ['string', 'datetime'] },
          { name: 'future', group: 'date', types: ['string', 'datetime'] },
          // { name: 'between', group: 'date', types: ['string'] },
@@ -161,7 +162,9 @@ export default class {
          { name: 'filePath', group: 'system', types: ['string'] },
          { name: 'semver', group: 'system', types: ['string'] },
 
+         { name: 'now', group: 'time', types: ['string', 'time'] },
          { name: 'recent', group: 'time', types: ['string', 'time'] },
+         { name: 'random', group: 'time', types: ['string', 'time'] },
 
          { name: 'vehicle', group: 'vehicle', types: ['string'] },
          { name: 'manufacturer', group: 'vehicle', types: ['string'] },

src/common/customizations/defaults.ts

@@ -9,6 +9,7 @@ export const defaults: Customizations = {
    dataTypes: [],
    indexTypes: [],
    foreignActions: [],
+   operators: ['=', '!=', '>', '<', '>=', '<=', 'IN', 'NOT IN', 'LIKE', 'NOT LIKE', 'BETWEEN', 'IS NULL', 'IS NOT NULL'],
    // Core
    database: false,
    collations: false,

src/common/customizations/mysql.ts

@@ -9,6 +9,7 @@ export const customizations: Customizations = {
    defaultUser: 'root',
    defaultDatabase: null,
    dataTypes: mysqlTypes,
+   operators: ['=', '!=', '>', '<', '>=', '<=', 'IN', 'NOT IN', 'LIKE', 'NOT LIKE', 'RLIKE', 'NOT RLIKE', 'BETWEEN', 'IS NULL', 'IS NOT NULL'],
    indexTypes: [
       'PRIMARY',
       'INDEX',

src/common/interfaces/antares.ts

@@ -1,3 +1,4 @@
+import SSHConfig from '@fabio286/ssh2-promise/lib/sshConfig';
 import * as mysql from 'mysql2/promise';
 import * as pg from 'pg';
 import { FirebirdSQLClient } from 'src/main/libs/clients/FirebirdSQLClient';
@@ -5,7 +6,6 @@ import MysqlExporter from 'src/main/libs/exporters/sql/MysqlExporter';
 import PostgreSQLExporter from 'src/main/libs/exporters/sql/PostgreSQLExporter';
 import MySQLImporter from 'src/main/libs/importers/sql/MySQLlImporter';
 import PostgreSQLImporter from 'src/main/libs/importers/sql/PostgreSQLImporter';
-import SSHConfig from 'ssh2-promise/lib/sshConfig';
 
 import { MySQLClient } from '../../main/libs/clients/MySQLClient';
 import { PostgreSQLClient } from '../../main/libs/clients/PostgreSQLClient';
@@ -363,8 +363,7 @@ export interface QueryBuilderObject {
    offset: number;
    join: string[];
    update: string[];
-   // eslint-disable-next-line @typescript-eslint/no-explicit-any
+   insert: {[key: string]: string | boolean | number }[];
-   insert: {[key: string]: any}[];
    delete: boolean;
 }
 

src/common/interfaces/customizations.ts

@@ -1,4 +1,5 @@
 import { TypesGroup } from './antares';
+import { TableFilterOperator } from './tableApis';
 
 export interface Customizations {
    // Defaults
@@ -8,6 +9,7 @@ export interface Customizations {
    dataTypes?: TypesGroup[];
    indexTypes?: string[];
    foreignActions?: string[];
+   operators?: TableFilterOperator[];
    // Core
    database?: boolean;
    collations?: boolean;

src/common/interfaces/tableApis.ts

@@ -21,7 +21,7 @@ export interface TableDeleteParams {
    rows: {[key: string]: any};
 }
 
-export type TableFilterOperator = '=' | '!=' | '>' | '<' | '>=' | '<=' | 'IN' | 'NOT IN' | 'LIKE' | 'NOT LIKE' | 'BETWEEN' | 'IS NULL' | 'IS NOT NULL'
+export type TableFilterOperator = '=' | '!=' | '>' | '<' | '>=' | '<=' | 'IN' | 'NOT IN' | 'LIKE' | 'NOT LIKE' | 'RLIKE' | 'NOT RLIKE' | 'BETWEEN' | 'IS NULL' | 'IS NOT NULL'
 
 export interface TableFilterClausole {
    active: boolean;

src/common/libs/fakerCustom.ts

@@ -0,0 +1,17 @@
+import { faker } from '@faker-js/faker';
+import * as moment from 'moment';
+
+export const fakerCustom = {
+   seed: faker.seed,
+   setLocale: faker.setLocale,
+   ...faker,
+   date: {
+      now: () => moment().format('YYYY-MM-DD HH:mm:ss'),
+      ...faker.date
+   },
+   time: {
+      now: () => moment().format('HH:mm:ss'),
+      random: () => moment(faker.date.recent()).format('HH:mm:ss'),
+      ...faker.time
+   }
+};

src/main/ipc-handlers/connection.ts

@@ -55,7 +55,7 @@ export default (connections: {[key: string]: antares.Client}) => {
             port: conn.sshPort ? conn.sshPort : 22,
             privateKey: conn.sshKey ? fs.readFileSync(conn.sshKey).toString() : null,
             passphrase: conn.sshPassphrase,
-            keepaliveInterval: conn.sshKeepAliveInterval ?? conn.sshKeepAliveInterval*1000
+            keepaliveInterval: conn.sshKeepAliveInterval ? conn.sshKeepAliveInterval*1000 : null
          };
       }
 
@@ -137,7 +137,7 @@ export default (connections: {[key: string]: antares.Client}) => {
             port: conn.sshPort ? conn.sshPort : 22,
             privateKey: conn.sshKey ? fs.readFileSync(conn.sshKey).toString() : null,
             passphrase: conn.sshPassphrase,
-            keepaliveInterval: conn.sshKeepAliveInterval ?? conn.sshKeepAliveInterval*1000
+            keepaliveInterval: conn.sshKeepAliveInterval ? conn.sshKeepAliveInterval*1000 : null
          };
       }
 

src/main/ipc-handlers/tables.ts

@@ -1,8 +1,8 @@
-import { faker } from '@faker-js/faker';
 import customizations from 'common/customizations';
 import { ARRAY, BIT, BLOB, BOOLEAN, DATE, DATETIME, FLOAT, LONG_TEXT, NUMBER, TEXT, TEXT_SEARCH } from 'common/fieldTypes';
 import * as antares from 'common/interfaces/antares';
 import { InsertRowsParams } from 'common/interfaces/tableApis';
+import { fakerCustom } from 'common/libs/fakerCustom';
 import { sqlEscaper } from 'common/libs/sqlUtils';
 import { ipcMain } from 'electron';
 import * as fs from 'fs';
@@ -371,19 +371,19 @@ export default (connections: {[key: string]: antares.Client}) => {
                   let fakeValue;
 
                   if (params.locale)
-                     faker.locale = params.locale;
+                     fakerCustom.locale = params.locale;
 
                   if (Object.keys(params.row[key].params).length) {
                      Object.keys(params.row[key].params).forEach(param => {
-                        if (!isNaN(params.row[key].params[param]))
+                        if (!isNaN(params.row[key].params[param]))// Converts string numerics params to number
-                           parsedParams[param] = +params.row[key].params[param];
+                           parsedParams[param] = Number(params.row[key].params[param]);
                      });
                      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                     fakeValue = (faker as any)[params.row[key].group][params.row[key].method](parsedParams);
+                     fakeValue = (fakerCustom as any)[params.row[key].group][params.row[key].method](parsedParams);
                   }
                   else
                      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                     fakeValue = (faker as any)[params.row[key].group][params.row[key].method]();
+                     fakeValue = (fakerCustom as any)[params.row[key].group][params.row[key].method]();
 
                   if (typeof fakeValue === 'string') {
                      if (params.row[key].length)

src/main/libs/clients/BaseClient.ts

@@ -1,7 +1,7 @@
 import * as antares from 'common/interfaces/antares';
 import mysql from 'mysql2/promise';
 import * as pg from 'pg';
-import SSH2Promise from 'ssh2-promise';
+import SSH2Promise = require('@fabio286/ssh2-promise');
 
 const queryLogger = ({ sql, cUid }: {sql: string; cUid: string}) => {
    // Remove comments, newlines and multiple spaces
@@ -16,7 +16,7 @@ const queryLogger = ({ sql, cUid }: {sql: string; cUid: string}) => {
 /**
  * As Simple As Possible Query Builder Core
  */
-export abstract class AntaresCore {
+export abstract class BaseClient {
    _client: antares.ClientCode;
    protected _cUid: string
    protected _params: mysql.ConnectionOptions | pg.ClientConfig | { databasePath: string; readonly: boolean};

src/main/libs/clients/FirebirdSQLClient.ts

@@ -4,9 +4,9 @@ import * as antares from 'common/interfaces/antares';
 import * as firebird from 'node-firebird';
 import * as path from 'path';
 
-import { AntaresCore } from '../AntaresCore';
+import { BaseClient } from './BaseClient';
 
-export class FirebirdSQLClient extends AntaresCore {
+export class FirebirdSQLClient extends BaseClient {
    private _schema?: string;
    private _runningConnections: Map<string, number>;
    private _connectionsToCommit: Map<string, firebird.Transaction>;

src/main/libs/clients/MySQLClient.ts

@@ -1,12 +1,12 @@
+import SSH2Promise = require('@fabio286/ssh2-promise');
+import SSHConfig from '@fabio286/ssh2-promise/lib/sshConfig';
 import dataTypes from 'common/data-types/mysql';
 import * as antares from 'common/interfaces/antares';
 import * as mysql from 'mysql2/promise';
 
-import { AntaresCore } from '../AntaresCore';
+import { BaseClient } from './BaseClient';
-import SSH2Promise = require('ssh2-promise');
-import SSHConfig from 'ssh2-promise/lib/sshConfig';
 
-export class MySQLClient extends AntaresCore {
+export class MySQLClient extends BaseClient {
    private _schema?: string;
    private _runningConnections: Map<string, number>;
    private _connectionsToCommit: Map<string, mysql.Connection | mysql.PoolConnection>;
@@ -168,7 +168,10 @@ export class MySQLClient extends AntaresCore {
             dbConfig.port = tunnel.localPort;
          }
          catch (err) {
-            if (this._ssh) this._ssh.close();
+            if (this._ssh) {
+               this._ssh.close();
+               this._ssh.closeTunnel();
+            }
             throw err;
          }
       }
@@ -187,7 +190,10 @@ export class MySQLClient extends AntaresCore {
       this._connection.end();
       clearInterval(this._keepaliveTimer);
       this._keepaliveTimer = undefined;
-      if (this._ssh) this._ssh.close();
+      if (this._ssh) {
+         this._ssh.close();
+         this._ssh.closeTunnel();
+      }
    }
 
    async getConnection () {
@@ -256,9 +262,12 @@ export class MySQLClient extends AntaresCore {
    }
 
    private async keepAlive () {
-      const connection = await (this._connection as mysql.Pool).getConnection();
+      try {
-      await connection.ping();
+         const connection = await (this._connection as mysql.Pool).getConnection();
-      connection.release();
+         await connection.ping();
+         connection.release();
+      }
+      catch (_) {}
    }
 
    use (schema: string) {

src/main/libs/clients/PostgreSQLClient.ts

@@ -1,13 +1,13 @@
+import SSH2Promise = require('@fabio286/ssh2-promise');
+import SSHConfig from '@fabio286/ssh2-promise/lib/sshConfig';
 import dataTypes from 'common/data-types/postgresql';
 import * as antares from 'common/interfaces/antares';
 import * as pg from 'pg';
 import * as pgAst from 'pgsql-ast-parser';
-
-import { AntaresCore } from '../AntaresCore';
-import SSH2Promise = require('ssh2-promise');
-import SSHConfig from 'ssh2-promise/lib/sshConfig';
 import { ConnectionOptions } from 'tls';
 
+import { BaseClient } from './BaseClient';
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function pgToString (value: any) {
    return value.toString();
@@ -81,7 +81,7 @@ type builtinsTypes =
    'JSONB' |
    'REGNAMESPACE' |
    'REGROLE';
-export class PostgreSQLClient extends AntaresCore {
+export class PostgreSQLClient extends BaseClient {
    private _schema?: string;
    private _runningConnections: Map<string, number>;
    private _connectionsToCommit: Map<string, pg.Client | pg.PoolClient>;
@@ -180,7 +180,10 @@ export class PostgreSQLClient extends AntaresCore {
             dbConfig.port = tunnel.localPort;
          }
          catch (err) {
-            if (this._ssh) this._ssh.close();
+            if (this._ssh) {
+               this._ssh.close();
+               this._ssh.closeTunnel();
+            }
             throw err;
          }
       }
@@ -236,13 +239,19 @@ export class PostgreSQLClient extends AntaresCore {
       this._connection.end();
       clearInterval(this._keepaliveTimer);
       this._keepaliveTimer = undefined;
-      if (this._ssh) this._ssh.close();
+      if (this._ssh) {
+         this._ssh.close();
+         this._ssh.closeTunnel();
+      }
    }
 
    private async keepAlive () {
-      const connection = await this._connection.connect() as pg.PoolClient;
+      try {
-      await connection.query('SELECT 1+1');
+         const connection = await this._connection.connect() as pg.PoolClient;
-      connection.release();
+         await connection.query('SELECT 1+1');
+         connection.release();
+      }
+      catch (_) {}
    }
 
    use (schema: string, connection?: pg.Client | pg.PoolClient) {

src/main/libs/clients/SQLiteClient.ts

@@ -3,9 +3,9 @@ import dataTypes from 'common/data-types/sqlite';
 import { DATETIME, FLOAT, NUMBER, TIME } from 'common/fieldTypes';
 import * as antares from 'common/interfaces/antares';
 
-import { AntaresCore } from '../AntaresCore';
+import { BaseClient } from './BaseClient';
 
-export class SQLiteClient extends AntaresCore {
+export class SQLiteClient extends BaseClient {
    private _schema?: string;
    private _connectionsToCommit: Map<string, sqlite.Database>;
    protected _connection?: sqlite.Database;

src/main/libs/misc/validateSender.ts

@@ -6,6 +6,7 @@ const isWindows = process.platform === 'win32';
 const indexPath = path.resolve(__dirname, 'index.html').split(path.sep).join('/');
 
 export function validateSender (frame: WebFrameMain) {
+   if (process.windowsStore) return true; // TEMP HOTFIX
    const frameUrl = new URL(frame.url);
    const prefix = isWindows ? 'file:///' : 'file://';
    const framePath = frameUrl.href.replace(prefix, '');

src/main/workers/importer.ts

@@ -1,8 +1,8 @@
+import SSHConfig from '@fabio286/ssh2-promise/lib/sshConfig';
 import * as antares from 'common/interfaces/antares';
 import { ImportOptions } from 'common/interfaces/importer';
 import * as mysql from 'mysql2';
 import * as pg from 'pg';
-import SSHConfig from 'ssh2-promise/lib/sshConfig';
 
 import { MySQLClient } from '../libs/clients/MySQLClient';
 import { PostgreSQLClient } from '../libs/clients/PostgreSQLClient';

src/renderer/components/WorkspaceTabQuery.vue

@@ -27,11 +27,7 @@
                      :title="t('general.cancel')"
                      @click="killTabQuery()"
                   >
-                     <BaseIcon
+                     <BaseIcon icon-name="mdiWindowClose" :size="24" />
-                        class="mr-1"
-                        icon-name="mdiWindowCLose"
-                        :size="24"
-                     />
                      <span class="d-invisible pr-1">{{ t('general.run') }}</span>
                   </button>
                   <button

src/renderer/components/WorkspaceTabQueryTable.vue

@@ -3,7 +3,7 @@
       ref="tableWrapper"
       class="vscroll no-outline"
       tabindex="0"
-      :style="{'height': resultsSize+'px'}"
+      :style="{ 'height': resultsSize + 'px' }"
       @blur="deselectRows"
       @focus="hasFocus = true"
       @keyup.delete="showDeleteConfirmModal"
@@ -28,7 +28,7 @@
             v-for="(result, index) in resultsWithRows"
             :key="index"
             class="tab-item"
-            :class="{'active': resultsetIndex === index}"
+            :class="{ 'active': resultsetIndex === index }"
             @click="selectResultset(index)"
          >
             <a>{{ result.fields ? result.fields[0]?.table : '' }} ({{ result.rows.length }})</a>
@@ -57,7 +57,7 @@
                         <span>{{ field.alias || field.name }}</span>
                         <BaseIcon
                            v-if="isSortable && currentSort === field.name || currentSort === `${field.table}.${field.name}`"
-                           :icon-name="currentSortDir === 'asc' ? 'mdiSortAscending':'mdiSortDescending'"
+                           :icon-name="currentSortDir === 'asc' ? 'mdiSortAscending' : 'mdiSortDescending'"
                            :size="18"
                            class="sort-icon ml-1"
                         />
@@ -90,7 +90,7 @@
                   :fields="fieldsObj"
                   :key-usage="keyUsage"
                   :element-type="elementType"
-                  :class="{'selected': selectedRows.includes(row._antares_id)}"
+                  :class="{ 'selected': selectedRows.includes(row._antares_id) }"
                   :selected="selectedRows.includes(row._antares_id)"
                   :selected-cell="selectedRows.length === 1 && selectedRows.includes(row._antares_id) ? selectedField : null"
                   @start-editing="isEditingRow = true"
@@ -163,7 +163,7 @@
                   <BaseSelect
                      v-model="sqlExportOptions.sqlInsertDivider"
                      class="form-select"
-                     :options="[{value: 'bytes', label: 'KiB'}, {value: 'rows', label: t('database.row', 2)}]"
+                     :options="[{ value: 'bytes', label: 'KiB' }, { value: 'rows', label: t('database.row', 2) }]"
                   />
                </div>
             </div>
@@ -208,9 +208,9 @@
                         v-model="csvExportOptions.stringDelimiter"
                         class="form-select"
                         :options="[
-                           {value: '', label: t('general.none')},
+                           { value: '', label: t('general.none') },
-                           {value: 'single', label: t('general.singleQuote')},
+                           { value: 'single', label: t('general.singleQuote') },
-                           {value: 'double', label: t('general.doubleQuote')}
+                           { value: 'double', label: t('general.doubleQuote') }
                         ]"
                      />
                   </div>
@@ -235,7 +235,10 @@
                      </label>
                   </div>
                   <div class="column col-7">
-                     <label class="form-switch d-inline-block" @click.prevent="csvExportOptions.header = !csvExportOptions.header">
+                     <label
+                        class="form-switch d-inline-block"
+                        @click.prevent="csvExportOptions.header = !csvExportOptions.header"
+                     >
                         <input type="checkbox" :checked="csvExportOptions.header">
                         <i class="form-icon" />
                      </label>
@@ -249,10 +252,10 @@
 
 <script setup lang="ts">
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import faker from '@faker-js/faker';
 import { BLOB, DATE, DATETIME, LONG_TEXT, TEXT, TIME } from 'common/fieldTypes';
 import { QueryResult, TableField } from 'common/interfaces/antares';
 import { TableUpdateParams } from 'common/interfaces/tableApis';
+import { fakerCustom } from 'common/libs/fakerCustom';
 import { jsonToSqlInsert } from 'common/libs/sqlUtils';
 import { uidGen } from 'common/libs/uidGen';
 import * as json2php from 'json2php';
@@ -299,7 +302,7 @@ const emit = defineEmits([
    'duplicate-row'
 ]);
 
-const resultTable: Ref<Component & {updateWindow: () => void}> = ref(null);
+const resultTable: Ref<Component & { updateWindow: () => void }> = ref(null);
 const tableWrapper: Ref<HTMLDivElement> = ref(null);
 const table: Ref<HTMLDivElement> = ref(null);
 const resultsSize = ref(0);
@@ -377,7 +380,7 @@ const keyUsage = computed(() => resultsWithRows.value.length ? resultsWithRows.v
 
 const fieldsObj = computed(() => {
    if (sortedResults.value.length) {
-      const fieldsObj: {[key: string]: TableField} = {};
+      const fieldsObj: { [key: string]: TableField } = {};
       for (const key in sortedResults.value[0]) {
          if (key === '_antares_id') continue;
 
@@ -483,7 +486,7 @@ const resizeResults = () => {
 
 const refreshScroller = () => resizeResults();
 
-const updateField = (payload: { field: string; type: string; content: any }, row: {[key: string]: any}) => {
+const updateField = (payload: { field: string; type: string; content: any }, row: { [key: string]: any }) => {
    const orgRow: any = localResults.value.find((lr: any) => lr._antares_id === row._antares_id);
 
    Object.keys(orgRow).forEach(key => { // remap the row
@@ -598,7 +601,7 @@ const copyRow = (format: string) => {
          json: contentToCopy,
          client: workspaceClient.value,
          fields: fieldsObj.value as {
-            [key: string]: {type: string; datePrecision: number};
+            [key: string]: { type: string; datePrecision: number };
          },
          table: getTable(resultsetIndex.value)
       });
@@ -670,28 +673,18 @@ const fillCell = (event: { name: string; group: string; type: string }) => {
          datePrecision += i === 0 ? '.S' : 'S';
    }
 
-   if (event.group === 'custom') {
+   fakeValue = (fakerCustom as any)[event.group][event.name]();
-      if (event.type === 'time' && event.name === 'now')
+   if (['string', 'number'].includes(typeof fakeValue)) {
-         fakeValue = moment().format(`HH:mm:ss${datePrecision}`);
+      if (typeof fakeValue === 'number')
-      else if (event.type === 'time' && event.name === 'random')
+         fakeValue = String(fakeValue);
-         fakeValue = moment(faker.date.recent()).format(`HH:mm:ss${datePrecision}`);
-      else if (event.type === 'datetime' && event.name === 'now')
-         fakeValue = moment().format(`YYYY-MM-DD HH:mm:ss${datePrecision}`);
-   }
-   else {
-      fakeValue = (faker as any)[event.group][event.name]();
-      if (['string', 'number'].includes(typeof fakeValue)) {
-         if (typeof fakeValue === 'number')
-            fakeValue = String(fakeValue);
 
-         if (selectedCell.value.length)
+      if (selectedCell.value.length)
-            fakeValue = fakeValue.substring(0, selectedCell.value.length < 1024 ? Number(selectedCell.value.length) : 1024);
+         fakeValue = fakeValue.substring(0, selectedCell.value.length < 1024 ? Number(selectedCell.value.length) : 1024);
-      }
-      else if ([...DATE, ...DATETIME].includes(selectedCell.value.type))
-         fakeValue = moment(fakeValue).format(`YYYY-MM-DD HH:mm:ss${datePrecision}`);
-      else if (TIME.includes(selectedCell.value.type))
-         fakeValue = moment(fakeValue).format(`HH:mm:ss${datePrecision}`);
    }
+   else if ([...DATE, ...DATETIME].includes(selectedCell.value.type))
+      fakeValue = moment(fakeValue).format(`YYYY-MM-DD HH:mm:ss${datePrecision}`);
+   else if (TIME.includes(selectedCell.value.type))
+      fakeValue = moment(fakeValue).format(`HH:mm:ss${datePrecision}`);
 
    const params = {
       primary: primaryField.value?.name,
@@ -859,12 +852,12 @@ const downloadTable = (format: 'csv' | 'json' | 'sql' | 'php', table: string, po
       type: format,
       content: rows,
       fields: JSON.parse(JSON.stringify(fieldsObj.value)) as {
-         [key: string]: {type: string; datePrecision: number};
+         [key: string]: { type: string; datePrecision: number };
       },
       client: workspaceClient.value,
       table,
-      sqlOptions: popup ? { ...sqlExportOptions.value }: null,
+      sqlOptions: popup ? { ...sqlExportOptions.value } : null,
-      csvOptions: popup ? { ...csvExportOptions.value }: null
+      csvOptions: popup ? { ...csvExportOptions.value } : null
    });
 };
 
@@ -897,7 +890,7 @@ const onKey = async (e: KeyboardEvent) => {
    if (!(e.ctrlKey || e.metaKey) && (e.code.includes('Arrow') || e.code === 'Tab') && sortedResults.value.length > 0 && !e.altKey) {
       e.preventDefault();
 
-      const aviableFields= Object.keys(sortedResults.value[0]).slice(0, -1); // removes _antares_id
+      const aviableFields = Object.keys(sortedResults.value[0]).slice(0, -1); // removes _antares_id
 
       if (!selectedField.value)
          selectedField.value = aviableFields[0];
@@ -914,8 +907,8 @@ const onKey = async (e: KeyboardEvent) => {
                nextIndex = selectedIndex + 1;
                nextFieldIndex = selectedFieldIndex;
 
-               if (nextIndex > sortedResults.value.length -1)
+               if (nextIndex > sortedResults.value.length - 1)
-                  nextIndex = sortedResults.value.length -1;
+                  nextIndex = sortedResults.value.length - 1;
 
                break;
             case 'ArrowUp':
@@ -931,7 +924,7 @@ const onKey = async (e: KeyboardEvent) => {
                nextIndex = selectedIndex;
                nextFieldIndex = selectedFieldIndex + 1;
 
-               if (nextFieldIndex > aviableFields.length -1)
+               if (nextFieldIndex > aviableFields.length - 1)
                   nextFieldIndex = 0;
 
                break;
@@ -941,7 +934,7 @@ const onKey = async (e: KeyboardEvent) => {
                nextFieldIndex = selectedFieldIndex - 1;
 
                if (nextFieldIndex < 0)
-                  nextFieldIndex = aviableFields.length -1;
+                  nextFieldIndex = aviableFields.length - 1;
 
                break;
 
@@ -950,11 +943,11 @@ const onKey = async (e: KeyboardEvent) => {
                if (e.shiftKey) {
                   nextFieldIndex = selectedFieldIndex - 1;
                   if (nextFieldIndex < 0)
-                     nextFieldIndex = aviableFields.length -1;
+                     nextFieldIndex = aviableFields.length - 1;
                }
                else {
                   nextFieldIndex = selectedFieldIndex + 1;
-                  if (nextFieldIndex > aviableFields.length -1)
+                  if (nextFieldIndex > aviableFields.length - 1)
                      nextFieldIndex = 0;
                }
          }
@@ -1049,32 +1042,33 @@ onUnmounted(() => {
 
 <style lang="scss" scoped>
 .vscroll {
-  height: 1000px;
+   height: 1000px;
-  overflow: auto;
+   overflow: auto;
-  overflow-anchor: none;
+   overflow-anchor: none;
 }
 
 .column-resizable {
-  &:hover,
+
-  &:active {
+   &:hover,
-    resize: horizontal;
+   &:active {
-    overflow: hidden;
+      resize: horizontal;
-  }
+      overflow: hidden;
+   }
 }
 
 .table-column-title {
-  display: flex;
+   display: flex;
-  align-items: center;
+   align-items: center;
 }
 
 .sort-icon {
-  font-size: 0.7rem;
+   font-size: 0.7rem;
-  line-height: 1;
+   line-height: 1;
-  margin-left: 0.2rem;
+   margin-left: 0.2rem;
 }
 
 .result-tabs {
-  background: transparent !important;
+   background: transparent !important;
-  margin: 0;
+   margin: 0;
 }
 </style>

src/renderer/components/WorkspaceTabQueryTableContext.vue

@@ -197,13 +197,13 @@ const fakerMethods = {
       { name: 'amount', group: 'finance' }
    ],
    datetime: [
-      { name: 'now', group: 'custom' },
+      { name: 'now', group: 'date' },
       { name: 'past', group: 'date' },
       { name: 'future', group: 'date' }
    ],
    time: [
-      { name: 'now', group: 'custom' },
+      { name: 'now', group: 'time' },
-      { name: 'random', group: 'custom' }
+      { name: 'random', group: 'time' }
    ],
    uuid: [
       { name: 'uuid', group: 'random' }

src/renderer/components/WorkspaceTabTable.vue

@@ -183,6 +183,7 @@
       <WorkspaceTabTableFilters
          v-if="isSearch"
          :fields="fields"
+         :is-quering="isQuering"
          :conn-client="connection.client"
          @filter="updateFilters"
          @filter-change="onFilterChange"

src/renderer/components/WorkspaceTabTableFilters.vue

@@ -9,6 +9,7 @@
             <input
                v-model="row.active"
                type="checkbox"
+               :disabled="isQuering"
                @change="doFilter"
             ><i class="form-icon" />
          </label>
@@ -18,11 +19,13 @@
             :options="fields"
             option-track-by="name"
             option-label="name"
+            :disabled="isQuering"
          />
          <BaseSelect
             v-model="row.op"
             class="form-select ml-2 col-auto select-sm"
             :options="operators"
+            :disabled="isQuering"
          />
          <div class="workspace-table-filters-row-value ml-2">
             <input
@@ -30,12 +33,14 @@
                v-model="row.value"
                type="text"
                class="form-input input-sm"
+               :disabled="isQuering"
             >
             <input
                v-if="row.op === 'BETWEEN'"
                v-model="row.value2"
                type="text"
                class="form-input ml-2 input-sm"
+               :disabled="isQuering"
             >
          </div>
          <button
@@ -87,15 +92,14 @@ const { t } = useI18n();
 
 const props = defineProps({
    fields: Array as Prop<TableField[]>,
-   connClient: String as Prop<ClientCode>
+   connClient: String as Prop<ClientCode>,
+   isQuering: Boolean
 });
 
 const emit = defineEmits(['filter-change', 'filter']);
 
 const rows = ref([]);
-const operators = ref<TableFilterOperator[]>([
+const operators: TableFilterOperator[] = customizations[props.connClient].operators;
-   '=', '!=', '>', '<', '>=', '<=', 'IN', 'NOT IN', 'LIKE', 'NOT LIKE', 'BETWEEN', 'IS NULL', 'IS NOT NULL'
-]);
 
 const clientCustomizations = computed(() => customizations[props.connClient]);
 
@@ -122,7 +126,7 @@ const createClausole = (filter: TableFilterClausole) => {
    const { elementsWrapper: ew, stringsWrapper: sw } = clientCustomizations.value;
    let value;
 
-   if (isNumeric) {
+   if (isNumeric && !['IN', 'NOT IN', 'RLIKE', 'NOT RLIKE'].includes(filter.op)) {
       if (isNaN(Number(filter.value)))
          filter.value = '';
       if (isNaN(Number(filter.value2)))
@@ -145,7 +149,7 @@ const createClausole = (filter: TableFilterClausole) => {
             val = val.trim();
             return isNumeric ? val : `${sw}${val}${sw}`;
          }).join(',');
-         value = `(${filter.value})`;
+         value = `(${value})`;
          break;
       case 'IS NULL':
       case 'IS NOT NULL':

src/renderer/untyped.d.ts

@@ -4,109 +4,109 @@ declare module '@/App.vue';
 declare module 'v-mask';
 declare module 'json2php';
 declare module 'vuedraggable' {// <- to export as default
-   const draggableComponent: import('vue').DefineComponent<{
+  const draggableComponent: import('vue').DefineComponent<{
-      list: {
+    list: {
-          type: ArrayConstructor;
+      type: ArrayConstructor;
-          required: boolean;
+      required: boolean;
-          default: any;
+      default: any;
-      };
+    };
-      modelValue: {
+    modelValue: {
-          type: ArrayConstructor;
+      type: ArrayConstructor;
-          required: boolean;
+      required: boolean;
-          default: any;
+      default: any;
-      };
+    };
-      itemKey: {
+    itemKey: {
-          type: (FunctionConstructor | StringConstructor)[];
+      type: (FunctionConstructor | StringConstructor)[];
-          required: boolean;
+      required: boolean;
-      };
+    };
-      clone: {
+    clone: {
-          type: FunctionConstructor;
+      type: FunctionConstructor;
-          default: (original: any) => any;
+      default: (original: any) => any;
-      };
+    };
-      tag: {
+    tag: {
-          type: StringConstructor;
+      type: StringConstructor;
-          default: string;
+      default: string;
-      };
+    };
-      move: {
+    move: {
-          type: FunctionConstructor;
+      type: FunctionConstructor;
-          default: any;
+      default: any;
-      };
+    };
-      componentData: {
+    componentData: {
-          type: ObjectConstructor;
+      type: ObjectConstructor;
-          required: boolean;
+      required: boolean;
-          default: any;
+      default: any;
-      };
+    };
   }, unknown, {
-      error: boolean;
+    error: boolean;
   }, {
-      realList(): any;
+    realList(): any;
-      getKey(): any;
+    getKey(): any;
   }, {
-      getUnderlyingVm(domElement: any): any;
+    getUnderlyingVm(domElement: any): any;
-      getUnderlyingPotencialDraggableComponent(htmElement: any): any;
+    getUnderlyingPotencialDraggableComponent(htmElement: any): any;
-      emitChanges(evt: any): void;
+    emitChanges(evt: any): void;
-      alterList(onList: any): void;
+    alterList(onList: any): void;
-      spliceList(): void;
+    spliceList(): void;
-      updatePosition(oldIndex: any, newIndex: any): void;
+    updatePosition(oldIndex: any, newIndex: any): void;
-      getRelatedContextFromMoveEvent({ to, related }: {
+    getRelatedContextFromMoveEvent({ to, related }: {
-          to: any;
+      to: any;
-          related: any;
+      related: any;
-      }): any;
+    }): any;
-      getVmIndexFromDomIndex(domIndex: any): any;
+    getVmIndexFromDomIndex(domIndex: any): any;
-      onDragStart(evt: any): void;
+    onDragStart(evt: any): void;
-      onDragAdd(evt: any): void;
+    onDragAdd(evt: any): void;
-      onDragRemove(evt: any): void;
+    onDragRemove(evt: any): void;
-      onDragUpdate(evt: any): void;
+    onDragUpdate(evt: any): void;
-      computeFutureIndex(relatedContext: any, evt: any): any;
+    computeFutureIndex(relatedContext: any, evt: any): any;
-      onDragMove(evt: any, originalEvent: any): any;
+    onDragMove(evt: any, originalEvent: any): any;
-      onDragEnd(): void;
+    onDragEnd(): void;
   }, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, any[], any, import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, Readonly<{
-      move: Function;
+    move: Function;
-      tag: string;
+    tag: string;
-      clone: Function;
+    clone: Function;
-      list: unknown[];
+    list: unknown[];
-      modelValue: unknown[];
+    modelValue: unknown[];
-      componentData: Record<string, any>;
+    componentData: Record<string, any>;
   } & {
-      itemKey?: string | Function;
+    itemKey?: string | Function;
   }>, {
-      move: Function;
+    move: Function;
-      tag: string;
+    tag: string;
-      clone: Function;
+    clone: Function;
-      list: unknown[];
+    list: unknown[];
-      modelValue: unknown[];
+    modelValue: unknown[];
-      componentData: Record<string, any>;
+    componentData: Record<string, any>;
   }>;
-   export = draggableComponent;
+  export = draggableComponent;
 }
 
 declare const SvgIcon: import('vue').DefineComponent<{
-    type: {
+  type: {
-      type: StringConstructor;
+    type: StringConstructor;
-      default: string;
+    default: string;
-    };
+  };
-    path: {
+  path: {
-      type: StringConstructor;
+    type: StringConstructor;
-      default: string;
+    default: string;
-    };
+  };
-    size: {
+  size: {
-      type: NumberConstructor;
+    type: NumberConstructor;
-      optional: boolean;
+    optional: boolean;
-    };
+  };
-    viewbox: {
+  viewbox: {
-      type: StringConstructor;
+    type: StringConstructor;
-      optional: boolean;
+    optional: boolean;
-    };
+  };
-    flip: {
+  flip: {
-      type: StringConstructor;
+    type: StringConstructor;
-      optional: boolean;
+    optional: boolean;
-    };
+  };
-    rotate: {
+  rotate: {
-      type: NumberConstructor;
+    type: NumberConstructor;
-      optional: boolean;
+    optional: boolean;
-    };
+  };
-  }>;
+}>;
 
-  declare module '@jamescoyle/vue-icon' {
+declare module '@jamescoyle/vue-icon' {
-    export default SvgIcon;
+  export default SvgIcon;
-  }
+}