mirror of
https://github.com/Syngnat/GoNavi.git
synced 2026-07-09 14:31:35 +08:00
Compare commits
22 Commits
fix/ci-qui
...
fix/oceanb
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9ba3216fa8 | ||
|
|
fca3f0cffb | ||
|
|
20ff4f3687 | ||
|
|
73ce3039ce | ||
|
|
c27a038fc5 | ||
|
|
c3c4efc6ec | ||
|
|
61296bc855 | ||
|
|
78da0076cf | ||
|
|
279b38fec3 | ||
|
|
0e348fcca4 | ||
|
|
7d79fae84d | ||
|
|
f642e0325d | ||
|
|
43a408f1c9 | ||
|
|
b97b5cf6e2 | ||
|
|
6c269a99cf | ||
|
|
24841f2dd9 | ||
|
|
c2e60c1e52 | ||
|
|
7a87d43bdc | ||
|
|
5fa1c90674 | ||
|
|
c79225ef27 | ||
|
|
0bd8fdea1f | ||
|
|
18dbd043ae |
@@ -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 },
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -417,9 +417,16 @@ func buildObjectSequenceMetadataQueries(dbType string, dbName string) []objectMe
|
||||
switch dbType {
|
||||
case "oracle", "dameng":
|
||||
if strings.TrimSpace(dbName) == "" {
|
||||
return []objectMetadataQuerySpec{{sql: "SELECT SEQUENCE_NAME AS sequence_name FROM USER_SEQUENCES ORDER BY SEQUENCE_NAME"}}
|
||||
return []objectMetadataQuerySpec{
|
||||
{sql: "SELECT * FROM USER_SEQUENCES ORDER BY SEQUENCE_NAME"},
|
||||
{sql: "SELECT OBJECT_NAME AS sequence_name FROM USER_OBJECTS WHERE OBJECT_TYPE = 'SEQUENCE' ORDER BY OBJECT_NAME"},
|
||||
}
|
||||
}
|
||||
owner := strings.ToUpper(safeDbName)
|
||||
return []objectMetadataQuerySpec{
|
||||
{sql: fmt.Sprintf("SELECT * FROM ALL_SEQUENCES WHERE SEQUENCE_OWNER = '%s' ORDER BY SEQUENCE_NAME", owner)},
|
||||
{sql: fmt.Sprintf("SELECT OWNER AS schema_name, OBJECT_NAME AS sequence_name FROM ALL_OBJECTS WHERE OWNER = '%s' AND OBJECT_TYPE = 'SEQUENCE' ORDER BY OBJECT_NAME", owner)},
|
||||
}
|
||||
return []objectMetadataQuerySpec{{sql: fmt.Sprintf("SELECT SEQUENCE_OWNER AS schema_name, SEQUENCE_NAME AS sequence_name FROM ALL_SEQUENCES WHERE SEQUENCE_OWNER = '%s' ORDER BY SEQUENCE_NAME", strings.ToUpper(safeDbName))}}
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
|
||||
39
internal/app/methods_db_objects_sequence_test.go
Normal file
39
internal/app/methods_db_objects_sequence_test.go
Normal file
@@ -0,0 +1,39 @@
|
||||
package app
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestBuildObjectSequenceMetadataQueriesOracleUsesWildcardAndObjectFallback(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
specs := buildObjectSequenceMetadataQueries("oracle", "sbdev")
|
||||
if len(specs) != 2 {
|
||||
t.Fatalf("expected 2 Oracle sequence metadata queries, got %d", len(specs))
|
||||
}
|
||||
if !strings.Contains(specs[0].sql, "SELECT * FROM ALL_SEQUENCES") {
|
||||
t.Fatalf("expected ALL_SEQUENCES wildcard query, got %q", specs[0].sql)
|
||||
}
|
||||
if strings.Contains(specs[0].sql, "LAST_NUMBER") || strings.Contains(specs[0].sql, "ORDER_FLAG") {
|
||||
t.Fatalf("query should not enumerate optional sequence columns: %q", specs[0].sql)
|
||||
}
|
||||
if !strings.Contains(specs[1].sql, "ALL_OBJECTS") || !strings.Contains(specs[1].sql, "OBJECT_TYPE = 'SEQUENCE'") {
|
||||
t.Fatalf("expected ALL_OBJECTS fallback query, got %q", specs[1].sql)
|
||||
}
|
||||
}
|
||||
|
||||
func TestBuildObjectSequenceMetadataQueriesOracleUserFallbacks(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
specs := buildObjectSequenceMetadataQueries("oracle", "")
|
||||
if len(specs) != 2 {
|
||||
t.Fatalf("expected 2 Oracle user sequence metadata queries, got %d", len(specs))
|
||||
}
|
||||
if specs[0].sql != "SELECT * FROM USER_SEQUENCES ORDER BY SEQUENCE_NAME" {
|
||||
t.Fatalf("unexpected USER_SEQUENCES query: %q", specs[0].sql)
|
||||
}
|
||||
if !strings.Contains(specs[1].sql, "USER_OBJECTS") || !strings.Contains(specs[1].sql, "OBJECT_TYPE = 'SEQUENCE'") {
|
||||
t.Fatalf("expected USER_OBJECTS fallback query, got %q", specs[1].sql)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user