1
1
mirror of https://github.com/Fabio286/antares.git synced 2025-06-05 21:59:22 +02:00

Compare commits

..

40 Commits

Author SHA1 Message Date
2120a59d41 chore(release): 0.7.29-beta.2 2024-10-02 10:18:14 +02:00
2cda4a1fa1 fix(MySQL): missing exported values for DEFAULT_GENERATED table fields, fixes #854 2024-10-01 18:08:58 +02:00
76c8cd1beb Merge pull request #875 from mirrorb/master
fix(PostgreSQL): unable to change table comment to empty, error changing the comment for a specific table name
2024-09-30 18:12:02 +02:00
14aeebed9c feat(UI): new context menu and some minor improvements to query tabs, closes #867 2024-09-30 18:10:38 +02:00
mirrorb
1a1118452a Merge remote-tracking branch 'upstream/develop' 2024-09-30 11:22:46 +08:00
mirrorb
4b0f596405 Merge branch 'master' of https://github.com/antares-sql/antares 2024-09-30 11:05:02 +08:00
mirrorb
eb749f0f66 fix(PostgreSQL): error changing the comment for a specific table name 2024-09-30 11:02:26 +08:00
mirrorb
d78e59dd09 fix(PostgreSQL): unable to change table comment to empty 2024-09-30 10:57:19 +08:00
7969294a93 fix(MySQL): incorrect representation of the DATE if the year is prior to 1900, fixes #860 2024-09-29 13:50:22 +02:00
2ae016f0b6 chore(release): 0.7.29-beta.1 2024-09-28 15:50:38 +02:00
b4f33bc474 Merge branch 'develop' of https://github.com/antares-sql/antares into beta 2024-09-28 15:50:09 +02:00
f185463866 Merge branch 'master' of https://github.com/antares-sql/antares into develop 2024-09-28 15:46:48 +02:00
3fa0bd3cd1 Merge pull request #873 from antares-sql/all-contributors/add-mirrorb
docs: add mirrorb as a contributor for code
2024-09-28 15:46:16 +02:00
allcontributors[bot]
0d3ef39822 docs: update .all-contributorsrc [skip ci] 2024-09-28 13:46:03 +00:00
allcontributors[bot]
a02913f4e5 docs: update README.md [skip ci] 2024-09-28 13:46:02 +00:00
f9f993cbcd Merge pull request #872 from mirrorb/master
feat(PostgreSQL): table and field comments
2024-09-28 15:43:05 +02:00
mirrorb
ebd1a75445 feat(PostgreSQL): table and field comments 2024-09-27 17:43:54 +08:00
4201532081 Merge pull request #870 from antares-sql/all-contributors/add-zwei-c
docs: add zwei-c as a contributor for translation
2024-09-25 09:19:44 +02:00
allcontributors[bot]
c5cb586358 docs: update .all-contributorsrc [skip ci] 2024-09-25 07:19:18 +00:00
allcontributors[bot]
c111b2c0f5 docs: update README.md [skip ci] 2024-09-25 07:19:17 +00:00
b70ed124eb feat(translation): traditional chinese translation, closes #869 2024-09-25 09:18:37 +02:00
010147b553 chore(release): 0.7.29-beta.0 2024-09-23 09:12:15 +02:00
da8cc39157 fix: mismatch between table field columns and results with duplicate fields, fixes #848 2024-09-20 18:08:11 +02:00
37d44c95ee perf(UI): hide edit/delete functions in readonly mode 2024-09-18 16:42:21 +02:00
4df4c6197d Merge pull request #858 from Lawondyss/lawondyss
feat: update czech translation
2024-08-30 16:25:29 +02:00
Ladislav Vondráček
0506b653d7 feat: update czech translation 2024-08-30 15:22:19 +02:00
5fd9fe48a2 Merge pull request #853 from hatch01/master
build(deps): update various dependencies
2024-08-30 09:07:42 +02:00
b6a7124f33 feat: cancel button when waiting to connect database, closes #830 2024-08-28 18:05:04 +02:00
eymeric
5855ab0921 build(deps): update various dependencies 2024-08-26 22:15:47 +02:00
c2b602785a chore(release): 0.7.28 2024-08-20 17:48:59 +02:00
97279742e9 chore(release): 0.7.28-beta.0 2024-08-06 18:45:16 +02:00
6cb21ff792 fix: html tags searching in history or saved queries, fixes #847 2024-08-05 18:03:10 +02:00
72bacdeabf fix: disabled column sort during loadings 2024-08-05 18:02:24 +02:00
c434855879 fix(PostgreSQL): issue exporting tables with primary keys 2024-07-30 16:52:20 +02:00
ba0ffcc6f5 fix: wrong password message importing app data 2024-07-19 18:00:52 +02:00
8e7965a0f9 fix(PostgreSQL): wrong export formato of JSON fields 2024-07-19 18:00:13 +02:00
4aab84fbd5 Merge pull request #839 from 64knl/feat-update-dutch-string
feat: add missing Dutch strings
2024-07-18 09:15:00 +02:00
Rene
74e97e660d feat(translation): Add more faker translations 2024-07-16 14:56:15 +02:00
Rene
f5d236b521 fix(translation): Spelling error 2024-07-16 14:49:21 +02:00
Rene
e794d207ad feat: add missing Dutch strings 2024-07-16 14:36:35 +02:00
41 changed files with 11889 additions and 440 deletions

View File

