mirror of
https://github.com/Syngnat/GoNavi.git
synced 2026-07-08 21:11:44 +08:00
Compare commits
2 Commits
fix/oceanb
...
fix/oceanb
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c27a038fc5 | ||
|
|
c3c4efc6ec |
@@ -26,6 +26,25 @@ describe('queryResultPagination', () => {
|
||||
});
|
||||
});
|
||||
|
||||
it('treats query-editor injected LIMIT as a capped page rather than an uncounted total', () => {
|
||||
const page = createInitialQueryResultPagination({
|
||||
executedSql: 'SELECT id, name FROM users LIMIT 500',
|
||||
exportSql: 'SELECT id, name FROM users',
|
||||
dbType: 'mysql',
|
||||
returnedRowCount: 500,
|
||||
fallbackPageSize: 500,
|
||||
});
|
||||
|
||||
expect(page).toMatchObject({
|
||||
current: 1,
|
||||
pageSize: 500,
|
||||
total: 500,
|
||||
totalKnown: true,
|
||||
baseSql: 'SELECT id, name FROM users',
|
||||
exportAllSql: 'SELECT id, name FROM users',
|
||||
});
|
||||
});
|
||||
|
||||
it('builds the next page SQL with one lookahead row', () => {
|
||||
expect(buildQueryResultPageSql({
|
||||
baseSql: 'SELECT id FROM users',
|
||||
|
||||
@@ -22,6 +22,14 @@ const normalizePositiveInteger = (value: unknown): number => {
|
||||
return Number.isFinite(parsed) && parsed > 0 ? parsed : 0;
|
||||
};
|
||||
|
||||
const normalizeSqlForComparison = (sql: string): string => (
|
||||
String(sql || '')
|
||||
.replace(/\s+/g, ' ')
|
||||
.replace(/;+\s*$/g, '')
|
||||
.trim()
|
||||
.toLowerCase()
|
||||
);
|
||||
|
||||
const parseTopLevelLimit = (sql: string): LimitInfo | null => {
|
||||
const { main } = splitSqlTail(sql);
|
||||
const limitPos = findTopLevelKeyword(main, 'limit');
|
||||
@@ -60,6 +68,14 @@ const stripExplicitLimitForExport = (sql: string): string => {
|
||||
return splitSqlTail(sql).main.trim();
|
||||
};
|
||||
|
||||
const wasLimitAppliedByQueryEditorCap = (executedSql: string, exportSql: string): boolean => {
|
||||
const executed = String(executedSql || '').trim();
|
||||
const exportable = String(exportSql || '').trim();
|
||||
if (!executed || !exportable) return false;
|
||||
if (normalizeSqlForComparison(executed) === normalizeSqlForComparison(exportable)) return false;
|
||||
return normalizeSqlForComparison(stripExplicitLimitForExport(executed)) === normalizeSqlForComparison(stripExplicitLimitForExport(exportable));
|
||||
};
|
||||
|
||||
const resolveWrappedBaseSql = (dbType: string, baseSql: string): string => {
|
||||
const normalizedType = String(dbType || '').trim().toLowerCase();
|
||||
const base = baseSql.trim();
|
||||
@@ -146,11 +162,14 @@ export const createInitialQueryResultPagination = (params: {
|
||||
const exportAllSql = exportSql && getLeadingKeyword(exportSql) === 'select'
|
||||
? stripExplicitLimitForExport(exportSql)
|
||||
: stripExplicitLimitForExport(executedSql);
|
||||
const totalState = resolveQueryResultPaginationTotal({
|
||||
current,
|
||||
pageSize,
|
||||
rowCount: returnedRowCount,
|
||||
});
|
||||
const autoLimitCap = current === 1 && wasLimitAppliedByQueryEditorCap(executedSql, exportSql);
|
||||
const totalState = autoLimitCap
|
||||
? { total: returnedRowCount, totalKnown: true }
|
||||
: resolveQueryResultPaginationTotal({
|
||||
current,
|
||||
pageSize,
|
||||
rowCount: returnedRowCount,
|
||||
});
|
||||
|
||||
return {
|
||||
current,
|
||||
|
||||
Reference in New Issue
Block a user