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

using sql-select instead of query-data

Browse Source
This commit is contained in:
Jan Prochazka
2022-03-17 10:32:57 +01:00
parent 0d7bfd5f90
commit 9c7a130ee4
8 changed files with 50 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/datalib/src/GridDisplay.ts
View File

@@ -463,7 +463,10 @@ export abstract class GridDisplay {
const orderColumnName = columns[0].columnName;
const select: Select = {
commandType: 'select',
from: { name, alias: 'basetbl' },
from: {
name: _.pick(name, ['schemaName', 'pureName']),
alias: 'basetbl',
},
columns: columns.map(col => ({
exprType: 'column',
alias: col.columnName,
@@ -558,8 +561,9 @@ export abstract class GridDisplay {
else if (this.dialect.rowNumberOverPaging && offset > 0)
select = this.getRowNumberOverSelect(select, offset, count);
else if (this.dialect.limitSelect) select.topRecords = count;
const sql = treeToSql(this.driver, select, dumpSqlSelect);
return sql;
return select;
// const sql = treeToSql(this.driver, select, dumpSqlSelect);
// return sql;
}
getExportQuery(postprocessSelect = null) {
@@ -629,8 +633,9 @@ export abstract class GridDisplay {
},
];
}
const sql = treeToSql(this.driver, select, dumpSqlSelect);
return sql;
return select;
// const sql = treeToSql(this.driver, select, dumpSqlSelect);
// return sql;
}
compileFilters(): Condition {

28
packages/datalib/src/TableFormViewDisplay.ts
View File

@@ -1,17 +1,9 @@
import { FormViewDisplay } from './FormViewDisplay';
import _ from 'lodash';
import { GridDisplay, ChangeCacheFunc, DisplayColumn, DisplayedColumnInfo, ChangeConfigFunc } from './GridDisplay';
import { TableInfo, EngineDriver, ViewInfo, ColumnInfo, NamedObjectInfo, DatabaseInfo } from 'dbgate-types';
import { GridConfig, GridCache, createGridCache } from './GridConfig';
import {
Expression,
Select,
treeToSql,
dumpSqlSelect,
mergeConditions,
Condition,
OrderByExpression,
} from 'dbgate-sqltree';
import { ChangeCacheFunc, DisplayColumn, ChangeConfigFunc } from './GridDisplay';
import { EngineDriver, NamedObjectInfo, DatabaseInfo } from 'dbgate-types';
import { GridConfig, GridCache } from './GridConfig';
import { mergeConditions, Condition, OrderByExpression } from 'dbgate-sqltree';
import { TableGridDisplay } from './TableGridDisplay';
import stableStringify from 'json-stable-stringify';
import { ChangeSetFieldDefinition, ChangeSetRowDefinition } from './ChangeSet';
@@ -160,8 +152,7 @@ export class TableFormViewDisplay extends FormViewDisplay {
if (!select) return null;
select.where = mergeConditions(select.where, this.getPrimaryKeyEqualCondition());
const sql = treeToSql(this.driver, select, dumpSqlSelect);
return sql;
return select;
}
getCountSelect() {
@@ -183,8 +174,7 @@ export class TableFormViewDisplay extends FormViewDisplay {
if (!this.driver) return null;
const select = this.getCountSelect();
if (!select) return null;
const sql = treeToSql(this.driver, select, dumpSqlSelect);
return sql;
return select;
}
getBeforeCountQuery() {
@@ -192,8 +182,7 @@ export class TableFormViewDisplay extends FormViewDisplay {
const select = this.getCountSelect();
if (!select) return null;
select.where = mergeConditions(select.where, this.getPrimaryKeyOperatorCondition('<'));
const sql = treeToSql(this.driver, select, dumpSqlSelect);
return sql;
return select;
}
navigate(row) {
@@ -242,8 +231,7 @@ export class TableFormViewDisplay extends FormViewDisplay {
break;
}
const sql = treeToSql(this.driver, select, dumpSqlSelect);
return sql;
return select;
}
getChangeSetRow(row): ChangeSetRowDefinition {