mirror of
https://github.com/Fabio286/antares.git
synced 2025-06-05 21:59:22 +02:00
Compare commits
11 Commits
Author | SHA1 | Date | |
---|---|---|---|
d8a298fd20 | |||
369622d5af | |||
a40d722d7c | |||
440f74dfc1 | |||
8621ca5333 | |||
24edc82b1b | |||
0a2124f2c2 | |||
a8521317a5 | |||
88408da745 | |||
d52b7af297 | |||
e6955550fa |
2
.vscode/launch.json
vendored
2
.vscode/launch.json
vendored
@@ -5,7 +5,6 @@
|
||||
"name": "Electron: Main",
|
||||
"cwd": "${workspaceFolder}",
|
||||
"port": 9222,
|
||||
"protocol": "inspector",
|
||||
"request": "attach",
|
||||
"sourceMaps": true,
|
||||
"type": "node",
|
||||
@@ -23,7 +22,6 @@
|
||||
"name": "Electron: Worker",
|
||||
"cwd": "${workspaceFolder}",
|
||||
"port": 9224,
|
||||
"protocol": "inspector",
|
||||
"request": "attach",
|
||||
"sourceMaps": true,
|
||||
"type": "node",
|
||||
|
16
CHANGELOG.md
16
CHANGELOG.md
@@ -2,6 +2,22 @@
|
||||
|
||||
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.5.19](https://github.com/antares-sql/antares/compare/v0.5.18...v0.5.19) (2022-10-22)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* context menu option to fill cell with random values ([0a2124f](https://github.com/antares-sql/antares/commit/0a2124f2c2bdadc7c753db11d1e29f8acb9ddcac))
|
||||
* uuid fill for string cells ([24edc82](https://github.com/antares-sql/antares/commit/24edc82b1be7299a09df18611b2a0ba361a6b46f))
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* app stuck inserting a random value if field length high ([440f74d](https://github.com/antares-sql/antares/commit/440f74dfc1f4942ba585b9bdae7517fe6ab04a81))
|
||||
* error joining tables with different schema ([88408da](https://github.com/antares-sql/antares/commit/88408da745e45c70de977bc4270e5f61825be65f))
|
||||
* **SQLite:** save boolean as integer to improve compativility, fixes [#463](https://github.com/antares-sql/antares/issues/463) ([d52b7af](https://github.com/antares-sql/antares/commit/d52b7af2978bc8beafd2d22078c72abb62e9e532))
|
||||
* unable to edit text fields if value is NULL, fixes [#466](https://github.com/antares-sql/antares/issues/466) ([8621ca5](https://github.com/antares-sql/antares/commit/8621ca5333b5c51dc7a2ea1fcc0c5ec7f752a00a))
|
||||
|
||||
### [0.5.18](https://github.com/antares-sql/antares/compare/v0.5.17...v0.5.18) (2022-10-14)
|
||||
|
||||
|
||||
|
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "antares",
|
||||
"version": "0.5.18",
|
||||
"version": "0.5.19",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "antares",
|
||||
"version": "0.5.18",
|
||||
"version": "0.5.19",
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
|
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "antares",
|
||||
"productName": "Antares",
|
||||
"version": "0.5.18",
|
||||
"version": "0.5.19",
|
||||
"description": "A modern, fast and productivity driven SQL client with a focus in UX.",
|
||||
"license": "MIT",
|
||||
"repository": "https://github.com/antares-sql/antares.git",
|
||||
|
@@ -29,7 +29,6 @@ export const NUMBER = [
|
||||
'SMALLINT',
|
||||
'MEDIUMINT',
|
||||
'BIGINT',
|
||||
'DECIMAL',
|
||||
'NUMERIC',
|
||||
'INTEGER',
|
||||
'SMALLSERIAL',
|
||||
@@ -78,6 +77,7 @@ export const BLOB = [
|
||||
'TINYBLOB',
|
||||
'MEDIUMBLOB',
|
||||
'LONGBLOB',
|
||||
'LONG_BLOB',
|
||||
'BYTEA'
|
||||
];
|
||||
|
||||
|
@@ -176,7 +176,7 @@ function isMD (str: string) {
|
||||
}
|
||||
|
||||
export function langDetector (str: string) {
|
||||
if (!str.trim().length)
|
||||
if (!str || !str.trim().length)
|
||||
return 'text';
|
||||
if (isJSON(str))
|
||||
return 'json';
|
||||
|
@@ -5,7 +5,7 @@ import { ipcMain } from 'electron';
|
||||
import { faker } from '@faker-js/faker';
|
||||
import * as moment from 'moment';
|
||||
import { sqlEscaper } from 'common/libs/sqlUtils';
|
||||
import { TEXT, LONG_TEXT, ARRAY, TEXT_SEARCH, NUMBER, FLOAT, BLOB, BIT, DATE, DATETIME } from 'common/fieldTypes';
|
||||
import { TEXT, LONG_TEXT, ARRAY, TEXT_SEARCH, NUMBER, FLOAT, BLOB, BIT, DATE, DATETIME, BOOLEAN } from 'common/fieldTypes';
|
||||
import customizations from 'common/customizations';
|
||||
|
||||
export default (connections: {[key: string]: antares.Client}) => {
|
||||
@@ -153,6 +153,18 @@ export default (connections: {[key: string]: antares.Client}) => {
|
||||
escapedParam = `b'${sqlEscaper(params.content)}'`;
|
||||
reload = true;
|
||||
}
|
||||
else if (BOOLEAN.includes(params.type)) {
|
||||
switch (connections[params.uid]._client) {
|
||||
case 'mysql':
|
||||
case 'maria':
|
||||
case 'pg':
|
||||
escapedParam = params.content;
|
||||
break;
|
||||
case 'sqlite':
|
||||
escapedParam = Number(params.content === 'true');
|
||||
break;
|
||||
}
|
||||
}
|
||||
else if (params.content === null)
|
||||
escapedParam = 'NULL';
|
||||
else
|
||||
|
@@ -469,7 +469,12 @@ export class MySQLClient extends AntaresCore {
|
||||
.orderBy({ ORDINAL_POSITION: 'ASC' })
|
||||
.run<TableColumnsResult>();
|
||||
|
||||
const { rows: fields } = await this.raw<antares.QueryResult<CreateTableResult>>(`SHOW CREATE TABLE \`${schema}\`.\`${table}\``);
|
||||
let fields: CreateTableResult[] = [];
|
||||
try {
|
||||
const { rows } = await this.raw<antares.QueryResult<CreateTableResult>>(`SHOW CREATE TABLE \`${schema}\`.\`${table}\``);
|
||||
fields = rows;
|
||||
}
|
||||
catch (_) {}
|
||||
|
||||
const remappedFields = fields.map(row => {
|
||||
if (!row['Create Table']) return false;
|
||||
|
@@ -18,6 +18,7 @@
|
||||
@show-delete-modal="showDeleteConfirmModal"
|
||||
@set-null="setNull"
|
||||
@copy-cell="copyCell"
|
||||
@fill-cell="fillCell"
|
||||
@copy-row="copyRow"
|
||||
@duplicate-row="duplicateRow"
|
||||
@close-context="closeContext"
|
||||
@@ -122,7 +123,7 @@ import { useSettingsStore } from '@/stores/settings';
|
||||
import { useWorkspacesStore } from '@/stores/workspaces';
|
||||
import { useConsoleStore } from '@/stores/console';
|
||||
import { exportRows } from '../libs/exportRows';
|
||||
import { TEXT, LONG_TEXT, BLOB } from 'common/fieldTypes';
|
||||
import { TEXT, LONG_TEXT, BLOB, DATE, DATETIME, TIME } from 'common/fieldTypes';
|
||||
import BaseVirtualScroll from '@/components/BaseVirtualScroll.vue';
|
||||
import WorkspaceTabQueryTableRow from '@/components/WorkspaceTabQueryTableRow.vue';
|
||||
import TableContext from '@/components/WorkspaceTabQueryTableContext.vue';
|
||||
@@ -133,6 +134,7 @@ import { TableField, QueryResult } from 'common/interfaces/antares';
|
||||
import { TableUpdateParams } from 'common/interfaces/tableApis';
|
||||
import { jsonToSqlInsert } from 'common/libs/sqlUtils';
|
||||
import { unproxify } from '@/libs/unproxify';
|
||||
import faker from '@faker-js/faker';
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
@@ -463,6 +465,53 @@ const copyRow = (format: string) => {
|
||||
}
|
||||
};
|
||||
|
||||
const fillCell = (event: { name: string; group: string; type: string }) => {
|
||||
const row = localResults.value.find((row: any) => selectedRows.value.includes(row._antares_id));
|
||||
let fakeValue;
|
||||
let datePrecision = '';
|
||||
|
||||
if (['datetime', 'time'].includes(event.group)) {
|
||||
for (let i = 0; i < selectedCell.value.length; i++)
|
||||
datePrecision += i === 0 ? '.S' : 'S';
|
||||
}
|
||||
|
||||
if (event.group === 'custom') {
|
||||
if (event.type === 'time' && event.name === 'now')
|
||||
fakeValue = moment().format(`HH:mm:ss${datePrecision}`);
|
||||
else if (event.type === 'time' && event.name === 'random')
|
||||
fakeValue = moment(faker.date.recent()).format(`HH:mm:ss${datePrecision}`);
|
||||
else if (event.type === 'datetime' && event.name === 'now')
|
||||
fakeValue = moment().format(`YYYY-MM-DD HH:mm:ss${datePrecision}`);
|
||||
}
|
||||
else {
|
||||
fakeValue = (faker as any)[event.group][event.name]();
|
||||
if (['string', 'number'].includes(typeof fakeValue)) {
|
||||
if (typeof fakeValue === 'number')
|
||||
fakeValue = String(fakeValue);
|
||||
|
||||
if (selectedCell.value.length)
|
||||
fakeValue = fakeValue.substring(0, selectedCell.value.length < 1024 ? Number(selectedCell.value.length) : 1024);
|
||||
}
|
||||
else if ([...DATE, ...DATETIME].includes(selectedCell.value.type))
|
||||
fakeValue = moment(fakeValue).format(`YYYY-MM-DD HH:mm:ss${datePrecision}`);
|
||||
else if (TIME.includes(selectedCell.value.type))
|
||||
fakeValue = moment(fakeValue).format(`HH:mm:ss${datePrecision}`);
|
||||
}
|
||||
|
||||
const params = {
|
||||
primary: primaryField.value?.name,
|
||||
schema: getSchema(resultsetIndex.value),
|
||||
table: getTable(resultsetIndex.value),
|
||||
id: getPrimaryValue(row),
|
||||
row,
|
||||
orgRow: row,
|
||||
field: selectedCell.value.field,
|
||||
content: fakeValue
|
||||
};
|
||||
|
||||
emit('update-field', params);
|
||||
};
|
||||
|
||||
const duplicateRow = () => {
|
||||
const row = localResults.value.find((row: any) => selectedRows.value.includes(row._antares_id));
|
||||
const rowToDuplicate = JSON.parse(JSON.stringify(row));
|
||||
|
@@ -42,6 +42,27 @@
|
||||
<i class="mdi mdi-18px mdi-content-duplicate text-light pr-1" /> {{ t('word.duplicate') }}
|
||||
</span>
|
||||
</div>
|
||||
<div
|
||||
v-if="selectedRows.length === 1 && selectedCell.isEditable && mode === 'table' && fakerGroup"
|
||||
class="context-element"
|
||||
>
|
||||
<span class="d-flex">
|
||||
<i class="mdi mdi-18px mdi-auto-fix text-light pr-1" /> {{ t('message.fillCell') }}
|
||||
</span>
|
||||
<i class="mdi mdi-18px mdi-chevron-right text-light pl-1" />
|
||||
<div class="context-submenu">
|
||||
<div
|
||||
v-for="method in fakerMethods[fakerGroup]"
|
||||
:key="method.name"
|
||||
class="context-element"
|
||||
@click="fillCell(method)"
|
||||
>
|
||||
<span class="d-flex">
|
||||
{{ t(`faker.${method.name}`) }}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
v-if="selectedRows.length === 1 && selectedCell.isEditable"
|
||||
class="context-element"
|
||||
@@ -64,13 +85,14 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { Prop } from 'vue';
|
||||
import { computed, Prop } from 'vue';
|
||||
import BaseContextMenu from '@/components/BaseContextMenu.vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { TEXT, LONG_TEXT, NUMBER, FLOAT, DATE, TIME, DATETIME, UUID } from 'common/fieldTypes';
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
defineProps({
|
||||
const props = defineProps({
|
||||
contextEvent: MouseEvent,
|
||||
selectedRows: Array,
|
||||
selectedCell: Object,
|
||||
@@ -83,9 +105,62 @@ const emit = defineEmits([
|
||||
'set-null',
|
||||
'copy-cell',
|
||||
'copy-row',
|
||||
'duplicate-row'
|
||||
'duplicate-row',
|
||||
'fill-cell'
|
||||
]);
|
||||
|
||||
const fakerMethods = {
|
||||
string: [
|
||||
{ name: 'word', group: 'lorem' },
|
||||
{ name: 'text', group: 'lorem' },
|
||||
{ name: 'firstName', group: 'name' },
|
||||
{ name: 'lastName', group: 'name' },
|
||||
{ name: 'jobTitle', group: 'name' },
|
||||
{ name: 'phoneNumber', group: 'phone' },
|
||||
{ name: 'exampleEmail', group: 'internet' },
|
||||
{ name: 'ip', group: 'internet' },
|
||||
{ name: 'domainName', group: 'internet' },
|
||||
{ name: 'color', group: 'internet' },
|
||||
{ name: 'uuid', group: 'random' }
|
||||
],
|
||||
number: [
|
||||
{ name: 'number', group: 'random' }
|
||||
],
|
||||
float: [
|
||||
{ name: 'float', group: 'random' },
|
||||
{ name: 'amount', group: 'finance' }
|
||||
],
|
||||
datetime: [
|
||||
{ name: 'now', group: 'custom' },
|
||||
{ name: 'past', group: 'date' },
|
||||
{ name: 'future', group: 'date' }
|
||||
],
|
||||
time: [
|
||||
{ name: 'now', group: 'custom' },
|
||||
{ name: 'random', group: 'custom' }
|
||||
],
|
||||
uuid: [
|
||||
{ name: 'uuid', group: 'random' }
|
||||
]
|
||||
};
|
||||
|
||||
const fakerGroup = computed(() => {
|
||||
if ([...TEXT, ...LONG_TEXT].includes(props.selectedCell.type))
|
||||
return 'string';
|
||||
else if (NUMBER.includes(props.selectedCell.type))
|
||||
return 'number';
|
||||
else if (FLOAT.includes(props.selectedCell.type))
|
||||
return 'float';
|
||||
else if ([...DATE, ...DATETIME].includes(props.selectedCell.type))
|
||||
return 'datetime';
|
||||
else if (TIME.includes(props.selectedCell.type))
|
||||
return 'time';
|
||||
else if (UUID.includes(props.selectedCell.type))
|
||||
return 'uuid';
|
||||
else
|
||||
return false;
|
||||
});
|
||||
|
||||
const showConfirmModal = () => {
|
||||
emit('show-delete-modal');
|
||||
};
|
||||
@@ -113,4 +188,9 @@ const duplicateRow = () => {
|
||||
emit('duplicate-row');
|
||||
closeContext();
|
||||
};
|
||||
|
||||
const fillCell = (method: {name: string; group: string}) => {
|
||||
emit('fill-cell', { ...method, type: fakerGroup.value });
|
||||
closeContext();
|
||||
};
|
||||
</script>
|
||||
|
@@ -11,7 +11,12 @@
|
||||
:class="{selected: selectedCell === cKey}"
|
||||
@click="selectRow($event, cKey)"
|
||||
|
||||
@contextmenu.prevent="openContext($event, { id: row._antares_id, orgField: cKey })"
|
||||
@contextmenu.prevent="openContext($event, {
|
||||
id: row._antares_id,
|
||||
orgField: cKey,
|
||||
type: fields[cKey].type,
|
||||
length: fields[cKey].charLength || fields[cKey].length
|
||||
})"
|
||||
>
|
||||
<template v-if="cKey !== '_antares_id'">
|
||||
<span
|
||||
@@ -530,7 +535,14 @@ const getKeyUsage = (keyName: string) => {
|
||||
return props.keyUsage.find(key => key.field === keyName);
|
||||
};
|
||||
|
||||
const openContext = (event: MouseEvent, payload: { id: string; field?: string; orgField: string; isEditable?: boolean }) => {
|
||||
const openContext = (event: MouseEvent, payload: {
|
||||
id: string;
|
||||
field?: string;
|
||||
orgField: string;
|
||||
isEditable?: boolean;
|
||||
type: string;
|
||||
length: number | false;
|
||||
}) => {
|
||||
payload.field = props.fields[payload.orgField].name;// Ensures field name only
|
||||
payload.isEditable = isEditable.value;
|
||||
emit('contextmenu', event, payload);
|
||||
|
@@ -322,7 +322,8 @@ export const enUS = {
|
||||
clearQuery: 'Clear query',
|
||||
openFilter: 'Open filter',
|
||||
nextResultsPage: 'Next results page',
|
||||
previousResultsPage: 'Previous results page'
|
||||
previousResultsPage: 'Previous results page',
|
||||
fillCell: 'Fill cell'
|
||||
},
|
||||
faker: {
|
||||
address: 'Address',
|
||||
@@ -388,6 +389,7 @@ export const enUS = {
|
||||
collation: 'Collation',
|
||||
engine: 'Engine',
|
||||
past: 'Past',
|
||||
now: 'Now',
|
||||
future: 'Future',
|
||||
between: 'Between',
|
||||
recent: 'Recent',
|
||||
|
@@ -63,6 +63,7 @@
|
||||
"mediumblob": $blob-color,
|
||||
"medium_blob": $blob-color,
|
||||
"longblob": $blob-color,
|
||||
"long_blob": $blob-color,
|
||||
"bytea": $blob-color,
|
||||
"enum": $enum-color,
|
||||
"set": $enum-color,
|
||||
|
Reference in New Issue
Block a user