25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。
TypeScript aicliclickhousedatabasedatabase-clientdatabase-managementdockerguimcpmongodbmysqlpostgresqlredisrustsql-serversqlitetaurivue
fix(sql): recognize Oracle pseudo-columns in semantic diagnostics
onenewcodecaa43b6f2aaa
diff --git a/apps/desktop/src/lib/__tests__/sql/semantic/diagnostics.spec.ts b/apps/desktop/src/lib/__tests__/sql/semantic/diagnostics.spec.tsindex 7ba48f8734..f065e93f91 100644--- a/apps/desktop/src/lib/__tests__/sql/semantic/diagnostics.spec.ts+++ b/apps/desktop/src/lib/__tests__/sql/semantic/diagnostics.spec.ts@@ -56,3 +56,45 @@ describe("buildSqlSemanticDiagnostics GROUP BY violations", () => {expect(diagnostics[0]?.severity).toBe("error");});});++describe("buildSqlSemanticDiagnostics Oracle pseudo-columns", () => {+ const buildAnalysis = (sql: string, token: string, options: { quoted?: boolean; qualifier?: string } = {}) => {+ const tokenStart = sql.indexOf(token);+ const start = options.quoted ? tokenStart - 1 : tokenStart;+ const end = options.quoted ? tokenStart + token.length + 1 : tokenStart + token.length;+ return {+ tables: [{ name: "users", span: span(sql.indexOf("users") + 1, sql.indexOf("users") + "users".length) }],+ columns: [{ name: token, qualifier: options.qualifier ?? null, span: span(start + 1, end) }],+ };+ };++ it("accepts unqualified Oracle pseudo-columns missing from table metadata", () => {+ const sql = "SELECT * FROM users WHERE ROWNUM < 10;";+ const analysis = buildAnalysis(sql, "ROWNUM");++ const diagnostics = buildSqlSemanticDiagnostics(analysis, {+ tables: [{ name: "users" }],+ columnsByTable: new Map([["users", [{ name: "id" }]]]),+ loadedColumnTables: new Set(["users"]),+ sql,+ databaseType: "oracle",+ });++ expect(diagnostics).toEqual([]);+ });++ it("keeps validating quoted pseudo-column names as real columns", () => {+ const sql = 'SELECT * FROM users WHERE "ROWNUM" < 10;';+ const analysis = buildAnalysis(sql, "ROWNUM", { quoted: true });++ const diagnostics = buildSqlSemanticDiagnostics(analysis, {+ tables: [{ name: "users" }],+ columnsByTable: new Map([["users", [{ name: "id" }]]]),+ loadedColumnTables: new Set(["users"]),+ sql,+ databaseType: "oracle",+ });++ expect(diagnostics.map((diagnostic) => diagnostic.message)).toEqual(["Unknown column ROWNUM"]);+ });+});diff --git a/apps/desktop/src/lib/sql/semantic/diagnostics.ts b/apps/desktop/src/lib/sql/semantic/diagnostics.tsindex 0053aa72e9..5a3df8a326 100644--- a/apps/desktop/src/lib/sql/semantic/diagnostics.ts+++ b/apps/desktop/src/lib/sql/semantic/diagnostics.ts@@ -1,5 +1,5 @@import type { SqlCompletionColumn, SqlCompletionTable } from "@/lib/sql/sqlCompletion";-import { getSqlCompletionContext, isOracleSystemValueName } from "@/lib/sql/sqlCompletion";+import { getSqlCompletionContext, isOraclePseudoColumnName, isOracleSystemValueName } from "@/lib/sql/sqlCompletion";import { executableStatementRanges, keepsOracleStyleBlockTogether, type SqlTextRange } from "@/lib/sql/sqlStatementRanges";import { DBX_TDENGINE_TBNAME_COLUMN, isTdengineStableTableType } from "@/lib/table/tableEditing";import type { DatabaseType, SqlColumnReference, SqlGroupByViolation, SqlReferenceAnalysis, SqlReferenceScope, SqlTableReference, SqlTextSpan } from "@/types/database";@@ -287,7 +287,7 @@ export function buildSqlSemanticDiagnostics(analysis: SqlReferenceAnalysis, sche}for (const column of analysis.columns) {- if (isUnquotedOracleSystemValueReference(column, schema)) continue;+ if (isUnquotedOracleBuiltinReference(column, schema)) continue;const table = resolveColumnTable(column, tables, knownTables, schema.sql, scopesById);if (!table) continue;if (schema.missingTables?.has(tableReferenceKey(table))) continue;@@ -352,8 +352,8 @@ function completionTableReferenceKey(table: Pick<SqlCompletionTable, "name" | "dreturn normalizeName(table.name);}-function isUnquotedOracleSystemValueReference(column: SqlColumnReference, schema: SqlSemanticDiagnosticSchema): boolean {- if (column.qualifier || !isOracleSystemValueName(column.name, schema.databaseType)) return false;+function isUnquotedOracleBuiltinReference(column: SqlColumnReference, schema: SqlSemanticDiagnosticSchema): boolean {+ if (column.qualifier || !(isOracleSystemValueName(column.name, schema.databaseType) || isOraclePseudoColumnName(column.name, schema.databaseType))) return false;if (!schema.sql) return false;const range = sqlTextSpanToOffsetRange(schema.sql, column.span);diff --git a/apps/desktop/src/lib/sql/sqlCompletion.ts b/apps/desktop/src/lib/sql/sqlCompletion.tsindex e76ebc8273..be8f543754 100644--- a/apps/desktop/src/lib/sql/sqlCompletion.ts+++ b/apps/desktop/src/lib/sql/sqlCompletion.ts@@ -673,11 +673,16 @@ const ORACLE_SQL_TYPES = [const ORACLE_SYSTEM_VALUE_NAMES = ["SYSDATE", "SYSTIMESTAMP", "CURRENT_DATE", "CURRENT_TIMESTAMP", "LOCALTIMESTAMP", "SESSIONTIMEZONE", "DBTIMEZONE", "USER", "UID"] as const;const ORACLE_SYSTEM_VALUE_NAME_SET = new Set<string>(ORACLE_SYSTEM_VALUE_NAMES);+const ORACLE_PSEUDO_COLUMN_NAMES = new Set(["CONNECT_BY_ISCYCLE", "CONNECT_BY_ISLEAF", "LEVEL", "ORA_ROWSCN", "ROWID", "ROWNUM"]);export function isOracleSystemValueName(name: string, databaseType?: DatabaseType): boolean {return isOracleLikeDatabase(databaseType) && ORACLE_SYSTEM_VALUE_NAME_SET.has(name.toUpperCase());}+export function isOraclePseudoColumnName(name: string, databaseType?: DatabaseType): boolean {+ return isOracleLikeDatabase(databaseType) && ORACLE_PSEUDO_COLUMN_NAMES.has(name.toUpperCase());+}+const NON_ORACLE_COMPLETION_WORDS = new Set(["BIGSERIAL", "BOOLEAN", "ELSEIF", "LIMIT", "LOCALTIME", "SERIAL", "STRING", "TEXT", "TIME", "USE"]);const ORACLE_SQL_KEYWORDS = Array.from(