diff --git a/src/common/customizations/defaults.ts b/src/common/customizations/defaults.ts index 91709c87..729f7b81 100644 --- a/src/common/customizations/defaults.ts +++ b/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, diff --git a/src/common/customizations/mysql.ts b/src/common/customizations/mysql.ts index 7acca809..e3a8f614 100644 --- a/src/common/customizations/mysql.ts +++ b/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', diff --git a/src/common/interfaces/customizations.ts b/src/common/interfaces/customizations.ts index 469201fc..89ebd4de 100644 --- a/src/common/interfaces/customizations.ts +++ b/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; diff --git a/src/common/interfaces/tableApis.ts b/src/common/interfaces/tableApis.ts index c406770b..bbfbdabe 100644 --- a/src/common/interfaces/tableApis.ts +++ b/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; diff --git a/src/renderer/components/WorkspaceTabTable.vue b/src/renderer/components/WorkspaceTabTable.vue index 1ad060ed..ddb4ba4b 100644 --- a/src/renderer/components/WorkspaceTabTable.vue +++ b/src/renderer/components/WorkspaceTabTable.vue @@ -183,6 +183,7 @@ @@ -18,11 +19,13 @@ :options="fields" option-track-by="name" option-label="name" + :disabled="isQuering" />