GithubBackup/MyGoNavi
1
0
Fork 0
mirror of https://github.com/Syngnat/GoNavi.git synced 2026-07-20 12:21:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

🐛 fix(query-results): 修复金仓带模式表主键识别

Browse Source 
- PG 类数据库保留 schema.table 作为查询结果表名和元数据表名
- 元数据连接继续使用当前数据库，避免把 schema 误当 database
- 补充金仓列、索引和前端可编辑定位回归测试
This commit is contained in:
Syngnat
2026-06-29 15:18:13 +08:00
parent 4798d3e8ec
commit 04bbab3d7e
4 changed files with 193 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
frontend/src/utils/queryResultTable.test.ts
View File

@@ -57,6 +57,22 @@ describe('extractQueryResultTableRef', () => {
});
});
it('keeps PostgreSQL-like schema-qualified table names while using the current database for metadata lookups', () => {
expect(extractQueryResultTableRef('SELECT * FROM ldf_server.mes_work_order', 'kingbase', 'ldf_server_dbs_dev'))
.toEqual({
tableName: 'ldf_server.mes_work_order',
metadataDbName: 'ldf_server_dbs_dev',
metadataTableName: 'ldf_server.mes_work_order',
});
expect(extractQueryResultTableRef('SELECT * FROM ops.jobs LIMIT 20', 'postgres', 'app_db'))
.toEqual({
tableName: 'ops.jobs',
metadataDbName: 'app_db',
metadataTableName: 'ops.jobs',
});
});
it('keeps DuckDB schema-qualified table names for metadata lookups', () => {
expect(extractQueryResultTableRef('SELECT * FROM main.events LIMIT 500', 'duckdb', 'main'))
.toEqual({

32
frontend/src/utils/queryResultTable.ts
View File

@@ -23,7 +23,26 @@ const isOracleLikeDialect = (dialect: string): boolean => {
const keepsQualifiedTableNameForMetadata = (dialect: string): boolean => {
const normalized = String(dialect || '').trim().toLowerCase();
return normalized === 'duckdb';
return normalized === 'duckdb' || isPostgresLikeDialect(normalized);
};
const isPostgresLikeDialect = (dialect: string): boolean => {
const normalized = String(dialect || '').trim().toLowerCase();
return normalized === 'postgres'
|| normalized === 'postgresql'
|| normalized === 'pg'
|| normalized === 'kingbase'
|| normalized === 'kingbase8'
|| normalized === 'kingbasees'
|| normalized === 'kingbasev8'
|| normalized === 'highgo'
|| normalized === 'vastbase'
|| normalized === 'opengauss'
|| normalized === 'open_gauss'
|| normalized === 'open-gauss'
|| normalized === 'gaussdb'
|| normalized === 'gauss_db'
|| normalized === 'gauss-db';
};
const isQuotedIdentifier = (part: string): boolean => {
@@ -85,16 +104,21 @@ export const extractQueryResultTableRef = (
? defaultOracleSchema || normalizeCurrentDbName(currentDb, dialect)
: normalizeCurrentDbName(currentDb, dialect);
const metadataDbName = owner || fallbackSchema;
const tableName = isOracleLikeDialect(dialect) && owner
const qualifiedTableName = owner ? `${owner}.${metadataTableName}` : metadataTableName;
const pgLikeQualifiedMetadata = isPostgresLikeDialect(dialect) && owner;
const resolvedMetadataDbName = pgLikeQualifiedMetadata
? normalizeCurrentDbName(currentDb, dialect)
: metadataDbName;
const tableName = (isOracleLikeDialect(dialect) && owner) || pgLikeQualifiedMetadata
? `${owner}.${metadataTableName}`
: (keepsQualifiedTableNameForMetadata(dialect) && owner ? `${owner}.${metadataTableName}` : metadataTableName);
const resolvedMetadataTableName = keepsQualifiedTableNameForMetadata(dialect) && owner
? `${owner}.${metadataTableName}`
? qualifiedTableName
: metadataTableName;
return {
tableName,
metadataDbName,
metadataDbName: resolvedMetadataDbName || metadataDbName,
metadataTableName: resolvedMetadataTableName,
};
};