mirror of
https://github.com/Fabio286/antares.git
synced 2025-06-05 21:59:22 +02:00
Compare commits
25 Commits
Author | SHA1 | Date | |
---|---|---|---|
4d1a81033d | |||
5887eea2ed | |||
6c69583c90 | |||
|
03461522b7 | ||
|
11807e3bb6 | ||
a54b8d719c | |||
d1f68da495 | |||
d666281daa | |||
481ae842dd | |||
|
acf5d459e2 | ||
2ee9cfcf0b | |||
f0d312fb59 | |||
c97ade949c | |||
38af648440 | |||
ccbcffc7f0 | |||
dfa7cf9905 | |||
6365e07534 | |||
24605d01e1 | |||
f083a8a185 | |||
|
f639bc7983 | ||
|
5e51997e5b | ||
|
1e3c9edb50 | ||
60e1e59505 | |||
dba490f226 | |||
b6c5dff15c |
@@ -320,6 +320,24 @@
|
||||
"contributions": [
|
||||
"translation"
|
||||
]
|
||||
},
|
||||
{
|
||||
"login": "SawGoD",
|
||||
"name": "Nikita Karelikov",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/67802757?v=4",
|
||||
"profile": "http://telegram.dog/SawGoD",
|
||||
"contributions": [
|
||||
"translation"
|
||||
]
|
||||
},
|
||||
{
|
||||
"login": "carvalhods",
|
||||
"name": "David Carvalho",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/6569255?v=4",
|
||||
"profile": "https://github.com/carvalhods",
|
||||
"contributions": [
|
||||
"platform"
|
||||
]
|
||||
}
|
||||
],
|
||||
"contributorsPerLine": 7,
|
||||
|
@@ -2,4 +2,5 @@ node_modules
|
||||
assets
|
||||
out
|
||||
dist
|
||||
build
|
||||
build
|
||||
misc
|
38
CHANGELOG.md
38
CHANGELOG.md
@@ -2,6 +2,44 @@
|
||||
|
||||
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.30](https://github.com/antares-sql/antares/compare/v0.7.30-beta.1...v0.7.30) (2024-12-04)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* issue saving queries as file ([a54b8d7](https://github.com/antares-sql/antares/commit/a54b8d719c6454500b885050c9ce6feaf7cfae1f))
|
||||
|
||||
### [0.7.30-beta.1](https://github.com/antares-sql/antares/compare/v0.7.30-beta.0...v0.7.30-beta.1) (2024-11-15)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* missing support check for table check features ([2ee9cfc](https://github.com/antares-sql/antares/commit/2ee9cfcf0bbcf86e8a194d2eff78801300ce7cb3))
|
||||
|
||||
|
||||
### Improvements
|
||||
|
||||
* **PostgreSQL:** improved support of connection strings, closes [#893](https://github.com/antares-sql/antares/issues/893) ([f0d312f](https://github.com/antares-sql/antares/commit/f0d312fb59fd98d6e4501bc407959b91eb0650f2))
|
||||
|
||||
### [0.7.30-beta.0](https://github.com/antares-sql/antares/compare/v0.7.29...v0.7.30-beta.0) (2024-10-25)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **MySQL:** check constraints management support ([6365e07](https://github.com/antares-sql/antares/commit/6365e075349e00caa1454cce862e918f2069878f))
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* incorrect behavior in sorting tables with null/empty values, fixes [#883](https://github.com/antares-sql/antares/issues/883) ([b6c5dff](https://github.com/antares-sql/antares/commit/b6c5dff15c165261e9a11a389ed415e59c7b7628))
|
||||
* incorrect behavior sorting tables with numeric values ([60e1e59](https://github.com/antares-sql/antares/commit/60e1e595057c3ba7f36e0f829dba11b470e1069b))
|
||||
* **MySQL:** routines do not return results, fixes [#885](https://github.com/antares-sql/antares/issues/885) ([dba490f](https://github.com/antares-sql/antares/commit/dba490f22634f87d3af5a3a4c0866fc3095c9842))
|
||||
|
||||
|
||||
### Improvements
|
||||
|
||||
* added more notifications in debug console ([dfa7cf9](https://github.com/antares-sql/antares/commit/dfa7cf9905a4d0a79eaed823a14477574b329dfa))
|
||||
|
||||
### [0.7.29](https://github.com/antares-sql/antares/compare/v0.7.29-beta.3...v0.7.29) (2024-10-14)
|
||||
|
||||
### [0.7.29-beta.3](https://github.com/antares-sql/antares/compare/v0.7.29-beta.2...v0.7.29-beta.3) (2024-10-08)
|
||||
|
16
README.md
16
README.md
@@ -1,13 +1,13 @@
|
||||
|
||||
<!-- markdownlint-disable -->
|
||||
<p align="center">
|
||||
<img width="800" src="https://raw.githubusercontent.com/Fabio286/antares/master/docs/gh-logo.png">
|
||||
<img width="800" src="https://raw.githubusercontent.com/antares-sql/antares/master/docs/gh-logo.png">
|
||||
</p>
|
||||
<!-- markdownlint-restore -->
|
||||
|
||||
# Antares SQL Client
|
||||
|
||||
    [](https://www.treedom.net/en/user/fabio-di-stasio/event/antares-for-the-planet)
|
||||
    [](https://www.treedom.net/en/user/fabio-di-stasio/event/antares-for-the-planet)
|
||||
|
||||
Antares is an SQL client based on [Electron.js](https://github.com/electron/electron) and [Vue.js](https://github.com/vuejs/vue) that aims to become a useful tool, especially for developers.
|
||||
Our target is to support as many databases as possible, and all major operating systems, including the ARM versions.
|
||||
@@ -16,7 +16,7 @@ Our target is to support as many databases as possible, and all major operating
|
||||
However, there are all the features necessary to have a pleasant database management experience, so give it a chance and send us your feedback, we would really appreciate it.
|
||||
We are actively working on it, hoping to provide new cool features, improvements and fixes as soon as possible.
|
||||
|
||||
🔗 If you are curious to try Antares you can download and install the [latest release](https://github.com/Fabio286/antares/releases/latest).
|
||||
🔗 If you are curious to try Antares you can download and install the [latest release](https://github.com/antares-sql/antares/releases/latest).
|
||||
👁 To stay tuned for new releases follow Antares SQL on [Mastodon](https://fosstodon.org/@AntaresSQL).
|
||||
🌟 Don't forget to **leave a star** if you appreciate this project.
|
||||
|
||||
@@ -60,7 +60,7 @@ On Linux you can simply download and run the `.AppImage` distribution, install f
|
||||
|
||||
### Windows
|
||||
|
||||
On Windows you can choose between downloading the app from Microsoft Store or downloading the `.exe` from our [website](https://antares-sql.app/downloads) or [this github repo](https://github.com/Fabio286/antares/releases/latest). Distributions that are not from Microsoft Store are not signed with a certificate, so to install you need to click on "More info" and then "Run anyway" on SmartScreen prompt.
|
||||
On Windows you can choose between downloading the app from Microsoft Store or downloading the `.exe` from our [website](https://antares-sql.app/downloads) or [this github repo](https://github.com/antares-sql/antares/releases/latest). Distributions that are not from Microsoft Store are not signed with a certificate, so to install you need to click on "More info" and then "Run anyway" on SmartScreen prompt.
|
||||
|
||||
### MacOS
|
||||
|
||||
@@ -99,8 +99,8 @@ On macOS you can run `.dmg` distribution following [this guide](https://support.
|
||||
|
||||
## How to contribute
|
||||
|
||||
- 🌍 [Translate Antares](https://github.com/Fabio286/antares/wiki/Translate-Antares)
|
||||
- 📖 [Contributors Guide](https://github.com/Fabio286/antares/wiki/Contributors-Guide)
|
||||
- 🌍 [Translate Antares](https://github.com/antares-sql/antares/wiki/Translate-Antares)
|
||||
- 📖 [Contributors Guide](https://github.com/antares-sql/antares/wiki/Contributors-Guide)
|
||||
- 🚧 [Project Board](https://github.com/orgs/antares-sql/projects/3/views/2)
|
||||
|
||||
## Contributors ✨
|
||||
@@ -155,6 +155,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/zwei-c"><img src="https://avatars.githubusercontent.com/u/55912811?v=4?s=100" width="100px;" alt="CHANG, CHIH WEI"/><br /><sub><b>CHANG, CHIH WEI</b></sub></a><br /><a href="#translation-zwei-c" title="Translation">🌍</a></td>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/mirrorb"><img src="https://avatars.githubusercontent.com/u/34116207?v=4?s=100" width="100px;" alt="GaoChun"/><br /><sub><b>GaoChun</b></sub></a><br /><a href="https://github.com/antares-sql/antares/commits?author=mirrorb" title="Code">💻</a></td>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/LeviEyal"><img src="https://avatars.githubusercontent.com/u/48846533?v=4?s=100" width="100px;" alt="Eyal Levi"/><br /><sub><b>Eyal Levi</b></sub></a><br /><a href="#translation-LeviEyal" title="Translation">🌍</a></td>
|
||||
<td align="center" valign="top" width="14.28%"><a href="http://telegram.dog/SawGoD"><img src="https://avatars.githubusercontent.com/u/67802757?v=4?s=100" width="100px;" alt="Nikita Karelikov"/><br /><sub><b>Nikita Karelikov</b></sub></a><br /><a href="#translation-SawGoD" title="Translation">🌍</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center" valign="top" width="14.28%"><a href="https://github.com/carvalhods"><img src="https://avatars.githubusercontent.com/u/6569255?v=4?s=100" width="100px;" alt="David Carvalho"/><br /><sub><b>David Carvalho</b></sub></a><br /><a href="#platform-carvalhods" title="Packaging/porting to new platform">📦</a></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
12
package-lock.json
generated
12
package-lock.json
generated
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "antares",
|
||||
"version": "0.7.29",
|
||||
"version": "0.7.30",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "antares",
|
||||
"version": "0.7.29",
|
||||
"version": "0.7.30",
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
@@ -42,7 +42,6 @@
|
||||
"node-firebird": "~1.1.8",
|
||||
"node-loader": "~2.0.0",
|
||||
"pg": "~8.11.5",
|
||||
"pg-connection-string": "~2.5.0",
|
||||
"pg-query-stream": "~4.2.3",
|
||||
"pgsql-ast-parser": "~7.2.1",
|
||||
"pinia": "~2.1.7",
|
||||
@@ -12142,10 +12141,6 @@
|
||||
"license": "MIT",
|
||||
"optional": true
|
||||
},
|
||||
"node_modules/pg-connection-string": {
|
||||
"version": "2.5.0",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/pg-cursor": {
|
||||
"version": "2.10.3",
|
||||
"license": "MIT",
|
||||
@@ -24507,9 +24502,6 @@
|
||||
"version": "1.1.1",
|
||||
"optional": true
|
||||
},
|
||||
"pg-connection-string": {
|
||||
"version": "2.5.0"
|
||||
},
|
||||
"pg-cursor": {
|
||||
"version": "2.10.3",
|
||||
"requires": {}
|
||||
|
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "antares",
|
||||
"productName": "Antares",
|
||||
"version": "0.7.29",
|
||||
"version": "0.7.30",
|
||||
"description": "A modern, fast and productivity driven SQL client with a focus in UX.",
|
||||
"license": "MIT",
|
||||
"repository": "https://github.com/antares-sql/antares.git",
|
||||
@@ -151,7 +151,6 @@
|
||||
"node-firebird": "~1.1.8",
|
||||
"node-loader": "~2.0.0",
|
||||
"pg": "~8.11.5",
|
||||
"pg-connection-string": "~2.5.0",
|
||||
"pg-query-stream": "~4.2.3",
|
||||
"pgsql-ast-parser": "~7.2.1",
|
||||
"pinia": "~2.1.7",
|
||||
|
@@ -55,6 +55,7 @@ export const defaults: Customizations = {
|
||||
tableArray: false,
|
||||
tableRealCount: false,
|
||||
tableDuplicate: false,
|
||||
tableCheck: false,
|
||||
viewSettings: false,
|
||||
triggerSettings: false,
|
||||
triggerFunctionSettings: false,
|
||||
|
@@ -47,6 +47,7 @@ export const customizations: Customizations = {
|
||||
tableTruncateDisableFKCheck: true,
|
||||
tableDuplicate: true,
|
||||
tableDdl: true,
|
||||
tableCheck: true,
|
||||
viewAdd: true,
|
||||
triggerAdd: true,
|
||||
routineAdd: true,
|
||||
|
@@ -57,6 +57,7 @@ export interface ConnectionParams {
|
||||
cert?: string;
|
||||
key?: string;
|
||||
ca?: string;
|
||||
connString?: string;
|
||||
untrustedConnection: boolean;
|
||||
ciphers?: string;
|
||||
ssh: boolean;
|
||||
@@ -159,6 +160,13 @@ export interface TableForeign {
|
||||
oldName?: string;
|
||||
}
|
||||
|
||||
export interface TableCheck {
|
||||
// eslint-disable-next-line camelcase
|
||||
_antares_id?: string;
|
||||
name: string;
|
||||
clause: string;
|
||||
}
|
||||
|
||||
export interface CreateTableParams {
|
||||
/** Connection UID */
|
||||
uid?: string;
|
||||
@@ -166,6 +174,7 @@ export interface CreateTableParams {
|
||||
fields: TableField[];
|
||||
foreigns: TableForeign[];
|
||||
indexes: TableIndex[];
|
||||
checks?: TableCheck[];
|
||||
options: TableOptions;
|
||||
}
|
||||
|
||||
@@ -193,6 +202,11 @@ export interface AlterTableParams {
|
||||
changes: TableForeign[];
|
||||
deletions: TableForeign[];
|
||||
};
|
||||
checkChanges?: {
|
||||
additions: TableCheck[];
|
||||
changes: TableCheck[];
|
||||
deletions: TableCheck[];
|
||||
};
|
||||
options: TableOptions;
|
||||
}
|
||||
|
||||
|
@@ -43,6 +43,7 @@ export interface Customizations {
|
||||
tableArray?: boolean;
|
||||
tableRealCount?: boolean;
|
||||
tableTruncateDisableFKCheck?: boolean;
|
||||
tableCheck?: boolean;
|
||||
tableDdl?: boolean;
|
||||
viewAdd?: boolean;
|
||||
viewSettings?: boolean;
|
||||
|
@@ -26,6 +26,7 @@ export default (connections: Record<string, antares.Client>) => {
|
||||
user: conn.user,
|
||||
password: conn.password,
|
||||
readonly: conn.readonly,
|
||||
connectionString: conn.connString,
|
||||
database: '',
|
||||
schema: '',
|
||||
databasePath: '',
|
||||
@@ -122,6 +123,7 @@ export default (connections: Record<string, antares.Client>) => {
|
||||
password: conn.password,
|
||||
application_name: 'Antares SQL',
|
||||
readonly: conn.readonly,
|
||||
connectionString: conn.connString,
|
||||
database: '',
|
||||
schema: '',
|
||||
databasePath: '',
|
||||
|
@@ -87,6 +87,19 @@ export default (connections: Record<string, antares.Client>) => {
|
||||
}
|
||||
});
|
||||
|
||||
ipcMain.handle('get-table-checks', async (event, params) => {
|
||||
if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
|
||||
|
||||
try {
|
||||
const result = await connections[params.uid].getTableChecks(params);
|
||||
|
||||
return { status: 'success', response: result };
|
||||
}
|
||||
catch (err) {
|
||||
return { status: 'error', response: err.toString() };
|
||||
}
|
||||
});
|
||||
|
||||
ipcMain.handle('get-table-ddl', async (event, params) => {
|
||||
if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
|
||||
|
||||
|
@@ -189,6 +189,10 @@ export abstract class BaseClient {
|
||||
throw new Error('Method "dropSchema" not implemented');
|
||||
}
|
||||
|
||||
getTableChecks (...args: any) {
|
||||
throw new Error('Method "getTableDll" not implemented');
|
||||
}
|
||||
|
||||
getTableDll (...args: any) {
|
||||
throw new Error('Method "getTableDll" not implemented');
|
||||
}
|
||||
|
@@ -161,6 +161,8 @@ export class MySQLClient extends BaseClient {
|
||||
|
||||
this._ssh = new SSH2Promise({
|
||||
...this._params.ssh,
|
||||
reconnect: true,
|
||||
reconnectTries: 3,
|
||||
debug: process.env.NODE_ENV !== 'production' ? (s) => console.log(s) : null
|
||||
});
|
||||
|
||||
@@ -689,6 +691,34 @@ export class MySQLClient extends BaseClient {
|
||||
return rows.length ? rows[0].count : 0;
|
||||
}
|
||||
|
||||
async getTableChecks ({ schema, table }: { schema: string; table: string }): Promise<antares.TableCheck[]> {
|
||||
const { rows } = await this.raw(`
|
||||
SELECT
|
||||
CONSTRAINT_NAME as name,
|
||||
CHECK_CLAUSE as clausole
|
||||
FROM information_schema.CHECK_CONSTRAINTS
|
||||
WHERE CONSTRAINT_SCHEMA = "${schema}"
|
||||
AND CONSTRAINT_NAME IN (
|
||||
SELECT
|
||||
CONSTRAINT_NAME
|
||||
FROM
|
||||
information_schema.TABLE_CONSTRAINTS
|
||||
WHERE
|
||||
TABLE_SCHEMA = "${schema}"
|
||||
AND TABLE_NAME = "${table}"
|
||||
AND CONSTRAINT_TYPE = 'CHECK'
|
||||
)
|
||||
`);
|
||||
|
||||
if (rows.length) {
|
||||
return rows.map(row => ({
|
||||
name: row.name,
|
||||
clause: row.clausole
|
||||
}));
|
||||
}
|
||||
return [];
|
||||
}
|
||||
|
||||
async getTableOptions ({ schema, table }: { schema: string; table: string }) {
|
||||
/* eslint-disable camelcase */
|
||||
interface TableOptionsResult {
|
||||
@@ -865,11 +895,13 @@ export class MySQLClient extends BaseClient {
|
||||
fields,
|
||||
foreigns,
|
||||
indexes,
|
||||
checks,
|
||||
options
|
||||
} = params;
|
||||
const newColumns: string[] = [];
|
||||
const newIndexes: string[] = [];
|
||||
const newForeigns: string[] = [];
|
||||
const newChecks: string[] = [];
|
||||
|
||||
let sql = `CREATE TABLE \`${schema}\`.\`${options.name}\``;
|
||||
|
||||
@@ -910,7 +942,13 @@ export class MySQLClient extends BaseClient {
|
||||
newForeigns.push(`CONSTRAINT \`${foreign.constraintName}\` FOREIGN KEY (\`${foreign.field}\`) REFERENCES \`${foreign.refTable}\` (\`${foreign.refField}\`) ON UPDATE ${foreign.onUpdate} ON DELETE ${foreign.onDelete}`);
|
||||
});
|
||||
|
||||
sql = `${sql} (${[...newColumns, ...newIndexes, ...newForeigns].join(', ')}) COMMENT='${options.comment}', COLLATE='${options.collation}', ENGINE=${options.engine}`;
|
||||
// ADD TABLE CHECKS
|
||||
checks.forEach(check => {
|
||||
if (!check.clause.trim().length) return;
|
||||
newChecks.push(`${check.name ? `CONSTRAINT \`${check.name}\` ` : ''}CHECK (${check.clause})`);
|
||||
});
|
||||
|
||||
sql = `${sql} (${[...newColumns, ...newIndexes, ...newForeigns, ...newChecks].join(', ')}) COMMENT='${options.comment}', COLLATE='${options.collation}', ENGINE=${options.engine}`;
|
||||
|
||||
return await this.raw(sql);
|
||||
}
|
||||
@@ -924,6 +962,7 @@ export class MySQLClient extends BaseClient {
|
||||
changes,
|
||||
indexChanges,
|
||||
foreignChanges,
|
||||
checkChanges,
|
||||
options
|
||||
} = params;
|
||||
|
||||
@@ -931,6 +970,7 @@ export class MySQLClient extends BaseClient {
|
||||
const alterColumnsAdd: string[] = [];
|
||||
const alterColumnsChange: string[] = [];
|
||||
const alterColumnsDrop: string[] = [];
|
||||
const alterQueryes: string[] = [];
|
||||
|
||||
// OPTIONS
|
||||
if ('comment' in options) alterColumnsChange.push(`COMMENT='${options.comment}'`);
|
||||
@@ -976,6 +1016,12 @@ export class MySQLClient extends BaseClient {
|
||||
alterColumnsAdd.push(`ADD CONSTRAINT \`${addition.constraintName}\` FOREIGN KEY (\`${addition.field}\`) REFERENCES \`${addition.refTable}\` (\`${addition.refField}\`) ON UPDATE ${addition.onUpdate} ON DELETE ${addition.onDelete}`);
|
||||
});
|
||||
|
||||
// ADD TABLE CHECKS
|
||||
checkChanges.additions.forEach(addition => {
|
||||
if (!addition.clause.trim().length) return;
|
||||
alterColumnsAdd.push(`ADD ${addition.name ? `CONSTRAINT \`${addition.name}\` ` : ''}CHECK (${addition.clause})`);
|
||||
});
|
||||
|
||||
// CHANGE FIELDS
|
||||
changes.forEach(change => {
|
||||
const typeInfo = this.getTypeInfo(change.type);
|
||||
@@ -987,9 +1033,9 @@ export class MySQLClient extends BaseClient {
|
||||
${change.zerofill ? 'ZEROFILL' : ''}
|
||||
${change.nullable ? 'NULL' : 'NOT NULL'}
|
||||
${change.autoIncrement ? 'AUTO_INCREMENT' : ''}
|
||||
${change.collation ? `COLLATE ${change.collation}` : ''}
|
||||
${change.default !== null ? `DEFAULT ${change.default || '\'\''}` : ''}
|
||||
${change.comment ? `COMMENT '${change.comment}'` : ''}
|
||||
${change.collation ? `COLLATE ${change.collation}` : ''}
|
||||
${change.onUpdate ? `ON UPDATE ${change.onUpdate}` : ''}
|
||||
${change.after ? `AFTER \`${change.after}\`` : 'FIRST'}`);
|
||||
});
|
||||
@@ -1020,6 +1066,13 @@ export class MySQLClient extends BaseClient {
|
||||
alterColumnsChange.push(`ADD CONSTRAINT \`${change.constraintName}\` FOREIGN KEY (\`${change.field}\`) REFERENCES \`${change.refTable}\` (\`${change.refField}\`) ON UPDATE ${change.onUpdate} ON DELETE ${change.onDelete}`);
|
||||
});
|
||||
|
||||
// CHANGE CHECK TABLE
|
||||
checkChanges.changes.forEach(change => {
|
||||
if (!change.clause.trim().length) return;
|
||||
alterQueryes.push(`${sql} DROP CONSTRAINT \`${change.name}\``);
|
||||
alterQueryes.push(`${sql} ADD ${change.name ? `CONSTRAINT \`${change.name}\` ` : ''}CHECK (${change.clause})`);
|
||||
});
|
||||
|
||||
// DROP FIELDS
|
||||
deletions.forEach(deletion => {
|
||||
alterColumnsDrop.push(`DROP COLUMN \`${deletion.name}\``);
|
||||
@@ -1038,7 +1091,11 @@ export class MySQLClient extends BaseClient {
|
||||
alterColumnsDrop.push(`DROP FOREIGN KEY \`${deletion.constraintName}\``);
|
||||
});
|
||||
|
||||
const alterQueryes = [];
|
||||
// DROP CHECK TABLE
|
||||
checkChanges.deletions.forEach(deletion => {
|
||||
alterQueryes.push(`${sql} DROP CONSTRAINT \`${deletion.name}\``);
|
||||
});
|
||||
|
||||
if (alterColumnsAdd.length) alterQueryes.push(sql+alterColumnsAdd.join(', '));
|
||||
if (alterColumnsChange.length) alterQueryes.push(sql+alterColumnsChange.join(', '));
|
||||
if (alterColumnsDrop.length) alterQueryes.push(sql+alterColumnsDrop.join(', '));
|
||||
@@ -1714,9 +1771,10 @@ export class MySQLClient extends BaseClient {
|
||||
connection.query({ sql: query, nestTables }).then(async ([response, fields]) => {
|
||||
timeStop = new Date();
|
||||
const queryResult = response;
|
||||
const fieldsArr = fields ? Array.isArray(fields[0]) ? fields[0] : fields : false;// Some times fields are nested in an array
|
||||
|
||||
let remappedFields = fields
|
||||
? fields.map(field => {
|
||||
let remappedFields = fieldsArr
|
||||
? fieldsArr.map(field => {
|
||||
if (!field || Array.isArray(field))
|
||||
return undefined;
|
||||
|
||||
@@ -1785,7 +1843,7 @@ export class MySQLClient extends BaseClient {
|
||||
|
||||
resolve({
|
||||
duration: timeStop.getTime() - timeStart.getTime(),
|
||||
rows: Array.isArray(queryResult) ? queryResult.some(el => Array.isArray(el)) ? [] : queryResult : false,
|
||||
rows: Array.isArray(queryResult) ? queryResult.some(el => Array.isArray(el)) ? queryResult[0] : queryResult : false,
|
||||
report: !Array.isArray(queryResult) ? queryResult : false,
|
||||
fields: remappedFields,
|
||||
keys: keysArr
|
||||
|
@@ -155,6 +155,7 @@ export class PostgreSQLClient extends BaseClient {
|
||||
host: this._params.host,
|
||||
port: this._params.port,
|
||||
user: this._params.user,
|
||||
connectionString: this._params.connectionString,
|
||||
database: 'postgres' as string,
|
||||
password: this._params.password,
|
||||
ssl: null as ConnectionOptions
|
||||
@@ -168,6 +169,8 @@ export class PostgreSQLClient extends BaseClient {
|
||||
try {
|
||||
this._ssh = new SSH2Promise({
|
||||
...this._params.ssh,
|
||||
reconnect: true,
|
||||
reconnectTries: 3,
|
||||
debug: process.env.NODE_ENV !== 'production' ? (s) => console.log(s) : null
|
||||
});
|
||||
|
||||
|
@@ -67,7 +67,7 @@
|
||||
<div class="column col-7 col-sm-12">
|
||||
<input
|
||||
ref="pgString"
|
||||
v-model="connection.pgConnString"
|
||||
v-model="connection.connString"
|
||||
class="form-input"
|
||||
type="text"
|
||||
>
|
||||
@@ -502,8 +502,8 @@ const connection = ref({
|
||||
sshKey: '',
|
||||
sshPort: 22,
|
||||
sshKeepAliveInterval: 1800,
|
||||
pgConnString: ''
|
||||
}) as Ref<ConnectionParams & { pgConnString: string }>;
|
||||
connString: ''
|
||||
}) as Ref<ConnectionParams & { connString: string }>;
|
||||
|
||||
const firstInput: Ref<HTMLInputElement> = ref(null);
|
||||
const isConnecting = ref(false);
|
||||
|
@@ -68,7 +68,7 @@
|
||||
<div class="column col-7 col-sm-12">
|
||||
<input
|
||||
ref="pgString"
|
||||
v-model="localConnection.pgConnString"
|
||||
v-model="localConnection.connString"
|
||||
class="form-input"
|
||||
type="text"
|
||||
>
|
||||
@@ -502,7 +502,7 @@ const clients = [
|
||||
];
|
||||
|
||||
const firstInput: Ref<HTMLInputElement> = ref(null);
|
||||
const localConnection: Ref<ConnectionParams & { pgConnString: string }> = ref(null);
|
||||
const localConnection: Ref<ConnectionParams & { connString: string }> = ref(null);
|
||||
const isConnecting = ref(false);
|
||||
const isTesting = ref(false);
|
||||
const isAsking = ref(false);
|
||||
|
@@ -72,6 +72,20 @@
|
||||
/>
|
||||
<span>{{ t('database.foreignKeys') }}</span>
|
||||
</button>
|
||||
<button
|
||||
v-if="workspace.customizations.tableCheck"
|
||||
class="btn btn-dark btn-sm ml-2 mr-0"
|
||||
:disabled="isSaving || !localFields.length"
|
||||
:title="t('database.manageTableChecks')"
|
||||
@click="showTableChecksModal"
|
||||
>
|
||||
<BaseIcon
|
||||
class="mr-1"
|
||||
icon-name="mdiTableCheck"
|
||||
:size="24"
|
||||
/>
|
||||
<span>{{ t('database.tableChecks') }}</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="workspace-query-info">
|
||||
<div class="d-flex" :title="t('database.schema')">
|
||||
@@ -183,11 +197,19 @@
|
||||
@hide="hideForeignModal"
|
||||
@foreigns-update="foreignsUpdate"
|
||||
/>
|
||||
<WorkspaceTabPropsTableChecksModal
|
||||
v-if="isTableChecksModal"
|
||||
:local-checks="localTableChecks"
|
||||
table="new"
|
||||
:workspace="workspace"
|
||||
@hide="hideTableChecksModal"
|
||||
@checks-update="checksUpdate"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ConnectionParams, TableField, TableForeign, TableIndex, TableOptions } from 'common/interfaces/antares';
|
||||
import { ConnectionParams, TableCheck, TableField, TableForeign, TableIndex, TableOptions } from 'common/interfaces/antares';
|
||||
import { uidGen } from 'common/libs/uidGen';
|
||||
import { ipcRenderer } from 'electron';
|
||||
import { storeToRefs } from 'pinia';
|
||||
@@ -198,6 +220,7 @@ import BaseIcon from '@/components/BaseIcon.vue';
|
||||
import BaseLoader from '@/components/BaseLoader.vue';
|
||||
import BaseSelect from '@/components/BaseSelect.vue';
|
||||
import WorkspaceTabNewTableEmptyState from '@/components/WorkspaceTabNewTableEmptyState.vue';
|
||||
import WorkspaceTabPropsTableChecksModal from '@/components/WorkspaceTabPropsTableChecksModal.vue';
|
||||
import WorkspaceTabPropsTableFields from '@/components/WorkspaceTabPropsTableFields.vue';
|
||||
import WorkspaceTabPropsTableForeignModal from '@/components/WorkspaceTabPropsTableForeignModal.vue';
|
||||
import WorkspaceTabPropsTableIndexesModal from '@/components/WorkspaceTabPropsTableIndexesModal.vue';
|
||||
@@ -236,12 +259,16 @@ const isLoading = ref(false);
|
||||
const isSaving = ref(false);
|
||||
const isIndexesModal = ref(false);
|
||||
const isForeignModal = ref(false);
|
||||
const isTableChecksModal = ref(false);
|
||||
|
||||
const originalFields: Ref<TableField[]> = ref([]);
|
||||
const localFields: Ref<TableField[]> = ref([]);
|
||||
const originalKeyUsage: Ref<TableForeign[]> = ref([]);
|
||||
const localKeyUsage: Ref<TableForeign[]> = ref([]);
|
||||
const originalIndexes: Ref<TableIndex[]> = ref([]);
|
||||
const localIndexes: Ref<TableIndex[]> = ref([]);
|
||||
const originalTableChecks: Ref<TableCheck[]> = ref([]);
|
||||
const localTableChecks: Ref<TableCheck[]> = ref([]);
|
||||
const tableOptions: Ref<TableOptions> = ref(null);
|
||||
const localOptions: Ref<TableOptions> = ref(null);
|
||||
const newFieldsCounter = ref(0);
|
||||
@@ -274,6 +301,7 @@ const isChanged = computed(() => {
|
||||
return JSON.stringify(originalFields.value) !== JSON.stringify(localFields.value) ||
|
||||
JSON.stringify(originalKeyUsage.value) !== JSON.stringify(localKeyUsage.value) ||
|
||||
JSON.stringify(originalIndexes.value) !== JSON.stringify(localIndexes.value) ||
|
||||
JSON.stringify(originalTableChecks.value) !== JSON.stringify(localTableChecks.value) ||
|
||||
JSON.stringify(tableOptions.value) !== JSON.stringify(localOptions.value);
|
||||
});
|
||||
|
||||
@@ -291,6 +319,7 @@ const saveChanges = async () => {
|
||||
fields: localFields.value,
|
||||
foreigns: localKeyUsage.value,
|
||||
indexes: localIndexes.value,
|
||||
checks: localTableChecks.value,
|
||||
options: localOptions.value
|
||||
};
|
||||
|
||||
@@ -326,6 +355,7 @@ const clearChanges = () => {
|
||||
localFields.value = JSON.parse(JSON.stringify(originalFields.value));
|
||||
localIndexes.value = JSON.parse(JSON.stringify(originalIndexes.value));
|
||||
localKeyUsage.value = JSON.parse(JSON.stringify(originalKeyUsage.value));
|
||||
localTableChecks.value = JSON.parse(JSON.stringify(originalTableChecks.value));
|
||||
|
||||
tableOptions.value = {
|
||||
name: '',
|
||||
@@ -446,10 +476,22 @@ const hideForeignModal = () => {
|
||||
isForeignModal.value = false;
|
||||
};
|
||||
|
||||
const showTableChecksModal = () => {
|
||||
isTableChecksModal.value = true;
|
||||
};
|
||||
|
||||
const hideTableChecksModal = () => {
|
||||
isTableChecksModal.value = false;
|
||||
};
|
||||
|
||||
const foreignsUpdate = (foreigns: TableForeign[]) => {
|
||||
localKeyUsage.value = foreigns;
|
||||
};
|
||||
|
||||
const checksUpdate = (checks: TableCheck[]) => {
|
||||
localTableChecks.value = checks;
|
||||
};
|
||||
|
||||
const saveContentListener = () => {
|
||||
const hasModalOpen = !!document.querySelectorAll('.modal.active').length;
|
||||
if (props.isSelected && !hasModalOpen && isChanged.value)
|
||||
|
@@ -62,7 +62,7 @@
|
||||
<button
|
||||
class="btn btn-dark btn-sm mr-0"
|
||||
:disabled="isSaving"
|
||||
:title="t('database.manageIndexes')"
|
||||
:title="t('database.manageForeignKeys')"
|
||||
@click="showForeignModal"
|
||||
>
|
||||
<BaseIcon
|
||||
@@ -72,6 +72,20 @@
|
||||
/>
|
||||
<span>{{ t('database.foreignKeys') }}</span>
|
||||
</button>
|
||||
<button
|
||||
v-if="workspace.customizations.tableCheck"
|
||||
class="btn btn-dark btn-sm ml-2 mr-0"
|
||||
:disabled="isSaving"
|
||||
:title="t('database.manageTableChecks')"
|
||||
@click="showTableChecksModal"
|
||||
>
|
||||
<BaseIcon
|
||||
class="mr-1"
|
||||
icon-name="mdiTableCheck"
|
||||
:size="24"
|
||||
/>
|
||||
<span>{{ t('database.tableChecks') }}</span>
|
||||
</button>
|
||||
|
||||
<div class="divider-vert py-3" />
|
||||
|
||||
@@ -218,11 +232,19 @@
|
||||
:workspace="workspace"
|
||||
@hide="hideDdlModal"
|
||||
/>
|
||||
<WorkspaceTabPropsTableChecksModal
|
||||
v-if="isTableChecksModal"
|
||||
:local-checks="localTableChecks"
|
||||
:table="table"
|
||||
:workspace="workspace"
|
||||
@hide="hideTableChecksModal"
|
||||
@checks-update="checksUpdate"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { AlterTableParams, TableField, TableForeign, TableIndex, TableInfos, TableOptions } from 'common/interfaces/antares';
|
||||
import { AlterTableParams, TableCheck, TableField, TableForeign, TableIndex, TableInfos, TableOptions } from 'common/interfaces/antares';
|
||||
import { uidGen } from 'common/libs/uidGen';
|
||||
import { ipcRenderer } from 'electron';
|
||||
import { storeToRefs } from 'pinia';
|
||||
@@ -232,6 +254,7 @@ import { useI18n } from 'vue-i18n';
|
||||
import BaseIcon from '@/components/BaseIcon.vue';
|
||||
import BaseLoader from '@/components/BaseLoader.vue';
|
||||
import BaseSelect from '@/components/BaseSelect.vue';
|
||||
import WorkspaceTabPropsTableChecksModal from '@/components/WorkspaceTabPropsTableChecksModal.vue';
|
||||
import WorkspaceTabPropsTableDdlModal from '@/components/WorkspaceTabPropsTableDdlModal.vue';
|
||||
import WorkspaceTabPropsTableFields from '@/components/WorkspaceTabPropsTableFields.vue';
|
||||
import WorkspaceTabPropsTableForeignModal from '@/components/WorkspaceTabPropsTableForeignModal.vue';
|
||||
@@ -273,13 +296,17 @@ const isLoading = ref(false);
|
||||
const isSaving = ref(false);
|
||||
const isIndexesModal = ref(false);
|
||||
const isForeignModal = ref(false);
|
||||
const isTableChecksModal = ref(false);
|
||||
const isDdlModal = ref(false);
|
||||
|
||||
const originalFields: Ref<TableField[]> = ref([]);
|
||||
const localFields: Ref<TableField[]> = ref([]);
|
||||
const originalKeyUsage: Ref<TableForeign[]> = ref([]);
|
||||
const localKeyUsage: Ref<TableForeign[]> = ref([]);
|
||||
const originalIndexes: Ref<TableIndex[]> = ref([]);
|
||||
const localIndexes: Ref<TableIndex[]> = ref([]);
|
||||
const originalTableChecks: Ref<TableCheck[]> = ref([]);
|
||||
const localTableChecks: Ref<TableCheck[]> = ref([]);
|
||||
const tableOptions: Ref<TableOptions> = ref(null);
|
||||
const localOptions: Ref<TableOptions> = ref({} as TableOptions);
|
||||
const lastTable = ref(null);
|
||||
@@ -307,6 +334,7 @@ const isChanged = computed(() => {
|
||||
return JSON.stringify(originalFields.value) !== JSON.stringify(localFields.value) ||
|
||||
JSON.stringify(originalKeyUsage.value) !== JSON.stringify(localKeyUsage.value) ||
|
||||
JSON.stringify(originalIndexes.value) !== JSON.stringify(localIndexes.value) ||
|
||||
JSON.stringify(originalTableChecks.value) !== JSON.stringify(localTableChecks.value) ||
|
||||
JSON.stringify(tableOptions.value) !== JSON.stringify(localOptions.value);
|
||||
});
|
||||
|
||||
@@ -430,6 +458,27 @@ const getFieldsData = async () => {
|
||||
addNotification({ status: 'error', message: err.stack });
|
||||
}
|
||||
|
||||
if (workspace.value.customizations.tableCheck) {
|
||||
try { // Table checks
|
||||
const { status, response } = await Tables.getTableChecks(params);
|
||||
|
||||
if (status === 'success') {
|
||||
originalTableChecks.value = response.map((check: TableCheck) => {
|
||||
return {
|
||||
_antares_id: uidGen(),
|
||||
...check
|
||||
};
|
||||
});
|
||||
localTableChecks.value = JSON.parse(JSON.stringify(originalTableChecks.value));
|
||||
}
|
||||
else
|
||||
addNotification({ status: 'error', message: response });
|
||||
}
|
||||
catch (err) {
|
||||
addNotification({ status: 'error', message: err.stack });
|
||||
}
|
||||
}
|
||||
|
||||
isLoading.value = false;
|
||||
};
|
||||
|
||||
@@ -527,6 +576,33 @@ const saveChanges = async () => {
|
||||
// Foreigns Deletions
|
||||
foreignChanges.deletions = originalKeyUsage.value.filter(foreign => !localForeignIDs.includes(foreign._antares_id));
|
||||
|
||||
// CHECKS
|
||||
const checkChanges = {
|
||||
additions: [] as TableCheck[],
|
||||
changes: [] as TableCheck[],
|
||||
deletions: [] as TableCheck[]
|
||||
};
|
||||
const originalCheckIDs = originalTableChecks.value.reduce((acc, curr) => [...acc, curr._antares_id], []);
|
||||
const localCheckIDs = localTableChecks.value.reduce((acc, curr) => [...acc, curr._antares_id], []);
|
||||
|
||||
// Check Additions
|
||||
checkChanges.additions = localTableChecks.value.filter(check => !originalCheckIDs.includes(check._antares_id));
|
||||
|
||||
// Check Changes
|
||||
originalTableChecks.value.forEach(originalCheck => {
|
||||
const lI = localTableChecks.value.findIndex(localCheck => localCheck._antares_id === originalCheck._antares_id);
|
||||
if (JSON.stringify(originalCheck) !== JSON.stringify(localTableChecks.value[lI])) {
|
||||
if (localTableChecks.value[lI]) {
|
||||
checkChanges.changes.push({
|
||||
...localTableChecks.value[lI]
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// Check Deletions
|
||||
checkChanges.deletions = originalTableChecks.value.filter(check => !localCheckIDs.includes(check._antares_id));
|
||||
|
||||
// ALTER
|
||||
const params = {
|
||||
uid: props.connection.uid,
|
||||
@@ -543,6 +619,7 @@ const saveChanges = async () => {
|
||||
deletions,
|
||||
indexChanges,
|
||||
foreignChanges,
|
||||
checkChanges,
|
||||
options
|
||||
} as unknown as AlterTableParams;
|
||||
|
||||
@@ -583,6 +660,7 @@ const clearChanges = () => {
|
||||
localFields.value = JSON.parse(JSON.stringify(originalFields.value));
|
||||
localIndexes.value = JSON.parse(JSON.stringify(originalIndexes.value));
|
||||
localKeyUsage.value = JSON.parse(JSON.stringify(originalKeyUsage.value));
|
||||
localTableChecks.value = JSON.parse(JSON.stringify(originalTableChecks.value));
|
||||
localOptions.value = JSON.parse(JSON.stringify(tableOptions.value));
|
||||
newFieldsCounter.value = 0;
|
||||
};
|
||||
@@ -702,6 +780,14 @@ const hideForeignModal = () => {
|
||||
isForeignModal.value = false;
|
||||
};
|
||||
|
||||
const showTableChecksModal = () => {
|
||||
isTableChecksModal.value = true;
|
||||
};
|
||||
|
||||
const hideTableChecksModal = () => {
|
||||
isTableChecksModal.value = false;
|
||||
};
|
||||
|
||||
const showDdlModal = () => {
|
||||
isDdlModal.value = true;
|
||||
};
|
||||
@@ -714,6 +800,10 @@ const foreignsUpdate = (foreigns: TableForeign[]) => {
|
||||
localKeyUsage.value = foreigns;
|
||||
};
|
||||
|
||||
const checksUpdate = (checks: TableCheck[]) => {
|
||||
localTableChecks.value = checks;
|
||||
};
|
||||
|
||||
const saveContentListener = () => {
|
||||
const hasModalOpen = !!document.querySelectorAll('.modal.active').length;
|
||||
if (props.isSelected && !hasModalOpen && isChanged.value)
|
||||
|
268
src/renderer/components/WorkspaceTabPropsTableChecksModal.vue
Normal file
268
src/renderer/components/WorkspaceTabPropsTableChecksModal.vue
Normal file
@@ -0,0 +1,268 @@
|
||||
<template>
|
||||
<ConfirmModal
|
||||
:confirm-text="t('general.confirm')"
|
||||
size="medium"
|
||||
class="options-modal"
|
||||
@confirm="confirmChecksChange"
|
||||
@hide="$emit('hide')"
|
||||
>
|
||||
<template #header>
|
||||
<div class="d-flex">
|
||||
<BaseIcon
|
||||
class="mr-1"
|
||||
icon-name="mdiTableCheck"
|
||||
:size="24"
|
||||
/>
|
||||
<span class="cut-text">{{ t('database.tableChecks') }} "{{ table }}"</span>
|
||||
</div>
|
||||
</template>
|
||||
<template #body>
|
||||
<div class="columns col-gapless">
|
||||
<div class="column col-5">
|
||||
<div class="panel" :style="{ height: modalInnerHeight + 'px'}">
|
||||
<div class="panel-header pt-0 pl-0">
|
||||
<div class="d-flex">
|
||||
<button class="btn btn-dark btn-sm d-flex" @click="addCheck">
|
||||
<BaseIcon
|
||||
class="mr-1"
|
||||
icon-name="mdiCheckboxMarkedCirclePlusOutline"
|
||||
:size="24"
|
||||
/>
|
||||
<span>{{ t('general.add') }}</span>
|
||||
</button>
|
||||
<button
|
||||
class="btn btn-dark btn-sm d-flex ml-2 mr-0"
|
||||
:title="t('database.clearChanges')"
|
||||
:disabled="!isChanged"
|
||||
@click.prevent="clearChanges"
|
||||
>
|
||||
<BaseIcon
|
||||
class="mr-1"
|
||||
icon-name="mdiDeleteSweep"
|
||||
:size="24"
|
||||
/>
|
||||
<span>{{ t('general.clear') }}</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div ref="checksPanel" class="panel-body p-0 pr-1">
|
||||
<div
|
||||
v-for="check in checksProxy"
|
||||
:key="check._antares_id"
|
||||
class="tile tile-centered c-hand mb-1 p-1"
|
||||
:class="{'selected-element': selectedCheckID === check._antares_id}"
|
||||
@click="selectCheck($event, check._antares_id)"
|
||||
>
|
||||
<div class="tile-icon">
|
||||
<div>
|
||||
<BaseIcon
|
||||
class="mt-2 column-key"
|
||||
icon-name="mdiCheckboxMarkedCircleOutline"
|
||||
:size="24"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tile-content">
|
||||
<div class="tile-title">
|
||||
{{ check.name }}
|
||||
</div>
|
||||
<small class="tile-subtitle text-gray d-inline-block cut-text" style="width: 100%;">{{ check.clause }}</small>
|
||||
</div>
|
||||
<div class="tile-action">
|
||||
<button
|
||||
class="btn btn-link remove-field p-0 mr-2"
|
||||
:title="t('general.delete')"
|
||||
@click.prevent="removeCheck(check._antares_id)"
|
||||
>
|
||||
<BaseIcon
|
||||
icon-name="mdiClose"
|
||||
:size="18"
|
||||
class="mt-2"
|
||||
/>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="column col-7 pl-2 editor-col">
|
||||
<form
|
||||
v-if="selectedCheckObj"
|
||||
:style="{ height: modalInnerHeight + 'px'}"
|
||||
class="form-horizontal"
|
||||
>
|
||||
<div class="form-group">
|
||||
<label class="form-label col-3">
|
||||
{{ t('general.name') }}
|
||||
</label>
|
||||
<div class="column">
|
||||
<input
|
||||
v-model="selectedCheckObj.name"
|
||||
class="form-input"
|
||||
type="text"
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="form-label col-3">
|
||||
{{ t('database.checkClause') }}
|
||||
</label>
|
||||
<div class="column">
|
||||
<textarea
|
||||
v-model="selectedCheckObj.clause"
|
||||
class="form-input"
|
||||
style="resize: vertical;"
|
||||
rows="5"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
<div v-if="!checksProxy.length" class="empty">
|
||||
<div class="empty-icon">
|
||||
<BaseIcon
|
||||
class="mr-1"
|
||||
icon-name="mdiCheckboxMarkedCircleOutline"
|
||||
:size="48"
|
||||
/>
|
||||
</div>
|
||||
<p class="empty-title h5">
|
||||
{{ t('database.thereAreNoTableChecks') }}
|
||||
</p>
|
||||
<div class="empty-action">
|
||||
<button class="btn btn-primary" @click="addCheck">
|
||||
{{ t('database.createNewCheck') }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</ConfirmModal>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { TableCheck } from 'common/interfaces/antares';
|
||||
import { uidGen } from 'common/libs/uidGen';
|
||||
import { computed, onMounted, onUnmounted, Ref, ref } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
import ConfirmModal from '@/components/BaseConfirmModal.vue';
|
||||
import BaseIcon from '@/components/BaseIcon.vue';
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
const props = defineProps({
|
||||
localChecks: Array,
|
||||
table: String,
|
||||
workspace: Object
|
||||
});
|
||||
|
||||
const emit = defineEmits(['hide', 'checks-update']);
|
||||
|
||||
const checksPanel: Ref<HTMLDivElement> = ref(null);
|
||||
const checksProxy: Ref<TableCheck[]> = ref([]);
|
||||
const selectedCheckID = ref('');
|
||||
const modalInnerHeight = ref(400);
|
||||
|
||||
const selectedCheckObj = computed(() => checksProxy.value.find(index => index._antares_id === selectedCheckID.value));
|
||||
const isChanged = computed(() => JSON.stringify(props.localChecks) !== JSON.stringify(checksProxy.value));
|
||||
|
||||
const confirmChecksChange = () => {
|
||||
const filteredChecks = checksProxy.value.filter(check => check.clause.trim().length);
|
||||
emit('checks-update', filteredChecks);
|
||||
};
|
||||
|
||||
const selectCheck = (event: MouseEvent, id: string) => {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
if (selectedCheckID.value !== id && !(event.target as any).classList.contains('remove-field'))
|
||||
selectedCheckID.value = id;
|
||||
};
|
||||
|
||||
const getModalInnerHeight = () => {
|
||||
const modalBody = document.querySelector('.modal-body');
|
||||
if (modalBody)
|
||||
modalInnerHeight.value = modalBody.clientHeight - (parseFloat(getComputedStyle(modalBody).paddingTop) + parseFloat(getComputedStyle(modalBody).paddingBottom));
|
||||
};
|
||||
|
||||
const addCheck = () => {
|
||||
const uid = uidGen();
|
||||
checksProxy.value = [...checksProxy.value, {
|
||||
_antares_id: uid,
|
||||
name: `CHK_${uid.substring(0, 4)}`,
|
||||
clause: ''
|
||||
}];
|
||||
|
||||
if (checksProxy.value.length === 1)
|
||||
resetSelectedID();
|
||||
|
||||
setTimeout(() => {
|
||||
checksPanel.value.scrollTop = checksPanel.value.scrollHeight + 60;
|
||||
selectedCheckID.value = uid;
|
||||
}, 20);
|
||||
};
|
||||
|
||||
const removeCheck = (id: string) => {
|
||||
checksProxy.value = checksProxy.value.filter(index => index._antares_id !== id);
|
||||
|
||||
if (selectedCheckID.value === id && checksProxy.value.length)
|
||||
resetSelectedID();
|
||||
};
|
||||
|
||||
const clearChanges = () => {
|
||||
checksProxy.value = JSON.parse(JSON.stringify(props.localChecks));
|
||||
if (!checksProxy.value.some(index => index._antares_id === selectedCheckID.value))
|
||||
resetSelectedID();
|
||||
};
|
||||
|
||||
const resetSelectedID = () => {
|
||||
selectedCheckID.value = checksProxy.value.length ? checksProxy.value[0]._antares_id : '';
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
checksProxy.value = JSON.parse(JSON.stringify(props.localChecks));
|
||||
|
||||
if (checksProxy.value.length)
|
||||
resetSelectedID();
|
||||
|
||||
getModalInnerHeight();
|
||||
window.addEventListener('resize', getModalInnerHeight);
|
||||
});
|
||||
|
||||
onUnmounted(() => {
|
||||
window.removeEventListener('resize', getModalInnerHeight);
|
||||
});
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.tile {
|
||||
border-radius: $border-radius;
|
||||
opacity: 0.5;
|
||||
transition: background 0.2s;
|
||||
transition: opacity 0.2s;
|
||||
|
||||
.tile-action {
|
||||
opacity: 0;
|
||||
transition: opacity 0.2s;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
.tile-action {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
&.selected-element {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
.fields-list {
|
||||
max-height: 300px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.remove-field svg {
|
||||
pointer-events: none;
|
||||
}
|
||||
</style>
|
@@ -745,7 +745,7 @@ const saveFileAs = async () => {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const result: any = await Application.showSaveDialog({
|
||||
filters: [{ name: 'SQL', extensions: ['sql'] }],
|
||||
defaultPath: (!queryName.value.includes('.sql') ? `${queryName.value}.sql` :queryName.value) || 'query.sql'
|
||||
defaultPath: (queryName.value !== undefined && !queryName.value.includes('.sql') ? `${queryName.value}.sql` : queryName.value) || 'query.sql'
|
||||
});
|
||||
|
||||
if (result && !result.canceled) {
|
||||
|
@@ -366,12 +366,21 @@ const sortedResults = computed(() => {
|
||||
const sortObj = currentSort.value[resultsetIndex.value];
|
||||
|
||||
return [...localResults.value].sort((a: any, b: any) => {
|
||||
let modifier = 1;
|
||||
let valA = typeof a[sortObj.field] === 'string' ? a[sortObj.field].toLowerCase() : a[sortObj.field];
|
||||
if (!isNaN(valA)) valA = Number(valA);
|
||||
let valB = typeof b[sortObj.field] === 'string' ? b[sortObj.field].toLowerCase() : b[sortObj.field];
|
||||
if (!isNaN(valB)) valB = Number(valB);
|
||||
if (sortObj.dir === 'desc') modifier = -1;
|
||||
const modifier = sortObj.dir === 'desc' ? -1 : 1;
|
||||
let valA = a[sortObj.field];
|
||||
let valB = b[sortObj.field];
|
||||
|
||||
// Handle null values
|
||||
if (valA === null && valB !== null) return sortObj.dir === 'asc' ? -1 : 1;
|
||||
if (valA !== null && valB === null) return sortObj.dir === 'asc' ? 1 : -1;
|
||||
if (valA === null && valB === null) return 0;
|
||||
|
||||
valA = typeof valA === 'string' ? valA.toLowerCase() : valA;
|
||||
valB = typeof valB === 'string' ? valB.toLowerCase() : valB;
|
||||
|
||||
if (typeof valA !== 'number' && !isNaN(valA)) valA = String(Number(valA));
|
||||
if (typeof valB !== 'number' && !isNaN(valB)) valB = String(Number(valB));
|
||||
|
||||
if (valA < valB) return -1 * modifier;
|
||||
if (valA > valB) return 1 * modifier;
|
||||
return 0;
|
||||
|
@@ -126,6 +126,7 @@ export const enUS = {
|
||||
insert: 'Insert',
|
||||
indexes: 'Indexes',
|
||||
foreignKeys: 'Foreign keys',
|
||||
tableChecks: 'Table checks',
|
||||
length: 'Length',
|
||||
unsigned: 'Unsigned',
|
||||
default: 'Default',
|
||||
@@ -190,12 +191,15 @@ export const enUS = {
|
||||
addNewField: 'Add new field',
|
||||
manageIndexes: 'Manage indexes',
|
||||
manageForeignKeys: 'Manage foreign keys',
|
||||
manageTableChecks: 'Manage table checks',
|
||||
allowNull: 'Allow NULL',
|
||||
zeroFill: 'Zero fill',
|
||||
customValue: 'Custom value',
|
||||
onUpdate: 'On update',
|
||||
deleteField: 'Delete field',
|
||||
createNewIndex: 'Create new index',
|
||||
createNewCheck: 'Create new check',
|
||||
checkClause: 'Check clause',
|
||||
addToIndex: 'Add to index',
|
||||
createNewTable: 'Create new table',
|
||||
emptyTable: 'Empty table',
|
||||
@@ -205,6 +209,7 @@ export const enUS = {
|
||||
emptyConfirm: 'Do you confirm to empty',
|
||||
thereAreNoIndexes: 'There are no indexes',
|
||||
thereAreNoForeign: 'There are no foreign keys',
|
||||
thereAreNoTableChecks: 'There are no table checks',
|
||||
createNewForeign: 'Create new foreign key',
|
||||
referenceTable: 'Ref. table',
|
||||
referenceField: 'Ref. field',
|
||||
|
@@ -61,7 +61,17 @@ export const ruRU = {
|
||||
actionSuccessful: '{action} успешно',
|
||||
outputFormat: 'Формат вывода',
|
||||
singleFile: 'Один {ext} файл',
|
||||
zipCompressedFile: 'ZIP сжатие {ext} файла'
|
||||
zipCompressedFile: 'ZIP сжатие {ext} файла',
|
||||
include: 'Включая',
|
||||
none: 'Нет',
|
||||
singleQuote: 'Одинарная кавычка',
|
||||
doubleQuote: 'Двойная кавычка',
|
||||
copyName: 'Скопировать имя',
|
||||
search: 'Поиск',
|
||||
title: 'Название',
|
||||
archive: 'Архив',
|
||||
undo: 'Отменить',
|
||||
moveTo: 'Переместить в'
|
||||
},
|
||||
connection: {
|
||||
connectionName: 'Название соединения',
|
||||
@@ -96,7 +106,10 @@ export const ruRU = {
|
||||
readOnlyMode: 'Режим только чтение',
|
||||
untrustedConnection: 'Ненадежное соединение',
|
||||
allConnections: 'Все соединения',
|
||||
searchForConnections: 'Поиск соединений'
|
||||
searchForConnections: 'Поиск соединений',
|
||||
keepAliveInterval: 'Интервал поддержания соединения',
|
||||
singleConnection: 'Одно соединение',
|
||||
connection: 'Соединение'
|
||||
},
|
||||
database: {
|
||||
schema: 'Схема',
|
||||
@@ -255,7 +268,16 @@ export const ruRU = {
|
||||
sqlExportOptions: 'Опции SQL экспорта',
|
||||
targetTable: 'Целевая таблица',
|
||||
importQueryErrors: 'Внимание: {n} ошибка возникла | Внимание: {n} ошибок произошло',
|
||||
executedQueries: '{n} запрос выполнен | {n} запросов выполнено'
|
||||
executedQueries: '{n} запрос выполнен | {n} запросов выполнено',
|
||||
insert: 'Вставить',
|
||||
materializedview: 'Материализованное представление | Материализованные представления',
|
||||
exportTable: 'Экспорт таблицы',
|
||||
createNewMaterializedView: 'Создать новое материализованное представление',
|
||||
newMaterializedView: 'Новое материализованное представление',
|
||||
switchDatabase: 'Переключить базу данных',
|
||||
searchForElements: 'Поиск элементов',
|
||||
searchForSchemas: 'Поиск схем',
|
||||
savedQueries: 'Сохранённые запросы'
|
||||
},
|
||||
application: {
|
||||
settings: 'Настройки',
|
||||
@@ -313,9 +335,9 @@ export const ruRU = {
|
||||
previousTab: 'Предыдущая вкладка',
|
||||
selectTabNumber: 'Выбрать вкладку под номером {param}',
|
||||
toggleConsole: 'Переключиться на консоль',
|
||||
addShortcut: 'Добавить горячие клавиши',
|
||||
editShortcut: 'Изменить горячие клавиши',
|
||||
deleteShortcut: 'Удалить горячие клавиши',
|
||||
addShortcut: 'Добавить горячую клавишу',
|
||||
editShortcut: 'Изменить горячую клавишу',
|
||||
deleteShortcut: 'Удалить горячую клавишу',
|
||||
restoreDefaults: 'Восстановить по-умолчанию',
|
||||
restoreDefaultsQuestion: 'Вы подтверждаете восстановление значений по-умолчанию?',
|
||||
registerAShortcut: 'Зарегистрировать горячие клавиши',
|
||||
@@ -329,13 +351,14 @@ export const ruRU = {
|
||||
openFilter: 'Открыть фильтр',
|
||||
nextResultsPage: 'Следующая страница',
|
||||
previousResultsPage: 'Предыдущая страница',
|
||||
editFolder: 'Изменить директорию',
|
||||
folderName: 'Название директории',
|
||||
deleteFolder: 'Удалить директорию',
|
||||
editFolder: 'Изменить папку',
|
||||
folderName: 'Название папки',
|
||||
deleteFolder: 'Удалить папки',
|
||||
editConnectionAppearance: 'Изменить внешний вид соединения',
|
||||
defaultCopyType: 'Тип копирования по-умолчанию',
|
||||
showTableSize: 'Показывать размер таблицы в сайдбаре',
|
||||
showTableSizeDescription: 'Только MySQL/MariaDB. Включение этого параметра может повлиять на производительность схемы с большим количеством таблиц.',
|
||||
showTableSizeDescription:
|
||||
'Только MySQL/MariaDB. Включение этого параметра может повлиять на производительность схемы с большим количеством таблиц.',
|
||||
searchForSchemas: 'Поиск схем',
|
||||
searchForElements: 'Поиск элементов',
|
||||
switchSearchMethod: 'Переключить способ поиска',
|
||||
@@ -343,7 +366,49 @@ export const ruRU = {
|
||||
closeOtherTabs: 'Закрыть остальные вкладки',
|
||||
closeTabsToLeft: 'Закрыть вкладки слева',
|
||||
closeTabsToRight: 'Закрыть вкладки справа',
|
||||
phpArray: 'PHP массив'
|
||||
phpArray: 'PHP массив',
|
||||
event: 'Событие',
|
||||
customIcon: 'Пользовательская иконка',
|
||||
fileName: 'Имя файла',
|
||||
choseFile: 'Выбрать файл',
|
||||
data: 'Данные',
|
||||
password: 'Пароль',
|
||||
required: 'Обязательный',
|
||||
newFolder: 'Новая папка',
|
||||
outOfFolder: 'Вне папки',
|
||||
csvFieldDelimiter: 'Разделитель полей CSV',
|
||||
csvLinesTerminator: 'Терминатор строк CSV',
|
||||
csvStringDelimiter: 'Разделитель строк CSV',
|
||||
csvIncludeHeader: 'Включить заголовок',
|
||||
csvExportOptions: 'Опции экспорта CSV',
|
||||
exportData: 'Экспорт данных',
|
||||
exportDataExplanation:
|
||||
'Экспорт сохранённых соединений в Antares. Вам будет предложено ввести пароль для шифрования экспортируемого файла.',
|
||||
importData: 'Импорт данных',
|
||||
importDataExplanation: 'Импортирует файл .antares, содержащий соединения. Вам нужно будет ввести пароль, заданный во время экспорта.',
|
||||
includeConnectionPasswords: 'Включить пароли соединений',
|
||||
includeFolders: 'Включить папки',
|
||||
encryptionPassword: 'Пароль шифрования',
|
||||
encryptionPasswordError: 'Пароль шифрования должен содержать не менее 8 символов.',
|
||||
ignoreDuplicates: 'Игнорировать дубликаты',
|
||||
wrongImportPassword: 'Неверный пароль импорта',
|
||||
wrongFileFormat: 'Неверный формат файла',
|
||||
dataImportSuccess: 'Данные успешно импортированы',
|
||||
note: 'Заметка | Заметки',
|
||||
thereAreNoNotesYet: 'Заметок пока нет',
|
||||
addNote: 'Добавить заметку',
|
||||
editNote: 'Редактировать заметку',
|
||||
saveAsNote: 'Сохранить как заметку',
|
||||
showArchivedNotes: 'Показать архивированные заметки',
|
||||
hideArchivedNotes: 'Скрыть архивированные заметки',
|
||||
tag: 'Тег',
|
||||
saveFile: 'Сохранить файл',
|
||||
saveFileAs: 'Сохранить файл как',
|
||||
openFile: 'Открыть файл',
|
||||
openNotes: 'Открыть заметки',
|
||||
debugConsole: 'Отладочная консоль',
|
||||
executedQueries: 'Выполненные запросы',
|
||||
sizeLimitError: 'Превышен максимальный размер {size}'
|
||||
},
|
||||
faker: {
|
||||
address: 'Адрес',
|
||||
|
@@ -1,18 +1,15 @@
|
||||
import { ConnectionParams, IpcResponse } from 'common/interfaces/antares';
|
||||
import { ipcRenderer } from 'electron';
|
||||
|
||||
import connStringConstruct from '../libs/connStringDecode';
|
||||
import { unproxify } from '../libs/unproxify';
|
||||
|
||||
export default class {
|
||||
static makeTest (params: ConnectionParams & { pgConnString?: string }): Promise<IpcResponse> {
|
||||
const newParams = connStringConstruct(params) as ConnectionParams;
|
||||
return ipcRenderer.invoke('test-connection', unproxify(newParams));
|
||||
static makeTest (params: ConnectionParams & { connString?: string }): Promise<IpcResponse> {
|
||||
return ipcRenderer.invoke('test-connection', unproxify(params));
|
||||
}
|
||||
|
||||
static connect (params: ConnectionParams & { pgConnString?: string }): Promise<IpcResponse> {
|
||||
const newParams = connStringConstruct(params) as ConnectionParams;
|
||||
return ipcRenderer.invoke('connect', unproxify(newParams));
|
||||
static connect (params: ConnectionParams & { connString?: string }): Promise<IpcResponse> {
|
||||
return ipcRenderer.invoke('connect', unproxify(params));
|
||||
}
|
||||
|
||||
static abortConnection (uid: string): void {
|
||||
|
@@ -36,6 +36,10 @@ export default class {
|
||||
return ipcRenderer.invoke('get-table-indexes', unproxify(params));
|
||||
}
|
||||
|
||||
static getTableChecks (params: { uid: string; schema: string; table: string }): Promise<IpcResponse> {
|
||||
return ipcRenderer.invoke('get-table-checks', unproxify(params));
|
||||
}
|
||||
|
||||
static getTableDll (params: { uid: string; schema: string; table: string }): Promise<IpcResponse<string>> {
|
||||
return ipcRenderer.invoke('get-table-ddl', unproxify(params));
|
||||
}
|
||||
|
@@ -1,50 +0,0 @@
|
||||
import { ConnectionParams } from 'common/interfaces/antares';
|
||||
import * as formatter from 'pg-connection-string'; // parses a connection string
|
||||
|
||||
const formatHost = (host: string) => {
|
||||
const results = host === 'localhost' ? '127.0.0.1' : host;
|
||||
return results;
|
||||
};
|
||||
|
||||
const checkForSSl = (conn: string) => {
|
||||
return conn.includes('ssl=true');
|
||||
};
|
||||
|
||||
const connStringConstruct = (args: ConnectionParams & { pgConnString?: string }): ConnectionParams => {
|
||||
if (!args.pgConnString)
|
||||
return args;
|
||||
|
||||
if (typeof args.pgConnString !== 'string')
|
||||
return args;
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const stringArgs: any = formatter.parse(args.pgConnString);
|
||||
|
||||
const client = args.client || 'pg';
|
||||
|
||||
args.client = client;
|
||||
args.host = formatHost(stringArgs.host);
|
||||
args.database = stringArgs.database;
|
||||
args.port = stringArgs.port || '5432';
|
||||
args.user = stringArgs.user;
|
||||
args.password = stringArgs.password;
|
||||
|
||||
// ssh
|
||||
args.ssh = stringArgs.ssh || args.ssh;
|
||||
args.sshHost = stringArgs.sshHost;
|
||||
args.sshUser = stringArgs.sshUser;
|
||||
args.sshPass = stringArgs.sshPass;
|
||||
args.sshKey = stringArgs.sshKey;
|
||||
args.sshPort = stringArgs.sshPort;
|
||||
|
||||
// ssl mode
|
||||
args.ssl = checkForSSl(args.pgConnString) || args.ssl;
|
||||
args.cert = stringArgs.sslcert;
|
||||
args.key = stringArgs.sslkey;
|
||||
args.ca = stringArgs.sslrootcert;
|
||||
args.ciphers = stringArgs.ciphers;
|
||||
|
||||
return args;
|
||||
};
|
||||
|
||||
export default connStringConstruct;
|
@@ -10,7 +10,7 @@ export interface QueryLog {
|
||||
}
|
||||
|
||||
export interface DebugLog {
|
||||
level: 'log' | 'info' | 'warn' | 'error';
|
||||
level: 'log' | 'info' | 'warn' | 'error' | string;
|
||||
process: 'renderer' | 'main' | 'worker';
|
||||
message: string;
|
||||
date: Date;
|
||||
|
@@ -1,6 +1,8 @@
|
||||
import { uidGen } from 'common/libs/uidGen';
|
||||
import { defineStore } from 'pinia';
|
||||
|
||||
import { useConsoleStore } from './console';
|
||||
|
||||
export interface Notification {
|
||||
uid: string;
|
||||
status: string;
|
||||
@@ -15,6 +17,13 @@ export const useNotificationsStore = defineStore('notifications', {
|
||||
addNotification (payload: { status: string; message: string }) {
|
||||
const notification: Notification = { uid: uidGen('N'), ...payload };
|
||||
this.notifications.unshift(notification);
|
||||
|
||||
useConsoleStore().putLog('debug', {
|
||||
level: notification.status,
|
||||
process: 'renderer',
|
||||
message: notification.message,
|
||||
date: new Date()
|
||||
});
|
||||
},
|
||||
removeNotification (uid: string) {
|
||||
this.notifications = (this.notifications as Notification[]).filter(item => item.uid !== uid);
|
||||
|
@@ -147,7 +147,7 @@ export const useWorkspacesStore = defineStore('workspaces', {
|
||||
else
|
||||
this.selectedWorkspace = uid;
|
||||
},
|
||||
async connectWorkspace (connection: ConnectionParams & { pgConnString?: string }, args?: {mode?: string; signal?: AbortSignal}) {
|
||||
async connectWorkspace (connection: ConnectionParams & { connString?: string }, args?: {mode?: string; signal?: AbortSignal}) {
|
||||
this.workspaces = (this.workspaces as Workspace[]).map(workspace => workspace.uid === connection.uid
|
||||
? {
|
||||
...workspace,
|
||||
@@ -427,7 +427,7 @@ export const useWorkspacesStore = defineStore('workspaces', {
|
||||
|
||||
this.selectTab({ uid, tab: 0 });
|
||||
},
|
||||
async switchConnection (connection: ConnectionParams & { pgConnString?: string }) {
|
||||
async switchConnection (connection: ConnectionParams & { connString?: string }) {
|
||||
await Connection.disconnect(connection.uid);
|
||||
return this.connectWorkspace(connection, { mode: 'switch' });
|
||||
},
|
||||
|
Reference in New Issue
Block a user