mirror of
https://github.com/Syngnat/GoNavi.git
synced 2026-07-08 22:12:29 +08:00
Compare commits
26 Commits
fix/update
...
fix/oceanb
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5712b39cf9 | ||
|
|
07dc1436af | ||
|
|
20ff4f3687 | ||
|
|
73ce3039ce | ||
|
|
c27a038fc5 | ||
|
|
c3c4efc6ec | ||
|
|
61296bc855 | ||
|
|
78da0076cf | ||
|
|
279b38fec3 | ||
|
|
0e348fcca4 | ||
|
|
7d79fae84d | ||
|
|
f642e0325d | ||
|
|
43a408f1c9 | ||
|
|
b97b5cf6e2 | ||
|
|
6c269a99cf | ||
|
|
24841f2dd9 | ||
|
|
c2e60c1e52 | ||
|
|
7a87d43bdc | ||
|
|
5fa1c90674 | ||
|
|
c79225ef27 | ||
|
|
0bd8fdea1f | ||
|
|
18dbd043ae | ||
|
|
a7535dec2b | ||
|
|
dbd4b7f763 | ||
|
|
68eacbbcf7 | ||
|
|
a4a0ac25cf |
@@ -126,10 +126,11 @@ const installOceanBaseOracleNavigationFallback = (editor: any) => {
|
||||
}
|
||||
|
||||
const parts = splitSqlIdentifierPath(identifier.text);
|
||||
if (parts.length !== 2) {
|
||||
if (parts.length < 2) {
|
||||
return;
|
||||
}
|
||||
const [schemaName, tableName] = parts;
|
||||
const schemaName = parts[parts.length - 2];
|
||||
const tableName = parts[parts.length - 1];
|
||||
if (!schemaName || !tableName) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -14,6 +14,7 @@ const legacyLiterals = [
|
||||
'选择连接',
|
||||
'选择数据库',
|
||||
'最大返回行数',
|
||||
'最大行数:100',
|
||||
'最大行数:500',
|
||||
'最大行数:1000',
|
||||
'最大行数:5000',
|
||||
@@ -64,6 +65,7 @@ describe('QueryEditorToolbar i18n', () => {
|
||||
expect(source).toContain("import { useOptionalI18n } from '../i18n/provider';");
|
||||
expect(source).toContain('const i18n = useOptionalI18n();');
|
||||
expect(source).toContain('const t = i18n?.t ?? defaultTranslate;');
|
||||
expect(source).toContain("{ label: '100', value: 100 }");
|
||||
|
||||
for (const key of requiredKeys) {
|
||||
expect(source).toContain(key);
|
||||
|
||||
@@ -291,6 +291,7 @@ const QueryEditorToolbar: React.FC<QueryEditorToolbarProps> = ({
|
||||
value={maxRows}
|
||||
onChange={(val) => onMaxRowsChange(Number(val))}
|
||||
options={[
|
||||
{ label: '100', value: 100 },
|
||||
{ label: t("query_editor.max_rows.option_500"), value: 500 },
|
||||
{ label: t("query_editor.max_rows.option_1000"), value: 1000 },
|
||||
{ label: t("query_editor.max_rows.option_5000"), value: 5000 },
|
||||
|
||||
@@ -40,9 +40,9 @@ describe('applyQueryAutoLimit', () => {
|
||||
['dameng'],
|
||||
['dm'],
|
||||
['dm8'],
|
||||
])('adds ROWNUM limit for %s connections', (dbType) => {
|
||||
])('adds FETCH FIRST limit for %s connections', (dbType) => {
|
||||
expect(applyQueryAutoLimit('SELECT * FROM MYCIMLED.EDC_LOG', dbType, 500).sql)
|
||||
.toBe('SELECT * FROM (SELECT * FROM MYCIMLED.EDC_LOG) WHERE ROWNUM <= 500');
|
||||
.toBe('SELECT * FROM MYCIMLED.EDC_LOG FETCH FIRST 500 ROWS ONLY');
|
||||
});
|
||||
|
||||
it.each([
|
||||
@@ -61,8 +61,8 @@ describe('applyQueryAutoLimit', () => {
|
||||
});
|
||||
|
||||
it.each([
|
||||
['oracle', 'SELECT * FROM (SELECT * FROM users) WHERE ROWNUM <= 500'],
|
||||
['dm8', 'SELECT * FROM (SELECT * FROM users) WHERE ROWNUM <= 500'],
|
||||
['oracle', 'SELECT * FROM users FETCH FIRST 500 ROWS ONLY'],
|
||||
['dm8', 'SELECT * FROM users FETCH FIRST 500 ROWS ONLY'],
|
||||
['mssql', 'SELECT TOP 500 * FROM users'],
|
||||
['postgresql', 'SELECT * FROM users LIMIT 500'],
|
||||
['gauss-db', 'SELECT * FROM users LIMIT 500'],
|
||||
@@ -76,12 +76,17 @@ describe('applyQueryAutoLimit', () => {
|
||||
|
||||
it('keeps trailing semicolon and comments after injected Oracle limit', () => {
|
||||
expect(applyQueryAutoLimit('SELECT * FROM MYCIMLED.EDC_LOG; -- preview', 'oracle', 500).sql)
|
||||
.toBe('SELECT * FROM (SELECT * FROM MYCIMLED.EDC_LOG) WHERE ROWNUM <= 500; -- preview');
|
||||
.toBe('SELECT * FROM MYCIMLED.EDC_LOG FETCH FIRST 500 ROWS ONLY; -- preview');
|
||||
});
|
||||
|
||||
it('uses Oracle 11g compatible ROWNUM limit for simple table queries', () => {
|
||||
it('uses Oracle FETCH FIRST limit for simple table queries', () => {
|
||||
expect(applyQueryAutoLimit('select 1 from xxx', 'oracle', 500).sql)
|
||||
.toBe('SELECT * FROM (select 1 from xxx) WHERE ROWNUM <= 500');
|
||||
.toBe('select 1 from xxx FETCH FIRST 500 ROWS ONLY');
|
||||
});
|
||||
|
||||
it('keeps ORDER BY semantics with Oracle FETCH FIRST', () => {
|
||||
expect(applyQueryAutoLimit('SELECT * FROM users ORDER BY created_at DESC', 'oracle', 100).sql)
|
||||
.toBe('SELECT * FROM users ORDER BY created_at DESC FETCH FIRST 100 ROWS ONLY');
|
||||
});
|
||||
|
||||
it('does not add another generic limit when SQL already limits rows', () => {
|
||||
|
||||
@@ -322,7 +322,7 @@ export const applyQueryAutoLimit = (
|
||||
if (offsetPos >= 0 && (fromPos < 0 || offsetPos > fromPos)) return { sql, applied: false, maxRows };
|
||||
const forPos = findTopLevelKeyword(main, 'for');
|
||||
if (forPos >= 0 && (fromPos < 0 || forPos > fromPos)) return { sql, applied: false, maxRows };
|
||||
return { sql: `SELECT * FROM (${main.trimEnd()}) WHERE ROWNUM <= ${maxRows}${tail}`, applied: true, maxRows };
|
||||
return { sql: `${main.trimEnd()} FETCH FIRST ${maxRows} ROWS ONLY${tail}`, applied: true, maxRows };
|
||||
}
|
||||
|
||||
const offsetPos = findTopLevelKeyword(main, 'offset');
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -93,9 +93,9 @@ func resolveWindowsUpdateFinalTargetPath(currentTarget string, sourcePath string
|
||||
func isVersionedWindowsUpdatePackageName(name string) bool {
|
||||
trimmed := strings.TrimSpace(name)
|
||||
lower := strings.ToLower(trimmed)
|
||||
return strings.HasPrefix(trimmed, "GoNavi-")
|
||||
&& strings.Contains(trimmed, "-Windows-")
|
||||
&& strings.HasSuffix(lower, ".exe")
|
||||
return strings.HasPrefix(trimmed, "GoNavi-") &&
|
||||
strings.Contains(trimmed, "-Windows-") &&
|
||||
strings.HasSuffix(lower, ".exe")
|
||||
}
|
||||
|
||||
func prepareWindowsStagedUpdateAsset(sourcePath string, stagedDir string) (string, error) {
|
||||
|
||||
Reference in New Issue
Block a user