fabio286/antares
1
1
Fork 0
mirror of https://github.com/Fabio286/antares.git synced 2025-06-05 21:59:22 +02:00
Code Issues Releases Wiki Activity

fix: wrong result fields type and order with some queries

Browse Source
This commit is contained in:
Fabio
2020-10-20 13:12:12 +02:00
parent 580105e9f3
commit a8cd17748f
5 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/renderer/components/WorkspaceQueryTab.vue
View File

@ -136,12 +136,10 @@ export default {
let qI = 0;// queries index
for (const result of this.results) { // cycle queries
let fI = 0;// fields index
if (result.rows) { // if is a select
const paramsArr = this.getResultParams(qI);
selectedFields = result.fields.map(field => field.name);
selectedFields = result.fields.map(field => field.orgName || field.name);
this.resultsCount += result.rows.length;
for (const paramObj of paramsArr) {
@ -154,15 +152,20 @@ export default {
const { status, response } = await Tables.getTableColumns(params);
if (status === 'success') {
let fields = response.filter(field => selectedFields.includes(field.name));
let fields = response.length ? selectedFields.map(selField => {
return response.find(field => field.name === selField);
}) : [];
if (selectedFields.length) {
fields = fields.map(field => {
return { ...field, alias: result.fields[fI++].name };
const alias = result.fields.find(resField => resField.orgName === field.name).name || field.name;
return { ...field, alias };
});
}
if (!fields.length) {
fields = response.map(field => {
return { ...field, alias: result.fields[fI++].name };
fields = result.fields.map(field => {
return { ...field, alias: field.name };
});
}