dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-26 12:06:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

perspectives: support nosql other than mongo

Browse Source
This commit is contained in:
SPRINX0\prochazka
2024-08-28 15:49:32 +02:00
parent 73ec42a9c8
commit d243af323e
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/datalib/src/PerspectiveDataLoader.ts
View File

@@ -123,7 +123,7 @@ export class PerspectiveDataLoader {
groupByColumns: bindingColumns, groupByColumns: bindingColumns,
aggregateColumns: [ aggregateColumns: [
{ {
alias: 'acount', alias: 'pergrpsize',
aggregateFunction: 'count', aggregateFunction: 'count',
}, },
], ],
@@ -156,8 +156,8 @@ export class PerspectiveDataLoader {
if (response.errorMessage) return response; if (response.errorMessage) return response;
return response.rows.map(row => ({ return response.rows.map(row => ({
...row._id, ...row,
_perspective_group_size_: parseInt(row.count), _perspective_group_size_: parseInt(row.pergrpsize),
})); }));
} }

2
packages/datalib/src/PerspectiveTreeNode.ts
View File

@@ -463,6 +463,8 @@ export abstract class PerspectiveTreeNode {
order: 'ASC' as 'ASC', order: 'ASC' as 'ASC',
})); }));
if (pkColumns) return pkColumns; if (pkColumns) return pkColumns;
const uqColumns = (table as CollectionInfo)?.uniqueKey;
if (uqColumns?.length >= 1) return uqColumns.map(x => ({ columnName: x.columnName, order: 'ASC' }));
const columns = (table as TableInfo | ViewInfo)?.columns; const columns = (table as TableInfo | ViewInfo)?.columns;
if (columns) return [{ columnName: columns[0].columnName, order: 'ASC' }]; if (columns) return [{ columnName: columns[0].columnName, order: 'ASC' }];
return [{ columnName: '_id', order: 'ASC' }]; return [{ columnName: '_id', order: 'ASC' }];

11
plugins/dbgate-plugin-mongo/src/backend/driver.js
View File

@@ -305,7 +305,12 @@ const driver = {
} else if (options.aggregate) { } else if (options.aggregate) {
let cursor = await collection.aggregate(convertObjectId(convertToMongoAggregate(options.aggregate))); let cursor = await collection.aggregate(convertObjectId(convertToMongoAggregate(options.aggregate)));
const rows = await cursor.toArray(); const rows = await cursor.toArray();
return { rows: rows.map(transformMongoData) }; return {
rows: rows.map(transformMongoData).map((x) => ({
...x._id,
..._.omit(x, ['_id']),
})),
};
} else { } else {
// console.log('options.condition', JSON.stringify(options.condition, undefined, 2)); // console.log('options.condition', JSON.stringify(options.condition, undefined, 2));
let cursor = await collection.find(convertObjectId(mongoCondition) || {}); let cursor = await collection.find(convertObjectId(mongoCondition) || {});
@@ -313,7 +318,9 @@ const driver = {
if (options.skip) cursor = cursor.skip(options.skip); if (options.skip) cursor = cursor.skip(options.skip);
if (options.limit) cursor = cursor.limit(options.limit); if (options.limit) cursor = cursor.limit(options.limit);
const rows = await cursor.toArray(); const rows = await cursor.toArray();
return { rows: rows.map(transformMongoData) }; return {
rows: rows.map(transformMongoData),
};
} }
} catch (err) { } catch (err) {
return { errorMessage: err.message }; return { errorMessage: err.message };