@@ -293,6 +293,24 @@
"contributions": [
"code"
]
},
{
"login": "zwei-c",
"name": "CHANG, CHIH WEI",
"avatar_url": "https://avatars.githubusercontent.com/u/55912811?v=4",
"profile": "https://github.com/zwei-c",
"contributions": [
"translation"
]
},
{
"login": "mirrorb",
"name": "GaoChun",
"avatar_url": "https://avatars.githubusercontent.com/u/34116207?v=4",
"profile": "https://github.com/mirrorb",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,

View File

@@ -2,6 +2,67 @@
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.29-beta.2](https://github.com/antares-sql/antares/compare/v0.7.29-beta.1...v0.7.29-beta.2) (2024-10-02)
### Features
* **UI:** new context menu and some minor improvements to query tabs, closes [#867](https://github.com/antares-sql/antares/issues/867) ([14aeebe](https://github.com/antares-sql/antares/commit/14aeebed9cd8e475548f5e0ade105f4b11954cb2))
### Bug Fixes
* **MySQL:** incorrect representation of the DATE if the year is prior to 1900, fixes [#860](https://github.com/antares-sql/antares/issues/860) ([7969294](https://github.com/antares-sql/antares/commit/7969294a93a51861c57d4396c7a0d89ecc7e8a84))
* **MySQL:** missing exported values for DEFAULT_GENERATED table fields, fixes [#854](https://github.com/antares-sql/antares/issues/854) ([2cda4a1](https://github.com/antares-sql/antares/commit/2cda4a1fa1c80f3567e160caf0b93bc19d76fbaa))
* **PostgreSQL:** error changing the comment for a specific table name ([eb749f0](https://github.com/antares-sql/antares/commit/eb749f0f66bf6547053e30b1503c8b2990ae5950))
* **PostgreSQL:** unable to change table comment to empty ([d78e59d](https://github.com/antares-sql/antares/commit/d78e59dd0910d3ea6ec5183a8748420b2db57050))
### [0.7.29-beta.1](https://github.com/antares-sql/antares/compare/v0.7.29-beta.0...v0.7.29-beta.1) (2024-09-28)
### Features
* **PostgreSQL:** table and field comments ([ebd1a75](https://github.com/antares-sql/antares/commit/ebd1a7544594eb4498560cc64de4b94146ee8439))
* **translation:** traditional chinese translation, closes [#869](https://github.com/antares-sql/antares/issues/869) ([b70ed12](https://github.com/antares-sql/antares/commit/b70ed124eb753091a6afe637d75e59ee9771c8eb))
### [0.7.29-beta.0](https://github.com/antares-sql/antares/compare/v0.7.28...v0.7.29-beta.0) (2024-09-23)
### Features
* cancel button when waiting to connect database, closes [#830](https://github.com/antares-sql/antares/issues/830) ([b6a7124](https://github.com/antares-sql/antares/commit/b6a7124f33397a2ae7da654b5867f6982ac5810e))
* update czech translation ([0506b65](https://github.com/antares-sql/antares/commit/0506b653d74d8cd5e848bc2ec4d29d4b0247c880))
### Bug Fixes
* mismatch between table field columns and results with duplicate fields, fixes [#848](https://github.com/antares-sql/antares/issues/848) ([da8cc39](https://github.com/antares-sql/antares/commit/da8cc39157a4b507d3d377ee1e888b8f8a52b7c5))
### Improvements
* **UI:** hide edit/delete functions in readonly mode ([37d44c9](https://github.com/antares-sql/antares/commit/37d44c95ee559f3ee1345e91fca5e2c1e86c5fbf))
### [0.7.28](https://github.com/antares-sql/antares/compare/v0.7.28-beta.0...v0.7.28) (2024-08-20)
### [0.7.28-beta.0](https://github.com/antares-sql/antares/compare/v0.7.27...v0.7.28-beta.0) (2024-08-06)
### Features
* add missing Dutch strings ([e794d20](https://github.com/antares-sql/antares/commit/e794d207ad75e0f5380f57df579912893e5edb6a))
* **translation:** Add more faker translations ([74e97e6](https://github.com/antares-sql/antares/commit/74e97e660df089ed8273565942118e112f6b3220))
### Bug Fixes
* disabled column sort during loadings ([72bacde](https://github.com/antares-sql/antares/commit/72bacdeabf833880482a839c4735505573d33bdc))
* html tags searching in history or saved queries, fixes [#847](https://github.com/antares-sql/antares/issues/847) ([6cb21ff](https://github.com/antares-sql/antares/commit/6cb21ff7926c74469b421c47b434612b3894b4c2))
* **PostgreSQL:** issue exporting tables with primary keys ([c434855](https://github.com/antares-sql/antares/commit/c434855879de16f83e17784e38e931decdd94873))
* **PostgreSQL:** wrong export formato of JSON fields ([8e7965a](https://github.com/antares-sql/antares/commit/8e7965a0f94a17ed73d5c8913f66e4e9cf0b11c7))
* **translation:** Spelling error ([f5d236b](https://github.com/antares-sql/antares/commit/f5d236b521a3534754de0b1031513f8eb83b3cc0))
* wrong password message importing app data ([ba0ffcc](https://github.com/antares-sql/antares/commit/ba0ffcc6f56c5506c1768c05d43bb07f7b090a68))
### [0.7.27](https://github.com/antares-sql/antares/compare/v0.7.26...v0.7.27) (2024-07-16)

View File

@@ -152,6 +152,8 @@ 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/bagusindrayana"><img src="https://avatars.githubusercontent.com/u/36830534?v=4?s=100" width="100px;" alt="Bagus Indrayana"/><br /><sub><b>Bagus Indrayana</b></sub></a><br /><a href="https://github.com/antares-sql/antares/commits?author=bagusindrayana" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/penguinlab"><img src="https://avatars.githubusercontent.com/u/10959317?v=4?s=100" width="100px;" alt="Naoki Ishikawa"/><br /><sub><b>Naoki Ishikawa</b></sub></a><br /><a href="#translation-penguinlab" title="Translation">🌍</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://fazevedo.dev"><img src="https://avatars.githubusercontent.com/u/1640325?v=4?s=100" width="100px;" alt="Filipe Azevedo"/><br /><sub><b>Filipe Azevedo</b></sub></a><br /><a href="https://github.com/antares-sql/antares/commits?author=mangas" title="Code">💻</a></td>
<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>
</tr>
</tbody>
</table>

10499
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,7 +1,7 @@
{
"name": "antares",
"productName": "Antares",
"version": "0.7.27",
"version": "0.7.29-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",

View File

@@ -62,6 +62,7 @@ export const customizations: Customizations = {
indexes: true,
foreigns: true,
nullable: true,
comment: true,
tableArray: true,
procedureSql: '$procedure$\r\n\r\n$procedure$',
procedureContext: true,

View File

@@ -18,7 +18,7 @@ export type Importer = MySQLImporter | PostgreSQLImporter
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export interface IpcResponse<T = any> {
status: 'success' | 'error';
status: 'success' | 'error' | 'abort';
response?: T;
}

View File

@@ -40,7 +40,7 @@ export const objectToGeoJSON = (val: any) => {
export const escapeAndQuote = (val: string, client: ClientCode) => {
const { stringsWrapper: sw } = customizations[client];
// eslint-disable-next-line no-control-regex
const CHARS_TO_ESCAPE = /[\0\b\t\n\r\x1a"'\\]/g;
const CHARS_TO_ESCAPE = sw === '"' ? /[\0\b\t\n\r\x1a"'\\]/g : /[\0\b\t\n\r\x1a'\\]/g;
const CHARS_ESCAPE_MAP: Record<string, string> = {
'\0': '\\0',
'\b': '\\b',
@@ -48,10 +48,13 @@ export const escapeAndQuote = (val: string, client: ClientCode) => {
'\n': '\\n',
'\r': '\\r',
'\x1a': '\\Z',
'"': '\\"',
'\'': '\\\'',
'\\': '\\\\'
};
if (sw === '"')
CHARS_ESCAPE_MAP['"'] = '\\"';
let chunkIndex = CHARS_TO_ESCAPE.lastIndex = 0;
let escapedVal = '';
let match;
@@ -97,10 +100,19 @@ export const valueToSqlString = (args: {
}
else if ('isArray' in field && field.isArray) {
let localVal;
if (Array.isArray(val))
localVal = JSON.stringify(val).replaceAll('[', '{').replaceAll(']', '}');
else
localVal = typeof val === 'string' ? val.replaceAll('[', '{').replaceAll(']', '}') : '';
if (Array.isArray(val)) {
localVal = JSON
.stringify(val)
.replaceAll('[', '{')
.replaceAll(']', '}');
}
else {
localVal = typeof val === 'string'
? val
.replaceAll('[', '{')
.replaceAll(']', '}')
: '';
}
parsedValue = `'${localVal}'`;
}
else if (TEXT_SEARCH.includes(field.type))

View File

@@ -5,11 +5,21 @@ import { SslOptions } from 'mysql2';
import { ClientsFactory } from '../libs/ClientsFactory';
import { validateSender } from '../libs/misc/validateSender';
const isAborting: Record<string, boolean> = {};
export default (connections: Record<string, antares.Client>) => {
ipcMain.handle('test-connection', async (event, conn: antares.ConnectionParams) => {
if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
let isLocalAborted = false;
const abortChecker = setInterval(() => { // Intercepts abort request
if (isAborting[conn.uid]) {
isAborting[conn.uid] = false;
isLocalAborted = true;
clearInterval(abortChecker);
}
}, 50);
const params = {
host: conn.host,
port: +conn.port,
@@ -65,19 +75,27 @@ export default (connections: Record<string, antares.Client>) => {
client: conn.client,
params
});
await connection.connect();
if (conn.client === 'firebird')
connection.raw('SELECT rdb$get_context(\'SYSTEM\', \'DB_NAME\') FROM rdb$database');
else
await connection.select('1+1').run();
await connection.connect();
if (isLocalAborted) {
connection.destroy();
return;
}
await connection.ping();
connection.destroy();
clearInterval(abortChecker);
return { status: 'success' };
}
catch (err) {
return { status: 'error', response: err.toString() };
clearInterval(abortChecker);
if (!isLocalAborted)
return { status: 'error', response: err.toString() };
else
return { status: 'abort', response: 'Connection aborted' };
}
});
@@ -88,6 +106,15 @@ export default (connections: Record<string, antares.Client>) => {
ipcMain.handle('connect', async (event, conn: antares.ConnectionParams) => {
if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
let isLocalAborted = false;
const abortChecker = setInterval(() => { // Intercepts abort request
if (isAborting[conn.uid]) {
isAborting[conn.uid] = false;
isLocalAborted = true;
clearInterval(abortChecker);
}
}, 50);
const params = {
host: conn.host,
port: +conn.port,
@@ -150,18 +177,36 @@ export default (connections: Record<string, antares.Client>) => {
});
await connection.connect();
if (isLocalAborted) {
connection.destroy();
return { status: 'abort', response: 'Connection aborted' };
}
const structure = await connection.getStructure(new Set());
if (isLocalAborted) {
connection.destroy();
return { status: 'abort', response: 'Connection aborted' };
}
connections[conn.uid] = connection;
clearInterval(abortChecker);
return { status: 'success', response: structure };
}
catch (err) {
return { status: 'error', response: err.toString() };
clearInterval(abortChecker);
if (!isLocalAborted)
return { status: 'error', response: err.toString() };
else
return { status: 'abort', response: 'Connection aborted' };
}
});
ipcMain.on('abort-connection', (event, uid) => {
isAborting[uid] = true;
});
ipcMain.handle('disconnect', (event, uid) => {
if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };

View File

@@ -251,7 +251,7 @@ export default (connections: Record<string, antares.Client>) => {
setTimeout(() => { // Ensures that writing thread has finished
exporter?.terminate();
exporter = null;
}, 2000);
}, 500);
resolve({ status: 'success', response: payload });
break;
case 'cancel':

View File

@@ -109,6 +109,10 @@ export class FirebirdSQLClient extends BaseClient {
return firebird.pool(this._poolSize, { ...this._params, blobAsText: true });
}
ping () {
return this.raw('SELECT rdb$get_context(\'SYSTEM\', \'DB_NAME\') FROM rdb$database');
}
destroy () {
if (this._poolSize)
return (this._connection as firebird.ConnectionPool).destroy();

View File

@@ -214,6 +214,10 @@ export class MySQLClient extends BaseClient {
}
}
ping () {
return this.select('1+1').run();
}
destroy () {
this._connection.end();
clearInterval(this._keepaliveTimer);
@@ -228,12 +232,13 @@ export class MySQLClient extends BaseClient {
const dbConfig = await this.getDbConfig();
const connection = await mysql.createConnection({
...dbConfig,
typeCast: (field, next) => {
if (field.type === 'DATETIME')
return field.string();
else
return next();
}
dateStrings: true
// typeCast: (field, next) => {
// if (field.type === 'DATETIME')
// return field.string();
// else
// return next();
// }
});
return connection;
@@ -245,12 +250,13 @@ export class MySQLClient extends BaseClient {
...dbConfig,
connectionLimit: this._poolSize,
enableKeepAlive: true,
typeCast: (field, next) => {
if (field.type === 'DATETIME')
return field.string();
else
return next();
}
dateStrings: true
// typeCast: (field, next) => {
// if (field.type === 'DATETIME')
// return field.string();
// else
// return next();
// }
});
this._keepaliveTimer = setInterval(async () => {
@@ -657,7 +663,7 @@ export class MySQLClient extends BaseClient {
charset: field.CHARACTER_SET_NAME,
collation: field.COLLATION_NAME,
autoIncrement: field.EXTRA.includes('auto_increment'),
generated: field.EXTRA.toLowerCase().includes('generated'),
generated: ['VIRTUAL GENERATED', 'VIRTUAL STORED'].includes(field.EXTRA),
onUpdate: field.EXTRA.toLowerCase().includes('on update')
? field.EXTRA.substr(field.EXTRA.indexOf('on update') + 9, field.EXTRA.length).trim()
: '',

View File

@@ -243,6 +243,10 @@ export class PostgreSQLClient extends BaseClient {
return connection;
}
ping () {
return this.select('1+1').run();
}
destroy () {
this._connection.end();
clearInterval(this._keepaliveTimer);
@@ -494,16 +498,27 @@ export class PostgreSQLClient extends BaseClient {
column_default: string;
character_set_name: string;
collation_name: string;
column_comment: string;
}
/* eslint-enable camelcase */
const { rows } = await this
.select('*')
.schema('information_schema')
.from('columns')
.where({ table_schema: `= '${schema}'`, table_name: `= '${table}'` })
.orderBy({ ordinal_position: 'ASC' })
.run<TableColumnsResult>();
// Table columns
const { rows } = await this.raw<antares.QueryResult<TableColumnsResult>>(`
WITH comments AS (
SELECT attr.attname AS column, des.description AS comment, pgc.relname
FROM pg_attribute AS attr, pg_description AS des, pg_class AS pgc
WHERE pgc.oid = attr.attrelid
AND des.objoid = pgc.oid
AND pg_table_is_visible(pgc.oid)
AND attr.attnum = des.objsubid
)
SELECT cols.*, comments.comment AS column_comment
FROM "information_schema"."columns" AS cols
LEFT JOIN comments ON comments.column = cols.column_name AND comments.relname = cols.table_name
WHERE cols.table_schema = '${schema}'
AND cols.table_name = '${table}'
ORDER BY "ordinal_position" ASC
`);
return rows.map(field => {
let type = field.data_type;
@@ -532,7 +547,7 @@ export class PostgreSQLClient extends BaseClient {
collation: field.collation_name,
autoIncrement: false,
onUpdate: null,
comment: ''
comment: field.column_comment
};
});
}
@@ -591,8 +606,8 @@ export class PostgreSQLClient extends BaseClient {
}
/* eslint-enable camelcase */
if (schema !== 'public')
await this.use(schema);
// if (schema !== 'public')
await this.use(schema);
const { rows } = await this.raw<antares.QueryResult<ShowIntexesResult>>(`WITH ndx_list AS (
SELECT pg_index.indexrelid, pg_class.oid
@@ -636,35 +651,7 @@ export class PostgreSQLClient extends BaseClient {
}, {} as {table: string; schema: string}[]);
}
// eslint-disable-next-line @typescript-eslint/no-unused-vars
async getTableDll ({ schema, table }: { schema: string; table: string }) {
// const { rows } = await this.raw<antares.QueryResult<{'ddl'?: string}>>(`
// SELECT
// 'CREATE TABLE ' || relname || E'\n(\n' ||
// array_to_string(
// array_agg(' ' || column_name || ' ' || type || ' '|| not_null)
// , E',\n'
// ) || E'\n);\n' AS ddl
// FROM (
// SELECT
// a.attname AS column_name
// , pg_catalog.format_type(a.atttypid, a.atttypmod) AS type
// , CASE WHEN a.attnotnull THEN 'NOT NULL' ELSE 'NULL' END AS not_null
// , c.relname
// FROM pg_attribute a, pg_class c, pg_type t
// WHERE a.attnum > 0
// AND a.attrelid = c.oid
// AND a.atttypid = t.oid
// AND c.relname = '${table}'
// ORDER BY a.attnum
// ) AS tabledefinition
// GROUP BY relname
// `);
// if (rows.length)
// return rows[0].ddl;
// else return '';
/* eslint-disable camelcase */
interface SequenceRecord {
sequence_catalog: string;
@@ -706,6 +693,34 @@ export class PostgreSQLClient extends BaseClient {
if (!rows.length) return '';
const indexes = await this.getTableIndexes({ schema, table });
const primaryKey = indexes
.filter(i => i.type === 'PRIMARY')
.reduce((acc, cur) => {
if (!Object.keys(acc).length) {
cur.column = `"${cur.column}"`;
acc = cur;
}
else
acc.column += `, "${cur.column}"`;
return acc;
}, {} as { name: string; column: string; type: string});
const remappedIndexes = indexes
.filter(i => i.type !== 'PRIMARY')
.reduce((acc, cur) => {
const existingIndex = acc.findIndex(i => i.name === cur.name);
if (existingIndex >= 0)
acc[existingIndex].column += `, "${cur.column}"`;
else {
cur.column = `"${cur.column}"`;
acc.push(cur);
}
return acc;
}, [] as { name: string; column: string; type: string}[]);
for (const column of rows) {
let fieldType = column.data_type;
if (fieldType === 'USER-DEFINED') fieldType = `"${schema}".${column.udt_name}`;
@@ -733,6 +748,9 @@ export class PostgreSQLClient extends BaseClient {
columnsSql.push(columnArr.join(' '));
}
if (primaryKey)
columnsSql.push(`CONSTRAINT "${primaryKey.name}" PRIMARY KEY (${primaryKey.column})`);
// Table sequences
for (let sequence of sequences) {
if (sequence.includes('.')) sequence = sequence.split('.')[1];
@@ -749,25 +767,22 @@ export class PostgreSQLClient extends BaseClient {
INCREMENT BY ${rows[0].increment}
MINVALUE ${rows[0].minimum_value}
MAXVALUE ${rows[0].maximum_value}
CACHE 1;\n`;
CACHE 1;\n\n`;
}
}
// Table create
createSql += `\nCREATE TABLE "${schema}"."${table}"(
createSql += `CREATE TABLE "${schema}"."${table}"(
${columnsSql.join(',\n ')}
);\n`;
// Table indexes
createSql += '\n';
const { rows: indexes } = await this.select('*')
.schema('pg_catalog')
.from('pg_indexes')
.where({ schemaname: `= '${schema}'`, tablename: `= '${table}'` })
.run<{indexdef: string}>();
for (const index of indexes)
createSql += `${index.indexdef};\n`;
for (const index of remappedIndexes) {
if (index.type !== 'PRIMARY')
createSql += `CREATE ${index.type}${index.type === 'UNIQUE' ? ' INDEX' : ''} "${index.name}" ON "${schema}"."${table}" (${index.column});\n`;
}
return createSql;
}
@@ -869,6 +884,7 @@ export class PostgreSQLClient extends BaseClient {
const newIndexes: string[] = [];
const manageIndexes: string[] = [];
const newForeigns: string[] = [];
const modifyComment: string[] = [];
let sql = `CREATE TABLE "${schema}"."${options.name}"`;
@@ -884,6 +900,8 @@ export class PostgreSQLClient extends BaseClient {
${field.nullable ? 'NULL' : 'NOT NULL'}
${field.default !== null ? `DEFAULT ${field.default || '\'\''}` : ''}
${field.onUpdate ? `ON UPDATE ${field.onUpdate}` : ''}`);
if (field.comment != null)
modifyComment.push(`COMMENT ON COLUMN "${schema}"."${options.name}"."${field.name}" IS '${field.comment}'`);
});
// ADD INDEX
@@ -904,8 +922,12 @@ export class PostgreSQLClient extends BaseClient {
newForeigns.push(`CONSTRAINT "${foreign.constraintName}" FOREIGN KEY ("${foreign.field}") REFERENCES "${schema}"."${foreign.refTable}" ("${foreign.refField}") ON UPDATE ${foreign.onUpdate} ON DELETE ${foreign.onDelete}`);
});
sql = `${sql} (${[...newColumns, ...newIndexes, ...newForeigns].join(', ')})`;
if (manageIndexes.length) sql = `${sql}; ${manageIndexes.join(';')}`;
sql = `${sql} (${[...newColumns, ...newIndexes, ...newForeigns].join(', ')}); `;
if (manageIndexes.length) sql = `${sql} ${manageIndexes.join(';')}; `;
// TABLE COMMENT
if (options.comment != null) sql = `${sql} COMMENT ON TABLE "${schema}"."${options.name}" IS '${options.comment}'; `;
// FIELDS COMMENT
if (modifyComment.length) sql = `${sql} ${modifyComment.join(';')}; `;
return await this.raw(sql);
}
@@ -930,6 +952,7 @@ export class PostgreSQLClient extends BaseClient {
const renameColumns: string[] = [];
const createSequences: string[] = [];
const manageIndexes: string[] = [];
const modifyComment: string[] = [];
// ADD FIELDS
additions.forEach(addition => {
@@ -943,6 +966,8 @@ export class PostgreSQLClient extends BaseClient {
${addition.nullable ? 'NULL' : 'NOT NULL'}
${addition.default !== null ? `DEFAULT ${addition.default || '\'\''}` : ''}
${addition.onUpdate ? `ON UPDATE ${addition.onUpdate}` : ''}`);
if (addition.comment != null)
modifyComment.push(`COMMENT ON COLUMN "${schema}"."${table}"."${addition.name}" IS '${addition.comment}'`);
});
// ADD INDEX
@@ -995,6 +1020,8 @@ export class PostgreSQLClient extends BaseClient {
if (change.orgName !== change.name)
renameColumns.push(`ALTER TABLE "${schema}"."${table}" RENAME COLUMN "${change.orgName}" TO "${change.name}"`);
if (change.comment != null)
modifyComment.push(`COMMENT ON COLUMN "${schema}"."${table}"."${change.name}" IS '${change.comment}'`);
});
// CHANGE INDEX
@@ -1042,8 +1069,11 @@ export class PostgreSQLClient extends BaseClient {
if (alterColumns.length) sql += `ALTER TABLE "${schema}"."${table}" ${alterColumns.join(', ')}; `;
if (createSequences.length) sql = `${createSequences.join(';')}; ${sql}`;
if (manageIndexes.length) sql = `${manageIndexes.join(';')}; ${sql}`;
// TABLE COMMENT
if (options.comment != null) sql = `${sql} COMMENT ON TABLE "${schema}"."${table}" IS '${options.comment}'; `;
// FIELDS COMMENT
if (modifyComment.length) sql = `${sql} ${modifyComment.join(';')}; `;
if (options.name) sql += `ALTER TABLE "${schema}"."${table}" RENAME TO "${options.name}"; `;
// RENAME
if (renameColumns.length) sql = `${renameColumns.join(';')}; ${sql}`;

View File

@@ -35,6 +35,10 @@ export class SQLiteClient extends BaseClient {
});
}
ping () {
return this.select('1+1').run();
}
destroy () {
this._connection.close();
}

View File

@@ -336,7 +336,8 @@ CREATE TABLE \`${view.Name}\`(
const connection = await this._client.getConnection();
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const stream = (connection as any).connection.query(sql).stream();
const dispose = () => connection.end();
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const dispose = () => (connection as any).release();
stream.on('end', dispose);
stream.on('error', dispose);

View File

@@ -39,115 +39,7 @@ SET row_security = off;\n\n\n`;
}
async getCreateTable (tableName: string) {
/* eslint-disable camelcase */
interface SequenceRecord {
sequence_catalog: string;
sequence_schema: string;
sequence_name: string;
data_type: string;
numeric_precision: number;
numeric_precision_radix: number;
numeric_scale: number;
start_value: string;
minimum_value: string;
maximum_value: string;
increment: string;
cycle_option: string;
}
/* eslint-enable camelcase */
let createSql = '';
const sequences = [];
const columnsSql = [];
const arrayTypes: Record<string, string> = {
_int2: 'smallint',
_int4: 'integer',
_int8: 'bigint',
_float4: 'real',
_float8: 'double precision',
_char: '"char"',
_varchar: 'character varying'
};
// Table columns
const { rows } = await this._client.raw(`
SELECT *
FROM "information_schema"."columns"
WHERE "table_schema" = '${this.schemaName}'
AND "table_name" = '${tableName}'
ORDER BY "ordinal_position" ASC
`, { schema: 'information_schema' });
if (!rows.length) return '';
for (const column of rows) {
let fieldType = column.data_type;
if (fieldType === 'USER-DEFINED') fieldType = `"${this.schemaName}".${column.udt_name}`;
else if (fieldType === 'ARRAY') {
if (Object.keys(arrayTypes).includes(fieldType))
fieldType = arrayTypes[column.udt_name] + '[]';
else
fieldType = column.udt_name.replaceAll('_', '') + '[]';
}
const columnArr = [
`"${column.column_name}"`,
`${fieldType}${column.character_maximum_length ? `(${column.character_maximum_length})` : ''}`
];
if (column.column_default) {
columnArr.push(`DEFAULT ${column.column_default}`);
if (column.column_default.includes('nextval')) {
const sequenceName = column.column_default.split('\'')[1];
sequences.push(sequenceName);
}
}
if (column.is_nullable === 'NO') columnArr.push('NOT NULL');
columnsSql.push(columnArr.join(' '));
}
// Table sequences
for (let sequence of sequences) {
if (sequence.includes('.')) sequence = sequence.split('.')[1];
const { rows } = await this._client
.select('*')
.schema('information_schema')
.from('sequences')
.where({ sequence_schema: `= '${this.schemaName}'`, sequence_name: `= '${sequence}'` })
.run<SequenceRecord>();
if (rows.length) {
createSql += `CREATE SEQUENCE "${this.schemaName}"."${sequence}"
START WITH ${rows[0].start_value}
INCREMENT BY ${rows[0].increment}
MINVALUE ${rows[0].minimum_value}
MAXVALUE ${rows[0].maximum_value}
CACHE 1;\n`;
// createSql += `\nALTER TABLE "${sequence}" OWNER TO ${this._client._params.user};\n\n`;
}
}
// Table create
createSql += `\nCREATE TABLE "${this.schemaName}"."${tableName}"(
${columnsSql.join(',\n ')}
);\n`;
// createSql += `\nALTER TABLE "${tableName}" OWNER TO ${this._client._params.user};\n\n`;
// Table indexes
createSql += '\n';
const { rows: indexes } = await this._client
.select('*')
.schema('pg_catalog')
.from('pg_indexes')
.where({ schemaname: `= '${this.schemaName}'`, tablename: `= '${tableName}'` })
.run<{indexdef: string}>();
for (const index of indexes)
createSql += `${index.indexdef};\n`;
const createSql = await this._client.getTableDll({ schema: this.schemaName, table: tableName });
// Table foreigns
const { rows: foreigns } = await this._client.raw(`

View File

@@ -141,8 +141,11 @@ onMounted(() => {
while (node) {
if (node.nodeName.match(/^(input|textarea)$/i) || node.isContentEditable) {
InputMenu.popup({ window: getCurrentWindow() });
break;
if (!node.parentNode.className.split(' ').includes('editor-query')) {
InputMenu.popup({ window: getCurrentWindow() });
console.log(node.parentNode.className);
break;
}
}
node = node.parentNode;
}

View File

@@ -380,6 +380,7 @@ const startExport = async () => {
try {
const { status, response } = await Schema.export(params);
if (status === 'success')
progressStatus.value = response.cancelled ? t('general.aborted') : t('general.completed');
else {

View File

@@ -75,7 +75,7 @@
<code
class="cut-text"
:title="query.sql"
v-html="highlight(highlightWord(query.sql), {html: true})"
v-html="highlight(query.sql, {html: true})"
/>
</div>
<div class="tile-bottom-content">
@@ -210,17 +210,6 @@ const resizeResults = () => {
const refreshScroller = () => resizeResults();
const closeModal = () => emit('close');
const highlightWord = (string: string) => {
string = string.replaceAll('<', '&lt;').replaceAll('>', '&gt;');
if (searchTerm.value) {
const regexp = new RegExp(`(${searchTerm.value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')})`, 'gi');
return string.replace(regexp, '<span class="text-primary text-bold">$1</span>');
}
else
return string;
};
const onKey = (e: KeyboardEvent) => {
e.stopPropagation();
if (e.key === 'Escape')

View File

@@ -612,7 +612,7 @@ const otherContributors = computed(() => {
return contributors
.split(',')
.filter(c => !c.includes(appAuthor))
.sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()));
.sort((a, b) => a.toLowerCase().trim().localeCompare(b.toLowerCase()));
});
const selectTab = (tab: string) => {

View File

@@ -247,7 +247,7 @@ const exportData = () => {
const exportObj = encrypt(JSON.stringify({
connections: filteredConnections,
connectionsOrder: filteredOrders,
customIcons
customIcons: customIcons.value
}), options.value.passkey);
// console.log(exportObj, JSON.parse(decrypt(exportObj, options.value.passkey)));

View File

@@ -206,7 +206,6 @@ const importData = () => {
.includes(c.uid) ||
(c.isFolder && c.connections.every(c => newConnectionsUid.includes(c))));
}
importConnections(importObj);
addNotification({
@@ -216,6 +215,7 @@ const importData = () => {
closeModal();
}
catch (error) {
console.error(error);
addNotification({
status: 'error',
message: t('application.wrongImportPassword')
@@ -223,6 +223,7 @@ const importData = () => {
}
}
catch (error) {
console.error(error);
addNotification({
status: 'error',
message: t('application.wrongFileFormat')

View File

@@ -3,6 +3,7 @@
<div
:id="`editor-${id}`"
class="editor"
:class="editorClasses"
:style="{height: `${height}px`}"
/>
</div>
@@ -54,7 +55,8 @@ const props = defineProps({
schema: { type: String, default: '' },
autoFocus: { type: Boolean, default: false },
readOnly: { type: Boolean, default: false },
height: { type: Number, default: 200 }
height: { type: Number, default: 200 },
editorClasses: { type: String, default: '' }
});
const emit = defineEmits(['update:modelValue']);
@@ -405,18 +407,17 @@ defineExpose({ editor });
.ace_gutter-cell.ace_breakpoint {
&::before {
content: '\F0403';
content: '';
position: absolute;
left: 3px;
top: 2px;
color: var(--primary-color);
left: 0px;
top: 8px;
display: inline-block;
font: normal normal normal 24px/1 "Material Design Icons", sans-serif;
font-size: inherit;
text-rendering: auto;
line-height: inherit;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
width: 0;
height: 0;
border-left: 8px solid transparent;
border-top: 8px solid transparent;
border-right: 8px solid var(--primary-color);
transform: rotate(-45deg);
}
}
</style>

View File

@@ -32,7 +32,7 @@
v-if="note.type === 'query'"
ref="noteParagraph"
class="tile-paragraph sql"
v-html="highlight(highlightWord(note.note), {html: true})"
v-html="highlight(note.note, {html: true})"
/>
<div
v-else

View File

@@ -386,20 +386,35 @@
</div>
</div>
<div class="panel-footer">
<button
id="connection-test"
class="btn btn-gray mr-2 d-flex"
:class="{'loading': isTesting}"
:disabled="isBusy"
@click="startTest"
<div
@mouseenter="setCancelTestButtonVisibility(true)"
@mouseleave="setCancelTestButtonVisibility(false)"
>
<BaseIcon
icon-name="mdiLightningBolt"
:size="24"
class="mr-1"
/>
{{ t('connection.testConnection') }}
</button>
<button
v-if="showTestCancel && isTesting"
class="btn btn-gray mr-2 cancellable"
:title="t('general.cancel')"
@click="abortConnection()"
>
<BaseIcon icon-name="mdiWindowClose" :size="24" />
<span class="d-invisible pr-1">{{ t('connection.testConnection') }}</span>
</button>
<button
v-else
id="connection-test"
class="btn btn-gray mr-2 d-flex"
:class="{'loading': isTesting}"
:disabled="isBusy"
@click="startTest"
>
<BaseIcon
icon-name="mdiLightningBolt"
:size="24"
class="mr-1"
/>
{{ t('connection.testConnection') }}
</button>
</div>
<button
id="connection-save"
class="btn btn-primary mr-2 d-flex"
@@ -494,6 +509,8 @@ const firstInput: Ref<HTMLInputElement> = ref(null);
const isConnecting = ref(false);
const isTesting = ref(false);
const isAsking = ref(false);
const showTestCancel = ref(false);
const abortController: Ref<AbortController> = ref(new AbortController());
const selectedTab = ref('general');
const clientCustomizations = computed(() => {
@@ -516,6 +533,10 @@ const setDefaults = () => {
connection.value.database = clientCustomizations.value.defaultDatabase;
};
const setCancelTestButtonVisibility = (val: boolean) => {
showTestCancel.value = val;
};
const startTest = async () => {
isTesting.value = true;
@@ -526,7 +547,7 @@ const startTest = async () => {
const res = await Connection.makeTest(connection.value);
if (res.status === 'error')
addNotification({ status: 'error', message: res.response.message || res.response.toString() });
else
else if (res.status === 'success')
addNotification({ status: 'success', message: t('connection.connectionSuccessfullyMade') });
}
catch (err) {
@@ -537,13 +558,21 @@ const startTest = async () => {
}
};
const abortConnection = (): void => {
abortController.value.abort();
Connection.abortConnection(connection.value.uid);
isTesting.value = false;
isConnecting.value = false;
abortController.value = new AbortController();
};
const continueTest = async (credentials: { user: string; password: string }) => { // if "Ask for credentials" is true
isAsking.value = false;
const params = Object.assign({}, connection.value, credentials);
try {
if (isConnecting.value) {
await connectWorkspace(params);
await connectWorkspace(params, { signal: abortController.value.signal }).catch(() => undefined);
isConnecting.value = false;
}
else {

View File

@@ -387,20 +387,35 @@
</div>
</div>
<div class="panel-footer">
<button
id="connection-test"
class="btn btn-gray mr-2 d-flex"
:class="{'loading': isTesting}"
:disabled="isBusy"
@click="startTest"
<div
@mouseenter="setCancelTestButtonVisibility(true)"
@mouseleave="setCancelTestButtonVisibility(false)"
>
<BaseIcon
icon-name="mdiLightningBolt"
:size="24"
class="mr-1"
/>
{{ t('connection.testConnection') }}
</button>
<button
v-if="showTestCancel && isTesting"
class="btn btn-gray mr-2 cancellable"
:title="t('general.cancel')"
@click="abortConnection()"
>
<BaseIcon icon-name="mdiWindowClose" :size="24" />
<span class="d-invisible pr-1">{{ t('connection.testConnection') }}</span>
</button>
<button
v-else
id="connection-test"
class="btn btn-gray mr-2 d-flex"
:class="{'loading': isTesting}"
:disabled="isBusy"
@click="startTest"
>
<BaseIcon
icon-name="mdiLightningBolt"
:size="24"
class="mr-1"
/>
{{ t('connection.testConnection') }}
</button>
</div>
<button
id="connection-save"
class="btn btn-primary mr-2 d-flex"
@@ -414,20 +429,35 @@
/>
{{ t('general.save') }}
</button>
<button
id="connection-connect"
class="btn btn-success d-flex"
:class="{'loading': isConnecting}"
:disabled="isBusy"
@click="startConnection"
<div
@mouseenter="setCancelConnectButtonVisibility(true)"
@mouseleave="setCancelConnectButtonVisibility(false)"
>
<BaseIcon
icon-name="mdiConnection"
:size="24"
class="mr-1"
/>
{{ t('connection.connect') }}
</button>
<button
v-if="showConnectCancel && isConnecting"
class="btn btn-success cancellable"
:title="t('general.cancel')"
@click="abortConnection()"
>
<BaseIcon icon-name="mdiWindowClose" :size="24" />
<span class="d-invisible pr-1">{{ t('connection.connect') }}</span>
</button>
<button
v-else
id="connection-connect"
class="btn btn-success d-flex"
:class="{'loading': isConnecting}"
:disabled="isBusy"
@click="startConnection"
>
<BaseIcon
icon-name="mdiConnection"
:size="24"
class="mr-1"
/>
{{ t('connection.connect') }}
</button>
</div>
</div>
</div>
<ModalAskCredentials
@@ -476,6 +506,9 @@ const localConnection: Ref<ConnectionParams & { pgConnString: string }> = ref(nu
const isConnecting = ref(false);
const isTesting = ref(false);
const isAsking = ref(false);
const showTestCancel = ref(false);
const showConnectCancel = ref(false);
const abortController: Ref<AbortController> = ref(new AbortController());
const selectedTab = ref('general');
const clientCustomizations = computed(() => {
@@ -501,7 +534,7 @@ const startConnection = async () => {
if (localConnection.value.ask)
isAsking.value = true;
else {
await connectWorkspace(localConnection.value);
await connectWorkspace(localConnection.value, { signal: abortController.value.signal }).catch(() => undefined);
isConnecting.value = false;
}
};
@@ -516,7 +549,7 @@ const startTest = async () => {
const res = await Connection.makeTest(localConnection.value);
if (res.status === 'error')
addNotification({ status: 'error', message: res.response.message || res.response.toString() });
else
else if (res.status === 'success')
addNotification({ status: 'success', message: t('connection.connectionSuccessfullyMade') });
}
catch (err) {
@@ -527,20 +560,36 @@ const startTest = async () => {
}
};
const setCancelTestButtonVisibility = (val: boolean) => {
showTestCancel.value = val;
};
const setCancelConnectButtonVisibility = (val: boolean) => {
showConnectCancel.value = val;
};
const abortConnection = (): void => {
abortController.value.abort();
Connection.abortConnection(localConnection.value.uid);
isTesting.value = false;
isConnecting.value = false;
abortController.value = new AbortController();
};
const continueTest = async (credentials: {user: string; password: string }) => { // if "Ask for credentials" is true
isAsking.value = false;
const params = Object.assign({}, localConnection.value, credentials);
try {
if (isConnecting.value) {
const params = Object.assign({}, props.connection, credentials);
await connectWorkspace(params);
await connectWorkspace(params, { signal: abortController.value.signal }).catch(() => undefined);
isConnecting.value = false;
}
else {
const res = await Connection.makeTest(params);
if (res.status === 'error')
addNotification({ status: 'error', message: res.response.message || res.response.toString() });
else
else if (res.status === 'success')
addNotification({ status: 'success', message: t('connection.connectionSuccessfullyMade') });
}
}

View File

@@ -16,7 +16,7 @@
/> {{ t('general.run') }}</span>
</div>
<div
v-if="selectedMisc.type === 'trigger' && customizations.triggerEnableDisable"
v-if="selectedMisc.type === 'trigger' && customizations.triggerEnableDisable && !connection.readonly"
class="context-element"
@click="toggleTrigger"
>
@@ -36,7 +36,7 @@
</span>
</div>
<div
v-if="selectedMisc.type === 'scheduler'"
v-if="selectedMisc.type === 'scheduler' && !connection.readonly"
class="context-element"
@click="toggleScheduler"
>
@@ -63,7 +63,11 @@
:size="18"
/> {{ t('general.copyName') }}</span>
</div>
<div class="context-element" @click="showDeleteModal">
<div
v-if="!connection.readonly"
class="context-element"
@click="showDeleteModal"
>
<span class="d-flex">
<BaseIcon
class="text-light mt-1 mr-1"
@@ -117,6 +121,7 @@ import Routines from '@/ipc-api/Routines';
import Schedulers from '@/ipc-api/Schedulers';
import Triggers from '@/ipc-api/Triggers';
import { copyText } from '@/libs/copyText';
import { useConnectionsStore } from '@/stores/connections';
import { useNotificationsStore } from '@/stores/notifications';
import { useWorkspacesStore } from '@/stores/workspaces';
@@ -132,6 +137,7 @@ const emit = defineEmits(['close-context', 'reload']);
const { addNotification } = useNotificationsStore();
const workspacesStore = useWorkspacesStore();
const { getConnectionByUid } = useConnectionsStore();
const { getSelected: selectedWorkspace } = storeToRefs(workspacesStore);
@@ -154,6 +160,7 @@ const workspace = computed(() => {
const customizations = computed(() => {
return getWorkspace(selectedWorkspace.value).customizations;
});
const connection = computed(() => getConnectionByUid(selectedWorkspace.value));
const deleteMessage = computed(() => {
switch (props.selectedMisc.type) {

View File

@@ -3,7 +3,7 @@
:context-event="contextEvent"
@close-context="closeContext"
>
<div class="context-element">
<div v-if="!connection.readonly" class="context-element">
<span class="d-flex">
<BaseIcon
class="text-light mt-1 mr-1"
@@ -135,7 +135,7 @@
/> {{ t('database.export') }}</span>
</div>
<div
v-if="workspace.customizations.schemaImport"
v-if="workspace.customizations.schemaImport && !connection.readonly"
class="context-element"
@click="initImport"
>
@@ -147,7 +147,7 @@
/> {{ t('database.import') }}</span>
</div>
<div
v-if="workspace.customizations.schemaEdit"
v-if="workspace.customizations.schemaEdit && !connection.readonly"
class="context-element"
@click="showEditModal"
>
@@ -159,7 +159,7 @@
/> {{ t('database.editSchema') }}</span>
</div>
<div
v-if="workspace.customizations.schemaDrop"
v-if="workspace.customizations.schemaDrop && !connection.readonly"
class="context-element"
@click="showDeleteModal"
>
@@ -219,6 +219,7 @@ import ModalImportSchema from '@/components/ModalImportSchema.vue';
import Application from '@/ipc-api/Application';
import Schema from '@/ipc-api/Schema';
import { copyText } from '@/libs/copyText';
import { useConnectionsStore } from '@/stores/connections';
import { useNotificationsStore } from '@/stores/notifications';
import { useSchemaExportStore } from '@/stores/schemaExport';
import { useWorkspacesStore } from '@/stores/workspaces';
@@ -248,7 +249,9 @@ const workspacesStore = useWorkspacesStore();
const schemaExportStore = useSchemaExportStore();
const { showExportModal } = schemaExportStore;
const connectionsStore = useConnectionsStore();
const { getSelected: selectedWorkspace } = storeToRefs(workspacesStore);
const { getConnectionByUid } = connectionsStore;
const {
getWorkspace,
@@ -261,6 +264,7 @@ const isEditModal = ref(false);
const isImportSchemaModal = ref(false);
const workspace = computed(() => getWorkspace(selectedWorkspace.value));
const connection = computed(() => getConnectionByUid(selectedWorkspace.value));
const openCreateTableTab = () => {
emit('open-create-table-tab');

View File

@@ -60,7 +60,7 @@
/> {{ t('application.settings') }}</span>
</div>
<div
v-if="selectedTable && selectedTable.type === 'table' && customizations.tableDuplicate"
v-if="selectedTable && selectedTable.type === 'table' && customizations.tableDuplicate && !connection.readonly"
class="context-element"
@click="duplicateTable"
>
@@ -72,7 +72,7 @@
/> {{ t('database.duplicateTable') }}</span>
</div>
<div
v-if="selectedTable && selectedTable.type === 'table'"
v-if="selectedTable && selectedTable.type === 'table' && !connection.readonly"
class="context-element"
@click="showEmptyModal"
>
@@ -83,7 +83,11 @@
:size="18"
/> {{ t('database.emptyTable') }}</span>
</div>
<div class="context-element" @click="showDeleteModal">
<div
v-if="!connection.readonly"
class="context-element"
@click="showDeleteModal"
>
<span class="d-flex">
<BaseIcon
class="text-light mt-1 mr-1"
@@ -151,6 +155,7 @@ import BaseContextMenu from '@/components/BaseContextMenu.vue';
import BaseIcon from '@/components/BaseIcon.vue';
import Tables from '@/ipc-api/Tables';
import { copyText } from '@/libs/copyText';
import { useConnectionsStore } from '@/stores/connections';
import { useNotificationsStore } from '@/stores/notifications';
import { useSchemaExportStore } from '@/stores/schemaExport';
import { useWorkspacesStore } from '@/stores/workspaces';
@@ -168,6 +173,7 @@ const emit = defineEmits(['close-context', 'duplicate-table', 'reload', 'delete-
const { addNotification } = useNotificationsStore();
const workspacesStore = useWorkspacesStore();
const { showExportModal } = useSchemaExportStore();
const { getConnectionByUid } = useConnectionsStore();
const { getSelected: selectedWorkspace } = storeToRefs(workspacesStore);
@@ -185,6 +191,7 @@ const forceTruncate = ref(false);
const workspace = computed(() => getWorkspace(selectedWorkspace.value));
const customizations = computed(() => workspace.value && workspace.value.customizations ? workspace.value.customizations : null);
const connection = computed(() => getConnectionByUid(selectedWorkspace.value));
const showTableExportModal = () => {
showExportModal(props.selectedSchema, props.selectedTable.name);

View File

@@ -15,6 +15,7 @@
:schema="breadcrumbsSchema"
:is-selected="isSelected"
:height="editorHeight"
editor-classes="editor-query"
/>
<div ref="resizer" class="query-area-resizer" />
<div ref="queryAreaFooter" class="workspace-query-runner-footer">
@@ -253,6 +254,7 @@
v-if="results"
v-show="!isQuering"
ref="queryTable"
:is-quering="isQuering"
:results="results"
:tab-uid="tab.uid"
:conn-uid="connection.uid"
@@ -272,6 +274,7 @@
</template>
<script setup lang="ts">
import { getCurrentWindow, Menu } from '@electron/remote';
import { Ace } from 'ace-builds';
import { ConnectionParams } from 'common/interfaces/antares';
import { uidGen } from 'common/libs/uidGen';
@@ -474,6 +477,8 @@ const runQuery = async (query: string) => {
saveHistory(params);
if (!autocommit.value)
setUnsavedChanges({ uid: props.connection.uid, tUid: props.tabUid, isChanged: true });
queryEditor.value.editor.focus();
}
else
addNotification({ status: 'error', message: response });
@@ -738,7 +743,11 @@ const openFile = async () => {
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 || 'query'}.sql` });
const result: any = await Application.showSaveDialog({
filters: [{ name: 'SQL', extensions: ['sql'] }],
defaultPath: (!queryName.value.includes('.sql') ? `${queryName.value}.sql` :queryName.value) || 'query.sql'
});
if (result && !result.canceled) {
await Application.writeFile(result.filePath, query.value);
addNotification({ status: 'success', message: t('general.actionSuccessful', { action: t('application.saveFile') }) });
@@ -749,9 +758,13 @@ const saveFileAs = async () => {
};
const saveFile = async () => {
await Application.writeFile(filePath.value, query.value);
addNotification({ status: 'success', message: t('general.actionSuccessful', { action: t('application.saveFile') }) });
lastSavedQuery.value = toRaw(query.value);
if (filePath.value) {
await Application.writeFile(filePath.value, query.value);
addNotification({ status: 'success', message: t('general.actionSuccessful', { action: t('application.saveFile') }) });
lastSavedQuery.value = toRaw(query.value);
}
else
saveFileAs();
};
const loadFileContent = async (file: string) => {
@@ -784,6 +797,67 @@ onMounted(() => {
if (props.tab.filePath)
loadFileContent(props.tab.filePath);
queryEditor.value.editor.container.addEventListener('contextmenu', (e) => {
const InputMenu = Menu.buildFromTemplate([
{
label: t('general.run'),
click: () => runQuery(query.value)
},
{
label: t('general.clear'),
click: () => clear()
},
{
type: 'separator'
},
{
label: t('application.saveFile'),
click: () => saveFile()
},
{
label: t('application.saveFileAs'),
click: () => saveFileAs()
},
{
label: t('application.openFile'),
click: () => openFile()
},
{
type: 'separator'
},
{
label: t('general.cut'),
role: 'cut'
},
{
label: t('general.copy'),
role: 'copy'
},
{
label: t('general.paste'),
role: 'paste'
},
{
type: 'separator'
},
{
label: t('general.selectAll'),
role: 'selectAll'
}
]);
e.preventDefault();
// eslint-disable-next-line @typescript-eslint/no-explicit-any
let node: any = e.target;
while (node) {
if (node.nodeName.match(/^(input|textarea)$/i) || node.isContentEditable) {
InputMenu.popup({ window: getCurrentWindow() });
break;
}
node = node.parentNode;
}
});
});
onBeforeUnmount(() => {

View File

@@ -38,7 +38,7 @@
<div class="thead">
<div class="tr">
<div
v-for="(field, index) in fields"
v-for="(field, index) in filteredFields"
:key="index"
class="th c-hand"
:title="`${field.type} ${fieldLength(field) ? `(${fieldLength(field)})` : ''}`"
@@ -291,6 +291,7 @@ const { consoleHeight } = storeToRefs(consoleStore);
const props = defineProps({
results: Array as Prop<QueryResult[]>,
connUid: String,
isQuering: Boolean,
mode: String as Prop<'table' | 'query'>,
page: {
type: Number,
@@ -382,6 +383,11 @@ const sortedResults = computed(() => {
const resultsWithRows = computed(() => props.results.filter(result => result.rows.length));
const fields = computed(() => resultsWithRows.value.length ? resultsWithRows.value[resultsetIndex.value].fields : []);
const filteredFields = computed(() => fields.value.reduce((acc, cur) => {
if (acc.findIndex(f => JSON.stringify(f) === JSON.stringify(cur)))
acc.push(cur);
return acc;
}, [] as TableField[]));
const keyUsage = computed(() => resultsWithRows.value.length ? resultsWithRows.value[resultsetIndex.value].keys : []);
const fieldsObj = computed(() => {
@@ -790,7 +796,7 @@ const contextMenu = (event: MouseEvent, cell: any) => {
};
const sort = (field: TableField) => {
if (!isSortable.value) return;
if (!isSortable.value || props.isQuering) return;
selectedRows.value = [];
let fieldName = field.name;

View File

@@ -202,6 +202,7 @@
v-if="results"
ref="queryTable"
:results="results"
:is-quering="isQuering"
:page="page"
:tab-uid="tabUid"
:conn-uid="connection.uid"

View File

@@ -1,3 +1,13 @@
/**
* [TRANSLATION UPDATE HELPER]
* - Open a terminal in antares folder and run `npm run translation:check short-code` replacing short-code with the one you are updating.
* - The command will output which terms are missing or not translated from english.
* - Open antares folder with your editor of choice.
* - Go to antares/src/renderer/i18n/ and open the locale file you want to translate.
* - Add and translate missing terms and consider whether to translate untranslated terms.
*/
export const csCZ = {
general: { // General purpose terms
edit: 'Upravit',
@@ -18,7 +28,7 @@ export const csCZ = {
download: 'Stáhnout',
add: 'Přidat',
data: 'Data',
properties: 'Vlastnosti', // Lawondyss: Not used
properties: 'Vlastnosti',
name: 'Název',
clear: 'Vyčistit',
options: 'Možnosti',
@@ -39,6 +49,7 @@ export const csCZ = {
new: 'Nové',
select: 'Vybrat',
change: 'Změnit',
include: 'Včetně',
includes: 'Zahrnout',
completed: 'Dokončeno',
aborted: 'Zrušeno',
@@ -46,15 +57,15 @@ export const csCZ = {
enable: 'Zapnuto',
disable: 'Vypnout',
contributors: 'Přispěvatelé',
pin: 'Připnout', // Lawondyss: Not used
unpin: 'Odepnout', // Lawondyss: Not used
folder: 'Složka | Složky', // Lawondyss: Used only 1
pin: 'Připnout',
unpin: 'Odepnout',
folder: 'Složka | Složky',
none: 'Nic',
singleQuote: 'Apostrofy',
doubleQuote: 'Uvozovky',
deleteConfirm: 'Skutečně chcete smazat',
uploadFile: 'Nahrát soubor',
format: 'Formátovat', // Format code
format: 'Formátovat',
history: 'Historie',
filter: 'Filtrovat',
manualValue: 'Vlastní hodnota',
@@ -64,9 +75,16 @@ export const csCZ = {
actionSuccessful: '{action} úspěšný',
outputFormat: 'Formát výstupu',
singleFile: 'Jediný {ext} soubor',
zipCompressedFile: 'ZIP komprimovaný {ext} soubor'
zipCompressedFile: 'ZIP komprimovaný {ext} soubor',
copyName: 'Kopírovat název',
search: 'Hledat',
title: 'Titulek',
archive: 'Archivovat', // verb
undo: 'Zpět',
moveTo: 'Přesunout do'
},
connection: { // Database connection
connection: 'Připojení',
connectionName: 'Název',
hostName: 'Host',
client: 'Klient',
@@ -75,9 +93,9 @@ export const csCZ = {
password: 'Heslo',
credentials: 'Pověření',
connect: 'Připojit',
connected: 'Připojeno', // Lawondyss: Not used
connected: 'Připojeno',
disconnect: 'Odpojit',
disconnected: 'Odpojeno', // Lawondyss: Not used
disconnected: 'Odpojeno',
ssl: 'SSL',
enableSsl: 'Použít SSL',
privateKey: 'Soukromý klíč',
@@ -90,28 +108,30 @@ export const csCZ = {
enableSsh: 'Použít SSH',
connectionString: 'String připojení',
addConnection: 'Add connection',
createConnection: 'Vytvořit připojení', // Lawondyss: Not used
createConnection: 'Vytvořit připojení',
createNewConnection: 'Vytvořit nové připojení',
askCredentials: 'Vyžadovat přihlášení',
testConnection: 'Vyzkoušet',
editConnection: 'Upravit připojení', // Lawondyss: Not used
editConnection: 'Upravit připojení',
deleteConnection: 'Smazat připojení',
connectionSuccessfullyMade: 'Spojení úspěšně navázáno!',
readOnlyMode: 'Pouze pro čtení',
allConnections: 'Všechna připojení',
searchForConnections: 'Hledat připojení'
searchForConnections: 'Hledat připojení',
keepAliveInterval: 'Keep alive interval',
singleConnection: 'Jediné spojení'
},
database: { // Database related terms
schema: 'Schéma',
type: 'Typ',
insert: 'Vložit', // Lawondyss: Not used
insert: 'Vložit',
indexes: 'Indexy',
foreignKeys: 'Cizí klíče',
length: 'Délka',
unsigned: 'Unsigned',
default: 'Výchozí',
comment: 'Komentář',
key: 'Klíč | Klíče', // Lawondyss: Used only 2
key: 'Klíč | Klíče',
order: 'Pořadí',
expression: 'Výraz',
autoIncrement: 'Auto Increment',
@@ -119,8 +139,9 @@ export const csCZ = {
field: 'Sloupec | Sloupce',
approximately: 'Přibližně',
total: 'Celkem',
table: 'Tabulka | Tabulky', // Lawondyss: Used only without argument
view: 'Pohled | Pohledy', // Lawondyss: Used only without argument
table: 'Tabulka | Tabulky',
view: 'Pohled | Pohledy',
materializedview: 'Materializovaný pohled',
definer: 'Definér',
algorithm: 'Algoritmus',
trigger: 'Trigger | Triggery',
@@ -147,25 +168,25 @@ export const csCZ = {
row: 'Řádek | Řádky',
cell: 'Buňka | Buňky',
triggerFunction: 'Trigger funkce | Trigger funkce',
routine: 'Routina | Routiny', // Lawondyss: Not used
routine: 'Routina | Routiny',
drop: 'Drop',
commit: 'Commit',
rollback: 'Rollback',
ddl: 'DDL',
collation: 'Porovnání',
resultsTable: 'Tabulka výsledků',
unableEditFieldWithoutPrimary: 'Nelze upravit buňku bez primárního klíče ve výsledku', // Lawondyss: Not used
editCell: 'Upravit buňku', // Lawondyss: Not used
unableEditFieldWithoutPrimary: 'Nelze upravit buňku bez primárního klíče ve výsledku',
editCell: 'Upravit buňku',
deleteRows: 'Smazat řádek | Smazat {count} řádků',
confirmToDeleteRows: 'Skutečně chcete smazat řádek? | Skutečně chcete smazat {count} řádků?',
addNewRow: 'Přidat nový řádek', // Lawondyss: Not used
addNewRow: 'Přidat nový řádek',
numberOfInserts: 'Počet opakování',
affectedRows: 'Ovlivněno řádků',
createNewDatabase: 'Vytvořit novou databázi', // Lawondyss: Not used
databaseName: 'Název databáze', // Lawondyss: Not use
createNewDatabase: 'Vytvořit novou databázi',
databaseName: 'Název databáze',
serverDefault: 'Porovnání serveru',
deleteDatabase: 'Smazat databázi', // Lawondyss: Not used
editDatabase: 'Upravit databázi', // Lawondyss: Not used
deleteDatabase: 'Smazat databázi',
editDatabase: 'Upravit databázi',
clearChanges: 'Zrušit změny',
addNewField: 'Přidat nový sloupec',
manageIndexes: 'Správa indexů',
@@ -177,17 +198,18 @@ export const csCZ = {
deleteField: 'Smazat sloupec',
createNewIndex: 'Vytvořit nový index',
addToIndex: 'Přidat do indexu',
createNewTable: 'Vytvořit novou databázi', // Lawondyss: Not used
createNewTable: 'Vytvořit novou databázi',
emptyTable: 'Smazat obsah tabulky',
duplicateTable: 'Duplikovat tabulku',
deleteTable: 'Smazat tabulku',
exportTable: 'Exportovat tabulku',
emptyConfirm: 'Skutečně smazat obsah tabulky',
thereAreNoIndexes: 'Nemá žádné indexy',
thereAreNoForeign: 'Nemá žádné cizí klíče',
createNewForeign: 'Vytvořit nový cizí klíč',
referenceTable: 'Ref. tabulka',
referenceField: 'Ref. sloupec',
foreignFields: 'Cizí sloupce', // Lawondyss: Not used
foreignFields: 'Cizí sloupce',
invalidDefault: 'Neplatná výchozí hodnota',
onDelete: 'Při smazání',
selectStatement: 'Definice pohledu',
@@ -195,7 +217,8 @@ export const csCZ = {
sqlSecurity: 'SQL zabezpečení',
updateOption: 'Volba aktualizace',
deleteView: 'Smazat pohled',
createNewView: 'Vytvořit nový pohled', // Lawondyss: Not used
createNewView: 'Vytvořit nový pohled',
createNewMaterializedView: 'Vytvořit nový materializovaný pohled',
deleteTrigger: 'Smazat trigger',
createNewTrigger: 'Vytvořit nový trigger',
currentUser: 'Současný uživatel',
@@ -212,7 +235,7 @@ export const csCZ = {
createNewScheduler: 'Vytvořit nový scheduler',
deleteScheduler: 'Smazat scheduler',
preserveOnCompletion: 'Uchovat po dokončení',
tableFiller: 'Vyplňovač tabulky', // Lawondyss: Not used
tableFiller: 'Vyplňovač tabulky',
fakeDataLanguage: 'Jazyk pro fake data',
queryDuration: 'Doba trvání dotazu',
setNull: 'Nastavit NULL',
@@ -224,10 +247,11 @@ export const csCZ = {
editSchema: 'Upravit schéma',
deleteSchema: 'Smazat schema',
noSchema: 'Bez schématu',
runQuery: 'Spustit dotaz', // Lawondyss: Not used
runQuery: 'Spustit dotaz',
thereAreNoTableFields: 'Nemá žádné sloupce',
newTable: 'Nová tabulka',
newView: 'Nový pohled',
newMaterializedView: 'Nový materializovaný pohled',
newTrigger: 'Nový trigger',
newRoutine: 'Nová routina',
newFunction: 'Nová funkce',
@@ -244,17 +268,17 @@ export const csCZ = {
writingTableExport: 'Zapisuji data tabulky {table}',
checkAllTables: 'Vybrat všechny tabulky',
uncheckAllTables: 'Vybrat žádnou tabulku',
killQuery: 'Zabít dotaz', // Lawondyss: Not used
insertRow: 'Vložit řádek | Vložit řádky', // Lawondyss: Used only 2
killQuery: 'Zabít dotaz',
insertRow: 'Vložit řádek | Vložit řádky',
commitMode: 'Způsob commitování',
autoCommit: 'Auto commit',
manualCommit: 'Ruční commit',
importQueryErrors: 'Varování: došlo k chybě {n} | Varování: došlo k chybám {n}', // Lawondyss: Used without n argument
executedQueries: '{n} dotaz spuštěn | {n} dotazy spuštěny', // Lawondyss: Used withoum n argument
importQueryErrors: 'Varování: došlo k chybě {n} | Varování: došlo k chybám {n}',
executedQueries: '{n} dotaz spuštěn | {n} dotazy spuštěny',
disableFKChecks: 'Vypnout kontrolu cizích klíčů',
formatQuery: 'Formátovat dotaz', // Lawondyss: Not used, probably duplicate to general.format
queryHistory: 'Historie dotazů', // Lawondyss: Not used, probably duplicate to general.history
clearQuery: 'Clear query', // Lawondyss: Not used, probably duplicate to general.clear
formatQuery: 'Formátovat dotaz',
queryHistory: 'Historie dotazů',
clearQuery: 'Clear query',
fillCell: 'Vyplnit buňku',
executeSelectedQuery: 'Spustit vybraný dotaz',
noResultsPresent: 'Nejsou k dispozici žádné výsledky',
@@ -262,12 +286,11 @@ export const csCZ = {
targetTable: 'Cílová tabulka',
switchDatabase: 'Přepnout databázi',
searchForElements: 'Vyhledávání prvků',
searchForSchemas: 'Vyhledávání schémat'
searchForSchemas: 'Vyhledávání schémat',
savedQueries: 'Uložit dotazy'
},
application: { // Application related terms
settings: 'Nastavení',
scratchpad: 'Zápisník',
disableScratchpad: 'Vypnout zápisník',
console: 'Konzole',
general: 'Obecné',
themes: 'Motivy',
@@ -275,7 +298,7 @@ export const csCZ = {
about: 'Informace',
language: 'Jazyk',
shortcuts: 'Zkratky',
key: 'Klávesa | Klávesy', // Keyboard key // Lawondyss: Usedn only 2
key: 'Klávesa | Klávesy', // Keyboard key
event: 'Akce',
light: 'Světlý',
dark: 'Tmavý',
@@ -283,13 +306,19 @@ export const csCZ = {
application: 'Aplikace',
editor: 'Editor',
changelog: 'Changelog',
small: 'Malé', // Lawondyss: Not used, probably obsolete font size settings
medium: 'Střední', // Lawondyss: Not used, probably obsolete font size settings
large: 'Velké', // Lawondyss: Not used, probably obsolete font size settings
small: 'Malé',
medium: 'Střední',
large: 'Velké',
appearance: 'Vzhled',
color: 'Barva',
label: 'Název',
icon: 'Ikona',
customIcon: 'Vlastní ikona',
fileName: 'Soubor',
choseFile: 'Vybrat soubor',
data: 'Data',
password: 'Heslo',
required: 'Povinné',
madeWithJS: 'Vytvořeno s 💛 a JavaScriptem!',
checkForUpdates: 'Zkontrolovat aktualizace',
noUpdatesAvailable: 'Žádné dostupné aktualizace',
@@ -308,7 +337,7 @@ export const csCZ = {
editorTheme: 'Motiv editoru',
wrapLongLines: 'Zalamovat dlouhé řádky',
markdownSupported: 'Podporován Markdown',
plantATree: 'Zasaďte strom', // Lawondyss: Not used
plantATree: 'Zasaďte strom',
dataTabPageSize: 'Počet řádků na stránku',
noOpenTabs: 'Žádné otevřené karty, vyberte z elementů vlevo nebo:',
restorePreviousSession: 'Pamatovat si otevřené karty',
@@ -333,15 +362,16 @@ export const csCZ = {
saveContent: 'Uložit obsah',
openAllConnections: 'Otevřít všechna připojení',
openSettings: 'Otevřít nastavení',
openScratchpad: 'Otevřít zápisník',
runOrReload: 'Spustit dotaz',
openFilter: 'Otevřít filtr',
nextResultsPage: 'Další stránka výsledků',
previousResultsPage: 'Předešlá stránka výsledků',
editFolder: 'Upravit složku',
folderName: 'Název složky',
deleteFolder: 'Smazat složku', // Lawondyss: Not used
editConnectionAppearance: 'Upravit vzhled připojení', // Lawondyss: Not used
deleteFolder: 'Smazat složku',
newFolder: 'Nová složka',
outOfFolder: 'Mimo složku',
editConnectionAppearance: 'Upravit vzhled připojení',
defaultCopyType: 'Výchozí typ kopírování',
showTableSize: 'Velikost tabulky v panelu',
showTableSizeDescription: 'Pouze MySQL/MariaDB. Povolení této možnosti může ovlivnit výkon u schémat s mnoha tabulkami.',
@@ -356,7 +386,33 @@ export const csCZ = {
csvStringDelimiter: 'Obalit text',
csvIncludeHeader: 'Včetně hlavičky',
csvExportOptions: 'Možnosti CSV exportu',
scratchPadDefaultValue: '# JAK PODPOŘIT ANTARES\n\n- [ ] Dát Antares hvězdičku [GitHub repo](https://github.com/antares-sql/antares)\n- [ ] Poslat názor či radu\n- [ ] Nahlásit chybu\n- [ ] Pokud se líbí, sdílet Antares s přáteli\n\n# O ZÁPISNÍKU\n\nToto je zápisník, který uchovává vaše **osobní poznámky**. Podporuje `markdown` formát, ale můžete použít obyčejný text.\nTento obsah je pouze ukázky, neváhejte ho smazat, abyste si udělali místo na poznámky.\n'
exportData: 'Exportovat data',
exportDataExplanation: 'Export uložených připojení v Antaresu. Budete požádáni o zadání hesla pro zašifrování exportovaného souboru.',
importData: 'Importovat data',
importDataExplanation: 'Importuje soubor .antares obsahující připojení. Je třeba zadat heslo definované při exportu.',
includeConnectionPasswords: 'Včetně hesel připojení',
includeFolders: 'Včetně složek',
encryptionPassword: 'Heslo pro zašifrování souboru',
encryptionPasswordError: 'Heslo musí mít alespoň 8 znaků.',
ignoreDuplicates: 'Ignorovat duplicity',
wrongImportPassword: 'Chybné heslo pro import',
wrongFileFormat: 'Chybný formát souboru',
dataImportSuccess: 'Data úspěšně importována',
note: 'Poznámka',
thereAreNoNotesYet: 'Zatím tu nejsou žádné poznámky',
addNote: 'Přidat poznámku',
editNote: 'Upravit poznámku',
saveAsNote: 'Uložit jako poznámku',
showArchivedNotes: 'Zobrazit archivované poznámky',
hideArchivedNotes: 'Skrýt archivované poznámky',
tag: 'Tag', // Note tag
saveFile: 'Uložit soubor',
saveFileAs: 'Uložit do nového souboru',
openFile: 'Otevřít soubor',
openNotes: 'Otevřít poznámky',
debugConsole: 'Debug konzole', // <- console tab name
executedQueries: 'Log dotazů', // <- console tab name
sizeLimitError: 'Maximální velikost {size} překročena'
},
faker: { // Faker.js methods, used in random generated content
address: 'Address',

View File

@@ -17,6 +17,8 @@ import { ruRU } from './ru-RU';
import { ukUA } from './uk-UA';
import { viVN } from './vi-VN';
import { zhCN } from './zh-CN';
import { zhTW } from './zh-TW';
const messages = {
'en-US': enUS,
'it-IT': itIT,
@@ -34,7 +36,8 @@ const messages = {
'nl-NL': nlNL,
'ca-ES': caES,
'cs-CZ': csCZ,
'uk-UA': ukUA
'uk-UA': ukUA,
'zh-TW': zhTW
};
type NestedPartial<T> = {

View File

@@ -15,7 +15,7 @@ export const nlNL = {
results: 'Resultaten',
size: 'Grootte',
mimeType: 'Mime-Type',
download: 'Download',
download: 'Download', // Same as English
add: 'Toevoegen',
data: 'Data',
properties: 'Eigenschappen',
@@ -65,7 +65,13 @@ export const nlNL = {
outputFormat: 'Uitvoerformaat',
singleFile: 'Enkel {ext}-bestand',
zipCompressedFile: 'ZIP gecomprimeerd {ext}-bestand',
include: 'Inclusief'
include: 'Inclusief',
search: 'Zoek',
copyName: 'Kopieer naam',
title: 'Titel',
archive: 'Archief',
undo: 'Ongedaan maken',
moveTo: 'Verplaats naar'
},
connection: {
connectionName: 'Naam verbinding',
@@ -100,7 +106,10 @@ export const nlNL = {
readOnlyMode: 'Alleen lezen modus',
untrustedConnection: 'Niet vertrouwde verbinding',
allConnections: 'Alle verbindingen',
searchForConnections: 'Zoek naar verbindingen'
searchForConnections: 'Zoek naar verbindingen',
singleConnection: 'Enkele verbinding',
connection: 'Verbinding',
keepAliveInterval: 'Keep alive interval'
},
database: {
schema: 'Schema',
@@ -260,7 +269,15 @@ export const nlNL = {
targetTable: 'Doeltabel',
switchDatabase: 'Wissel van database',
importQueryErrors: 'Waarschuwing: {n} fout is opgetreden | Waarschuwing: {n} fouten opgetreden',
executedQueries: '{n} query uitgevoerd | {n} queries uitgevoerd'
executedQueries: '{n} query uitgevoerd | {n} queries uitgevoerd',
insert: 'Invoegen',
exportTable: 'Exporteer tabel',
savedQueries: 'Opgeslagen queries',
searchForElements: 'Zoek naar elementen',
searchForSchemas: 'Zoek naar schema\'s',
materializedview: 'Materialized view | Materialized views',
createNewMaterializedView: 'Materialized view maken',
newMaterializedView: 'Nieuwe materialized view'
},
application: {
settings: 'Instellingen',
@@ -367,7 +384,30 @@ export const nlNL = {
wrongFileFormat: 'Bestand is geen geldig .antares bestand',
required: 'Verplicht',
choseFile: 'Selecteer bestand',
password: 'Wachtwoord'
password: 'Wachtwoord',
note: 'Notitie',
data: 'Data',
event: 'Event',
key: 'Key',
customIcon: 'Aangepast pictogram',
fileName: 'bestandsnaam',
newFolder: 'Nieuwe map',
outOfFolder: 'Out of folder',
dataImportSuccess: 'Data succesvol geïmporteerd',
thereAreNoNotesYet: 'Er zijn nog geen notities',
addNote: 'Voeg notitie toe',
editNote: 'Bewerk notitie',
saveAsNote: 'Sla op als notitie',
showArchivedNotes: 'Toon gearchiveerde notities',
hideArchivedNotes: 'Verberg gearchiveerde notities',
tag: 'Tag',
saveFile: 'Bestand opslaan',
saveFileAs: 'Bestand opslaan als',
openFile: 'Open bestand',
openNotes: 'Open notities',
debugConsole: 'Debug Console',
executedQueries: 'Voer queries uit',
sizeLimitError: 'Maximum grootte {size} overschreden'
},
faker: {
address: 'Adres',
@@ -434,7 +474,7 @@ export const nlNL = {
engine: 'Engine',
past: 'Verleden',
now: 'Nu',
future: 'Future',
future: 'Toekomstig',
between: 'Between',
recent: 'Recent',
soon: 'Soon',
@@ -447,11 +487,11 @@ export const nlNL = {
amount: 'Amount',
transactionType: 'Transaction type',
currencyCode: 'Currency code',
currencyName: 'Currency name',
currencySymbol: 'Currency symbol',
bitcoinAddress: 'Bitcoin address',
litecoinAddress: 'Litecoin address',
creditCardNumber: 'Credit card number',
currencyName: 'Valutanaam',
currencySymbol: 'Valutateken',
bitcoinAddress: 'Bitcoin adres',
litecoinAddress: 'Litecoin adres',
creditCardNumber: 'Credit card nummer',
creditCardCVV: 'Credit card CVV',
ethereumAddress: 'Ethereum adres',
iban: 'IBAN',
@@ -487,10 +527,10 @@ export const nlNL = {
sentence: 'Zin',
slug: 'Slug',
sentences: 'Zinnen',
paragraph: 'Paragraph',
paragraphs: 'Paragraphs',
text: 'Text',
lines: 'Lines',
paragraph: 'Paragraaf',
paragraphs: 'Paragrafen',
text: 'Tekst',
lines: 'Regels',
genre: 'Genre',
firstName: 'Voornaam',
lastName: 'Achternaam',
@@ -500,7 +540,7 @@ export const nlNL = {
gender: 'Gender',
prefix: 'Prefix',
suffix: 'Suffix',
title: 'Title',
title: 'Titel',
jobDescriptor: 'Job descriptor',
jobArea: 'Job area',
jobType: 'Job type',
@@ -514,24 +554,24 @@ export const nlNL = {
objectElement: 'Object element',
uuid: 'Uuid',
boolean: 'Boolean',
image: 'Image',
image: 'Afbeelding',
locale: 'Locale',
alpha: 'Alpha',
alphaNumeric: 'Alphanumeric',
hexaDecimal: 'Hexadecimal',
fileName: 'File name',
alphaNumeric: 'Alfanumeriek',
hexaDecimal: 'Hexadecimaal',
fileName: 'Bestandsnaam',
commonFileName: 'Common file name',
mimeType: 'Mime type',
commonFileType: 'Common file type',
commonFileExt: 'Common file extension',
fileType: 'File type',
fileType: 'Filetype',
fileExt: 'File extension',
directoryPath: 'Directory path',
filePath: 'File path',
semver: 'Semver',
manufacturer: 'Manufacturer',
manufacturer: 'Fabrikant',
model: 'Model',
fuel: 'Fuel',
fuel: 'Brandstof',
vin: 'Vin'
}
};

View File

@@ -9,6 +9,7 @@ export const localesNames: Record<string, string> = {
'vi-VN': 'Tiếng Việt',
'ja-JP': '日本語',
'zh-CN': '简体中文',
'zh-TW': '正體中文',
'ru-RU': 'Русский',
'id-ID': 'Bahasa Indonesia',
'ko-KR': '한국어',

569
src/renderer/i18n/zh-TW.ts Normal file
View File

@@ -0,0 +1,569 @@
export const zhTW = {
general: {
// 通用術語
edit: '編輯',
save: '保存',
close: '關閉',
delete: '刪除',
confirm: '確定',
cancel: '取消',
send: '發送',
refresh: '重新整理',
autoRefresh: '自動重新整理',
version: '版本',
donate: '捐贈',
run: '執行',
results: '結果',
size: '大小',
mimeType: 'MIME類型',
download: '下載',
add: '新增',
data: '資料',
properties: '屬性',
name: '名稱',
clear: '清除',
options: '選項',
insert: '插入',
discard: '丟棄',
stay: '等待',
author: '作者',
upload: '上傳',
browse: '瀏覽',
content: '內容',
cut: '剪下',
copy: '複製',
paste: '貼上',
duplicate: '副本',
tools: '工具',
seconds: '秒',
all: '全部',
new: '新',
select: '選擇',
change: '變更',
include: '包含',
includes: '包含',
completed: '已完成',
aborted: '中止',
disabled: '已禁用',
enable: '啟用',
disable: '禁用',
contributors: '貢獻者',
pin: '固定',
unpin: '取消固定',
folder: '檔案夾 | 檔案夾',
none: '無',
singleQuote: '單引號',
doubleQuote: '雙引號',
deleteConfirm: '您是否確認取消',
uploadFile: '上傳檔案',
format: '格式碼', // 格式碼
history: '曆史',
filter: '過濾器',
manualValue: '手動值',
selectAll: '選擇全部',
pageNumber: '頁數',
directoryPath: '目錄路徑',
actionSuccessful: '{action} 成功',
outputFormat: '輸出格式',
singleFile: '單個 {ext} 檔案',
zipCompressedFile: 'ZIP 壓縮 {ext} 檔案',
copyName: '複製名稱',
search: '搜索',
title: '標題',
archive: '封存',
undo: '重做',
moveTo: '移動到'
},
connection: {
// 資料庫連接
connection: '連線',
connectionName: '連線名稱',
hostName: '主機名',
client: '資料庫類型',
port: '連線埠',
user: '使用者',
password: '密碼',
credentials: '憑證',
connect: '連線',
connected: '已連線',
disconnect: '斷開連線',
disconnected: '斷開連線',
ssl: 'SSL',
enableSsl: '啟用 SSL',
privateKey: '私鑰',
certificate: '證書',
caCertificate: 'CA 證書',
ciphers: '密碼',
untrustedConnection: '不受信任的連線',
passphrase: '密碼提示',
sshTunnel: 'SSH 通道',
enableSsh: '啟用 SSH',
connectionString: '連接字符串',
addConnection: '新增連線',
createConnection: '建立連線',
createNewConnection: '建立新連線',
askCredentials: '詢問憑據',
testConnection: '測試連線',
editConnection: '編輯連線',
deleteConnection: '刪除連線',
connectionSuccessfullyMade: '連線成功了!',
readOnlyMode: '唯讀模式',
allConnections: '所有連線',
searchForConnections: '搜索連線',
keepAliveInterval: '保持活躍間隔',
singleConnection: '單一連線'
},
database: {
// 資料庫庫相關術語
schema: '模式(schema)',
type: '類型',
insert: '插入',
indexes: '索引',
foreignKeys: '外鍵',
length: '長度',
unsigned: '無符號',
default: '預設',
comment: '註釋',
key: '鍵 | 鍵',
order: '排序',
expression: '表達式',
autoIncrement: '自動增量',
engine: '引擎',
field: '字段 | 字段',
approximately: '大約',
total: '總計',
table: '表 | 表',
view: '視圖 | 視圖',
definer: '定義者',
algorithm: '算法',
trigger: '觸發器 | 觸發器',
storedRoutine: '存儲例程 | 存儲例程',
scheduler: '調度器 | 調度器',
event: '事件',
parameters: '參數',
function: '函數 | 函數',
deterministic: '確定的',
context: '上下文',
export: '匯出',
import: '匯入',
returns: '回傳',
timing: '定時',
state: '狀態',
execution: '執行',
starts: '開始',
ends: '結束',
variables: '變數',
processes: '進程',
database: '資料庫',
array: '數據',
structure: '結構',
row: '行 | 行',
cell: '單元格 | 單元格',
triggerFunction: '觸發器函數 | 觸發器函數',
routine: '例程 | 例程',
drop: 'Drop',
commit: '提交',
rollback: '回滾',
ddl: '資料定義語言',
collation: '排序規則',
resultsTable: '結果表',
unableEditFieldWithoutPrimary: '無法編輯結果集中一個沒有主鍵的字段',
editCell: '編輯單元格',
deleteRows: '刪除行 | 刪除 {count} 行',
confirmToDeleteRows: '您是否確認要刪除一行? | 您是否確認要刪除 {count} 行?',
addNewRow: '新增行',
numberOfInserts: '插入的數量',
affectedRows: '受影響的行',
createNewDatabase: '建立新資料庫',
databaseName: '資料庫名稱',
serverDefault: '預設伺服器',
deleteDatabase: '刪除資料庫',
editDatabase: '編輯資料庫',
clearChanges: '清除變更',
addNewField: '新增新字段',
manageIndexes: '管理索引',
manageForeignKeys: '管理外鍵',
allowNull: '允許 NULL',
zeroFill: 'zeroFill',
customValue: '自定義值',
onUpdate: '在更新',
deleteField: '刪除字段',
createNewIndex: '建立新索引',
addToIndex: '新增到索引',
createNewTable: '建立新表',
emptyTable: '清空表',
duplicateTable: '重複表',
deleteTable: '刪除表',
exportTable: '導出表',
emptyConfirm: '您是否確認清空',
thereAreNoIndexes: '沒有索引',
thereAreNoForeign: '沒有外鍵',
createNewForeign: '建立新外鍵',
referenceTable: '參考表',
referenceField: '參考字段',
foreignFields: '外鍵字段',
invalidDefault: '無效預設值',
onDelete: '在刪除',
selectStatement: '選擇語句',
triggerStatement: '觸發器語句',
sqlSecurity: 'SQL 安全',
updateOption: '更新選項',
deleteView: '刪除視圖',
createNewView: '建立新視圖',
deleteTrigger: '刪除觸發器',
createNewTrigger: '建立新觸發器',
currentUser: '當前使用者',
routineBody: '例程主體',
dataAccess: '數據訪問',
thereAreNoParameters: '沒有參數',
createNewParameter: '建立新參數',
createNewRoutine: '建立新存儲例程',
deleteRoutine: '刪除存儲例程',
functionBody: '函數體',
createNewFunction: '建立新函數',
deleteFunction: '刪除函數',
schedulerBody: '調度器主體',
createNewScheduler: '建立新調度器',
deleteScheduler: '刪除調度器',
preserveOnCompletion: '完成時保留',
tableFiller: '表填充器',
fakeDataLanguage: '僞造的數據語言',
queryDuration: '查詢持續時間',
setNull: '設定 NULL',
processesList: '進程列表',
processInfo: '進程信息',
manageUsers: '管理使用者',
createNewSchema: '建立新模式(schema)',
schemaName: '模式名稱',
editSchema: '編輯模式',
deleteSchema: '刪除模式',
noSchema: '沒有模式',
runQuery: '運行查詢',
thereAreNoTableFields: '沒有表的字段',
newTable: '新表',
newView: '新視圖',
newTrigger: '新觸發器',
newRoutine: '新例程',
newFunction: '新函數',
newScheduler: '新調度器',
newTriggerFunction: '新觸發器函數',
thereAreNoQueriesYet: '目前還沒有任何查詢',
searchForQueries: '搜索查詢',
killProcess: '終止進程',
exportSchema: '導出模式(schema)',
importSchema: '導入模式(schema)',
newInsertStmtEvery: '每條新的 INSERT 語句',
processingTableExport: '處理 {table}',
fetchingTableExport: '正在獲取 {table} 數據',
writingTableExport: '正在寫入 {table} 數據',
checkAllTables: '檢查所有表',
uncheckAllTables: '不檢查所有表',
killQuery: '終止查詢',
insertRow: '插入單行 | 插入多行',
commitMode: '提交模式',
autoCommit: '自動提交',
manualCommit: '手動提交',
importQueryErrors: '警告: 發生了 {n} 個錯誤 | 警告: 發生了 {n} 個錯誤',
executedQueries: '{n} 個查詢已執行 | {n} 個查詢已執行',
disableFKChecks: '禁用外鍵檢查',
formatQuery: '格式查詢',
queryHistory: '查詢曆史',
clearQuery: '清除查詢',
fillCell: '填充單元格',
executeSelectedQuery: '執行所選查詢',
noResultsPresent: '沒有結果',
sqlExportOptions: 'SQL 導出選項',
targetTable: '目標表',
switchDatabase: '切換資料庫',
searchForElements: '搜索元素',
searchForSchemas: '搜索模式(schema)',
savedQueries: '已保存的查詢'
},
application: {
// 應用程式相關術語
settings: '設定',
console: '控製臺',
general: '常規',
themes: '主題',
update: '更新',
about: '關於',
language: '語言',
shortcuts: '捷徑',
key: '按鍵 | 按鍵', // 鍵盤按鍵
event: '事件',
light: '明亮',
dark: '暗黑',
autoCompletion: '自動完成',
application: '應用程式',
editor: '編輯器',
changelog: '變更日誌',
small: '小',
medium: '中',
large: '大',
appearance: '外觀',
color: '顔色',
label: '標簽',
icon: '圖示',
fileName: '檔案名稱',
choseFile: '選擇檔案',
data: '數據',
password: '密碼',
required: '依賴',
madeWithJS: '使用 💛 和 JavaScript 製作!',
checkForUpdates: '檢查更新',
noUpdatesAvailable: '無可用更新',
checkingForUpdate: '正在檢查更新',
checkFailure: '檢查失敗,請稍後再試',
updateAvailable: '可用更新',
downloadingUpdate: '正在下載更新',
updateDownloaded: '已下載更新',
restartToInstall: '重啟 Antares 以進行安裝',
includeBetaUpdates: '包含測試版更新',
notificationsTimeout: '通知超時',
openNewTab: '打開一個新標簽',
unsavedChanges: '未保存的變更',
discardUnsavedChanges: '您有一些未保存的變更, 關閉此標簽將放棄這些變更.',
applicationTheme: '應用程式主題',
editorTheme: '編輯器主題',
wrapLongLines: '將長行換行顯示',
markdownSupported: '支援 Markdown',
plantATree: '種植一棵樹',
dataTabPageSize: '資料標簽的頁面大小',
noOpenTabs: '沒有打開的標簽, 請在左側欄上導航或:',
restorePreviousSession: '恢複上一個會話',
closeTab: '關閉標簽',
goToDownloadPage: '轉到下載頁面',
disableBlur: '禁用模糊',
missingOrIncompleteTranslation: '有缺失或不完整的翻譯?',
findOutHowToContribute: '了解如何做出貢獻',
reportABug: '報告錯誤',
nextTab: '下一個標簽',
previousTab: '上一個標簽',
selectTabNumber: '選擇標簽編號 {param}',
toggleConsole: '切換控製臺',
addShortcut: '新增捷徑',
editShortcut: '編輯捷徑',
deleteShortcut: '刪除捷徑',
restoreDefaults: '恢複預設',
restoreDefaultsQuestion: '是否確認恢複預設值?',
registerAShortcut: '註冊捷徑',
invalidShortcutMessage: '無效組合,請繼續鍵入',
shortcutAlreadyExists: '捷徑已存在',
saveContent: '保存內容',
openAllConnections: '打開所有連接',
openSettings: '打開設定',
openScratchpad: '打開草稿欄',
runOrReload: '運行或重新加載',
openFilter: '打開過濾器',
nextResultsPage: '下一個結果頁',
previousResultsPage: '上一個結果頁',
editFolder: '編輯檔案夾',
folderName: '檔案夾名稱',
deleteFolder: '刪除檔案夾',
editConnectionAppearance: '編輯連接的外觀',
defaultCopyType: '預設複製類型',
showTableSize: '在側邊欄顯示表大小',
showTableSizeDescription: '僅限 MySQL/MariaDB. 啓用此選項可能會影響許多表的模式(schema)的性能.',
switchSearchMethod: '切換搜索方法',
phpArray: 'PHP 陣列',
closeAllTabs: '關閉所有標簽',
closeOtherTabs: '關閉其他標簽',
closeTabsToLeft: '關閉左側的標簽',
closeTabsToRight: '關閉右側的標簽',
csvFieldDelimiter: '字段分隔符',
csvLinesTerminator: '行終止符',
csvStringDelimiter: '字符串分隔符',
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: '筆記標簽', // Note tag,
saveFile: '保存檔案',
saveFileAs: '將檔案另存為',
openFile: '打開檔案',
openNotes: '打開筆記'
},
faker: {
// Faker.js 方法,用於隨機生成的內容
address: '地址',
commerce: '商業',
company: '公司',
database: '資料庫',
date: '日期',
finance: '財務',
git: 'Git',
hacker: '駭客',
internet: '網際網路',
lorem: 'Lorem',
name: '姓名',
music: '音樂',
phone: '電話',
random: '隨機',
system: '系統',
time: '時間',
vehicle: '車輛',
zipCode: '郵政編碼',
zipCodeByState: '各州的郵政編碼',
city: '城市',
cityPrefix: '城市前綴',
citySuffix: '城市字尾',
streetName: '街道名稱',
streetAddress: '街道地址',
streetSuffix: '街道字尾',
streetPrefix: '街道前綴',
secondaryAddress: '次要地址',
county: '縣',
country: '國家',
countryCode: '國家代碼',
state: '州',
stateAbbr: '州簡稱',
latitude: '緯度',
longitude: '經度',
direction: '\'方向\'',
cardinalDirection: '方位',
ordinalDirection: '順序方向',
nearbyGPSCoordinate: '附近的 GPS 坐標',
timeZone: '時區',
color: '顔色',
department: '部門',
productName: '産品名稱',
price: '價格',
productAdjective: '産品形容詞',
productMaterial: '産品材料',
product: '産品',
productDescription: '産品說明',
suffixes: '字尾',
companyName: '公司名稱',
companySuffix: '公司字尾',
catchPhrase: '流行語',
bs: 'BS',
catchPhraseAdjective: '流行語形容詞',
catchPhraseDescriptor: '流行語說明',
catchPhraseNoun: '流行語名詞',
bsAdjective: 'BS 形容詞',
bsBuzz: 'BS 嗡嗡聲',
bsNoun: 'BS 名稱',
column: '列',
type: '類型',
collation: '排序規則',
engine: '引擎',
past: '過去',
now: '現在',
future: '未來',
between: '之間',
recent: '最近',
soon: '很快',
month: '月',
weekday: '工作日',
account: '帳戶',
accountName: '帳戶名稱',
routingNumber: '路由編號',
mask: '掩碼',
amount: '金額',
transactionType: '交易類型',
currencyCode: '貨幣代碼',
currencyName: '貨幣名稱',
currencySymbol: '貨幣符號',
bitcoinAddress: '位元幣地址',
litecoinAddress: '萊特幣地址',
creditCardNumber: '信用卡號碼',
creditCardCVV: '信用卡CVV',
ethereumAddress: '以太坊地址',
iban: 'Iban',
bic: 'Bic',
transactionDescription: '交易描述',
branch: '分支',
commitEntry: '提交條目',
commitMessage: '提交信息',
commitSha: '提交 SHA',
shortSha: '短的 SHA',
abbreviation: '縮寫',
adjective: '形容詞',
noun: '名詞',
verb: '動詞',
ingverb: '英式動詞',
phrase: '短語',
avatar: '頭像',
email: '電子信箱',
exampleEmail: '示例電子郵件',
userName: '使用者名',
protocol: '協議',
url: '統一資源定位地址',
domainName: '域名',
domainSuffix: '域名字尾',
domainWord: '域詞',
ip: 'Ip',
ipv6: 'Ipv6',
userAgent: '使用者代理',
mac: 'Mac',
password: '密碼',
word: '單詞',
words: '單詞',
sentence: '句子',
slug: 'Slug',
sentences: '句子',
paragraph: '段落',
paragraphs: '段落',
text: '文本',
lines: '行',
genre: '類型',
firstName: '名',
lastName: '姓氏',
middleName: '中間名',
findName: '全名',
jobTitle: '職位名稱',
gender: '性別',
prefix: '前綴',
suffix: '字尾',
title: '頭銜',
jobDescriptor: '工作描述',
jobArea: '工作領域',
jobType: '工作類型',
phoneNumber: '電話號碼',
phoneNumberFormat: '電話號碼格式',
phoneFormats: '電話格式',
number: '號碼',
float: 'Float',
arrayElement: '陣列元素',
arrayElements: '陣列元素',
objectElement: '物件元素',
uuid: 'Uuid',
boolean: '布林',
image: '鏡像',
locale: '區域',
alpha: '阿爾法',
alphaNumeric: 'α 數字',
hexaDecimal: '十六進製',
fileName: '檔案名',
commonFileName: '普通檔案名',
mimeType: 'MIME類型',
commonFileType: '常見檔案類型',
commonFileExt: '常見檔案擴展名',
fileType: '檔案類型',
fileExt: '檔案擴展名',
directoryPath: '目錄路徑',
filePath: '檔案路徑',
semver: 'Semver',
manufacturer: '製造商',
model: '型號',
fuel: 'Fuel',
vin: 'Vin'
}
};

View File

@@ -15,6 +15,10 @@ export default class {
return ipcRenderer.invoke('connect', unproxify(newParams));
}
static abortConnection (uid: string): void {
ipcRenderer.send('abort-connection', uid);
}
static checkConnection (uid: string): Promise<boolean> {
return ipcRenderer.invoke('check-connection', uid);
}

View File

@@ -256,6 +256,10 @@ option:checked {
}
&.active {
a {
border-bottom-color: transparent;
}
.tab-link {
border-color: transparent;
}

View File

@@ -255,6 +255,11 @@
}
}
&.result-tabs .tab-item {
background: transparent;
}
.workspace-query-runner .workspace-query-runner-footer .workspace-query-buttons .btn {
color: $body-font-color-dark;
}

View File

@@ -147,7 +147,7 @@ export const useWorkspacesStore = defineStore('workspaces', {
else
this.selectedWorkspace = uid;
},
async connectWorkspace (connection: ConnectionParams & { pgConnString?: string }, mode?: string) {
async connectWorkspace (connection: ConnectionParams & { pgConnString?: string }, args?: {mode?: string; signal?: AbortSignal}) {
this.workspaces = (this.workspaces as Workspace[]).map(workspace => workspace.uid === connection.uid
? {
...workspace,
@@ -155,112 +155,136 @@ export const useWorkspacesStore = defineStore('workspaces', {
breadcrumbs: {},
loadedSchemas: new Set(),
database: connection.database,
connectionStatus: mode === 'switch' ? 'connected' : 'connecting'
connectionStatus: args?.mode === 'switch' ? 'connected' : 'connecting'
}
: workspace);
const connectionsStore = useConnectionsStore();
const notificationsStore = useNotificationsStore();
const settingsStore = useSettingsStore();
try {
const { status, response } = await Connection.connect(connection);
if (status === 'error') {
notificationsStore.addNotification({ status, message: response });
return new Promise((resolve, reject) => {
const abortHandler = () => {
this.workspaces = (this.workspaces as Workspace[]).map(workspace => workspace.uid === connection.uid
? {
...workspace,
structure: [],
breadcrumbs: {},
loadedSchemas: new Set(),
connectionStatus: 'failed'
connectionStatus: 'disconnected'
}
: workspace);
}
else {
let clientCustomizations: Customizations;
const { updateLastConnection } = connectionsStore;
return reject(new Error('Connection aborted by user'));
};
updateLastConnection(connection.uid);
args?.signal?.addEventListener('abort', abortHandler);
switch (connection.client) {
case 'mysql':
case 'maria':
clientCustomizations = customizations.mysql;
break;
case 'pg':
clientCustomizations = customizations.pg;
break;
case 'sqlite':
clientCustomizations = customizations.sqlite;
break;
case 'firebird':
clientCustomizations = customizations.firebird;
break;
}
const dataTypes = clientCustomizations.dataTypes;
const indexTypes = clientCustomizations.indexTypes;
(async () => {
try {
const { status, response } = await Connection.connect(connection);
const { status, response: version } = await Schema.getVersion(connection.uid);
if (status === 'error') {
notificationsStore.addNotification({ status, message: response });
this.workspaces = (this.workspaces as Workspace[]).map(workspace => workspace.uid === connection.uid
? {
...workspace,
structure: [],
breadcrumbs: {},
loadedSchemas: new Set(),
connectionStatus: 'failed'
}
: workspace);
if (status === 'error')
notificationsStore.addNotification({ status, message: version });
// Check if Maria or MySQL
const isMySQL = version.name.includes('MySQL');
const isMaria = version.name.includes('Maria');
if (isMySQL && connection.client !== 'mysql') {
const connProxy = Object.assign({}, connection);
connProxy.client = 'mysql';
connectionsStore.editConnection(connProxy);
}
else if (isMaria && connection.client === 'mysql') {
const connProxy = Object.assign({}, connection);
connProxy.client = 'maria';
connectionsStore.editConnection(connProxy);
}
const cachedTabs: WorkspaceTab[] = settingsStore.restoreTabs ? persistentStore.get(connection.uid, []) as WorkspaceTab[] : [];
if (cachedTabs.length) {
tabIndex[connection.uid] = cachedTabs.reduce((acc: number, curr) => {
if (curr.index > acc) acc = curr.index;
return acc;
}, null);
}
const selectedTab = cachedTabs.length
? connection.database
? cachedTabs.filter(tab => tab.type === 'query' || tab.database === connection.database)[0]?.uid
: cachedTabs[0].uid
: null;
this.workspaces = (this.workspaces as Workspace[]).map(workspace => workspace.uid === connection.uid
? {
...workspace,
client: connection.client,
dataTypes,
indexTypes,
customizations: clientCustomizations,
structure: response,
connectionStatus: 'connected',
tabs: cachedTabs,
selectedTab,
version
return reject(new Error(response));
}
: workspace);
else if (status === 'abort')
return reject(new Error('Connection aborted by user'));
else {
let clientCustomizations: Customizations;
const { updateLastConnection } = connectionsStore;
this.refreshCollations(connection.uid);
this.refreshVariables(connection.uid);
this.refreshEngines(connection.uid);
this.refreshUsers(connection.uid);
}
}
catch (err) {
notificationsStore.addNotification({ status: 'error', message: err.stack });
}
updateLastConnection(connection.uid);
switch (connection.client) {
case 'mysql':
case 'maria':
clientCustomizations = customizations.mysql;
break;
case 'pg':
clientCustomizations = customizations.pg;
break;
case 'sqlite':
clientCustomizations = customizations.sqlite;
break;
case 'firebird':
clientCustomizations = customizations.firebird;
break;
}
const dataTypes = clientCustomizations.dataTypes;
const indexTypes = clientCustomizations.indexTypes;
const { status, response: version } = await Schema.getVersion(connection.uid);
if (status === 'error')
notificationsStore.addNotification({ status, message: version });
// Check if Maria or MySQL
const isMySQL = version.name.includes('MySQL');
const isMaria = version.name.includes('Maria');
if (isMySQL && connection.client !== 'mysql') {
const connProxy = Object.assign({}, connection);
connProxy.client = 'mysql';
connectionsStore.editConnection(connProxy);
}
else if (isMaria && connection.client === 'mysql') {
const connProxy = Object.assign({}, connection);
connProxy.client = 'maria';
connectionsStore.editConnection(connProxy);
}
const cachedTabs: WorkspaceTab[] = settingsStore.restoreTabs ? persistentStore.get(connection.uid, []) as WorkspaceTab[] : [];
if (cachedTabs.length) {
tabIndex[connection.uid] = cachedTabs.reduce((acc: number, curr) => {
if (curr.index > acc) acc = curr.index;
return acc;
}, null);
}
const selectedTab = cachedTabs.length
? connection.database
? cachedTabs.filter(tab => tab.type === 'query' || tab.database === connection.database)[0]?.uid
: cachedTabs[0].uid
: null;
this.workspaces = (this.workspaces as Workspace[]).map(workspace => workspace.uid === connection.uid
? {
...workspace,
client: connection.client,
dataTypes,
indexTypes,
customizations: clientCustomizations,
structure: response,
connectionStatus: 'connected',
tabs: cachedTabs,
selectedTab,
version
}
: workspace);
args?.signal?.removeEventListener('abort', abortHandler);
this.refreshCollations(connection.uid);
this.refreshVariables(connection.uid);
this.refreshEngines(connection.uid);
this.refreshUsers(connection.uid);
resolve(true);
}
}
catch (err) {
notificationsStore.addNotification({ status: 'error', message: err.stack });
}
})();
});
},
async refreshStructure (uid: string) {
const notificationsStore = useNotificationsStore();
@@ -405,7 +429,7 @@ export const useWorkspacesStore = defineStore('workspaces', {
},
async switchConnection (connection: ConnectionParams & { pgConnString?: string }) {
await Connection.disconnect(connection.uid);
return this.connectWorkspace(connection, 'switch');
return this.connectWorkspace(connection, { mode: 'switch' });
},
addWorkspace (uid: string) {
const workspace: Workspace = {