dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-22 07:36:01 +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

8
packages/web/src/charts/chartDataLoader.ts
View File

@@ -14,9 +14,7 @@ export async function loadChartStructure(driver: EngineDriver, conid, database,
},
};
const dmp = driver.createDumper();
dumpSqlSelect(dmp, select);
const resp = await apiCall('database-connections/query-data', { conid, database, sql: dmp.s });
const resp = await apiCall('database-connections/sql-select', { conid, database, select });
if (resp.errorMessage) throw new Error(resp.errorMessage);
return resp.columns.map(x => x.columnName);
}
@@ -72,9 +70,7 @@ export async function loadChartData(driver: EngineDriver, conid, database, sql,
],
};
const dmp = driver.createDumper();
dumpSqlSelect(dmp, select);
const resp = await apiCall('database-connections/query-data', { conid, database, sql: dmp.s });
const resp = await apiCall('database-connections/sql-select', { conid, database, select });
let { rows, columns, errorMessage } = resp;
if (errorMessage) {
throw new Error(errorMessage);

16
packages/web/src/datagrid/SqlDataGridCore.svelte
View File

@@ -30,12 +30,12 @@
async function loadDataPage(props, offset, limit) {
const { display, conid, database } = props;
const sql = display.getPageQuery(offset, limit);
const select = display.getPageQuery(offset, limit);
const response = await apiCall('database-connections/query-data', {
const response = await apiCall('database-connections/sql-select', {
conid,
database,
sql,
select,
});
if (response.errorMessage) return response;
@@ -44,19 +44,19 @@
function dataPageAvailable(props) {
const { display } = props;
const sql = display.getPageQuery(0, 1);
return !!sql;
const select = display.getPageQuery(0, 1);
return !!select;
}
async function loadRowCount(props) {
const { display, conid, database } = props;
const sql = display.getCountQuery();
const select = display.getCountQuery();
const response = await apiCall('database-connections/query-data', {
const response = await apiCall('database-connections/sql-select', {
conid,
database,
sql,
select,
});
return parseInt(response.rows[0].count);

8
packages/web/src/formview/SqlFormView.svelte
View File

@@ -1,13 +1,13 @@
<script lang="ts" context="module">
async function loadRow(props, sql) {
async function loadRow(props, select) {
const { conid, database } = props;
if (!sql) return null;
if (!select) return null;
const response = await apiCall('database-connections/query-data', {
const response = await apiCall('database-connections/sql-select', {
conid,
database,
sql,
select,
});
if (response.errorMessage) return response;

7
packages/web/src/modals/DictionaryLookupModal.svelte
View File

@@ -99,14 +99,11 @@
}
}
// @ts-ignore
dumpSqlSelect(dmp, select);
isLoading = true;
const response = await apiCall('database-connections/query-data', {
const response = await apiCall('database-connections/sql-select', {
conid,
database,
sql: dmp.s,
select
});
rows = response.rows;