Skip to content

armgit / dbx

Public Imported from GitHub
0

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。

feat(completion): suggest dameng sequences in oracle completion

弈秋616687e3de86
diff --git a/apps/desktop/src/components/editor/useQueryEditorCompletion.ts b/apps/desktop/src/components/editor/useQueryEditorCompletion.ts
index a941c26734..4069064be9 100644
--- a/apps/desktop/src/components/editor/useQueryEditorCompletion.ts
+++ b/apps/desktop/src/components/editor/useQueryEditorCompletion.ts
@@ -50,7 +50,7 @@ import { completionLabelPresentation } from "@/lib/editor/sqlCompletionPresentat
import { supportsDatabaseNameCompletion } from "@/lib/database/databaseFeatureSupport";
import { sqlSnippetDatabaseTypeForConnection } from "@/lib/database/jdbcDialect";
import { oracleDatabaseLinkCompletionItems } from "@/lib/sql/oracleDatabaseLinkCompletion";
-import { isOracleCompletionDatabase } from "@/lib/sql/oracleCompletionSession";
+import { isOracleCompletionDatabase, isSequenceCompletionDatabase } from "@/lib/sql/oracleCompletionSession";
import { buildRedisCompletionItemsFromContext, getRedisCompletionContext, getRedisCompletionResultValidFor, shouldAutoOpenRedisCompletion, takesKeyArgument } from "@/lib/redis/redisCompletion";
import type { SqlCompletionColumn, SqlCompletionContext, SqlCompletionForeignKey, SqlCompletionItem, SqlCompletionObject } from "@/lib/sql/sqlCompletion";
import type { CompletionAssistantObjectKind, SqlServerCompletionContext } from "@/types/database";
@@ -1462,7 +1462,7 @@ export function useQueryEditorCompletion(options: QueryEditorCompletionOptions)
function completionObjectKindsForContext(completionContext: ReturnType<typeof getSqlCompletionContext>): CompletionAssistantObjectKind[] {
if (completionContext.contextKind === "exec") return ["procedure"];
- if (isOracleCompletionDatabase(props.databaseType)) {
+ if (isSequenceCompletionDatabase(props.databaseType)) {
if (completionContext.suggestColumns && completionContext.referencedTables.length > 0 && !completionContext.qualifier) {
return ["function", "sequence"];
}
diff --git a/apps/desktop/src/lib/__tests__/sql/sqlCompletion.context.spec.ts b/apps/desktop/src/lib/__tests__/sql/sqlCompletion.context.spec.ts
index ce800c8bbe..198c6a4b90 100644
--- a/apps/desktop/src/lib/__tests__/sql/sqlCompletion.context.spec.ts
+++ b/apps/desktop/src/lib/__tests__/sql/sqlCompletion.context.spec.ts
@@ -633,6 +633,64 @@ describe("PostgreSQL sequence literal completion", () => {
);
});
+ it("suggests Dameng sequences like Oracle sequences", () => {
+ const unqualifiedItems = buildSqlCompletionItems("SELECT ord", "SELECT ord".length, {
+ tables: [],
+ objects: [{ name: "ORDER_SEQ", schema: "APP", type: "sequence" }],
+ columnsByTable: new Map(),
+ databaseType: "dameng",
+ dialect: "oracle",
+ currentSchema: "APP",
+ });
+
+ expect(unqualifiedItems).toEqual(
+ expect.arrayContaining([
+ expect.objectContaining({
+ label: "ORDER_SEQ",
+ type: "sequence",
+ detail: "sequence in APP",
+ apply: "ORDER_SEQ",
+ }),
+ ]),
+ );
+
+ const pseudoColumnSql = "SELECT ORDER_SEQ.";
+ const pseudoColumnItems = buildSqlCompletionItems(pseudoColumnSql, pseudoColumnSql.length, {
+ tables: [],
+ objects: [{ name: "ORDER_SEQ", schema: "APP", type: "sequence" }],
+ columnsByTable: new Map(),
+ databaseType: "dameng",
+ dialect: "oracle",
+ });
+
+ expect(pseudoColumnItems).toEqual(
+ expect.arrayContaining([
+ expect.objectContaining({
+ label: "NEXTVAL",
+ type: "column",
+ detail: "sequence pseudo-column",
+ }),
+ expect.objectContaining({
+ label: "CURRVAL",
+ type: "column",
+ detail: "sequence pseudo-column",
+ }),
+ ]),
+ );
+ });
+
+ it("does not suggest sequences for databases without Oracle-style sequences", () => {
+ const items = buildSqlCompletionItems("SELECT ord", "SELECT ord".length, {
+ tables: [],
+ objects: [{ name: "ORDER_SEQ", schema: "APP", type: "sequence" }],
+ columnsByTable: new Map(),
+ databaseType: "mysql",
+ dialect: "mysql",
+ });
+
+ expect(items).not.toEqual(expect.arrayContaining([expect.objectContaining({ label: "ORDER_SEQ", type: "sequence" })]));
+ });
+
it("respects keyword case for Oracle sequence pseudo-columns", () => {
const sql = "SELECT ORDER_SEQ.n";
const items = buildSqlCompletionItems(sql, sql.length, {
diff --git a/apps/desktop/src/lib/sql/oracleCompletionSession.ts b/apps/desktop/src/lib/sql/oracleCompletionSession.ts
index 9f76c077bc..54406f8e3d 100644
--- a/apps/desktop/src/lib/sql/oracleCompletionSession.ts
+++ b/apps/desktop/src/lib/sql/oracleCompletionSession.ts
@@ -5,6 +5,11 @@ export function isOracleCompletionDatabase(databaseType?: DatabaseType): boolean
return databaseType === "oracle" || databaseType === "oceanbase-oracle";
}
+/** Engines whose sequences are addressed like Oracle's (SEQ.NEXTVAL / SEQ.CURRVAL). */
+export function isSequenceCompletionDatabase(databaseType?: DatabaseType): boolean {
+ return isOracleCompletionDatabase(databaseType) || databaseType === "dameng";
+}
+
export function usesOracleCurrentSchemaCompletion(databaseType?: DatabaseType, schema?: string | null): boolean {
return isOracleCompletionDatabase(databaseType) && !schema;
}
diff --git a/apps/desktop/src/lib/sql/sqlCompletion.ts b/apps/desktop/src/lib/sql/sqlCompletion.ts
index 1d62f23edc..ab3b75491f 100644
--- a/apps/desktop/src/lib/sql/sqlCompletion.ts
+++ b/apps/desktop/src/lib/sql/sqlCompletion.ts
@@ -25,7 +25,7 @@ import { ORACLE_FUNCTION_APPLY_TEMPLATES, ORACLE_FUNCTION_SIGNATURES } from "@/l
import { POSTGRES_FUNCTION_APPLY_TEMPLATES, POSTGRES_FUNCTION_SIGNATURES } from "@/lib/sql/functionSignatures/postgres";
import { TRINO_FUNCTION_APPLY_TEMPLATES, TRINO_FUNCTION_SIGNATURES } from "@/lib/sql/functionSignatures/trino";
import { rejectsAliasReferenceInHaving } from "@/lib/database/databaseFeatureSupport";
-import { isOracleCompletionDatabase } from "@/lib/sql/oracleCompletionSession";
+import { isOracleCompletionDatabase, isSequenceCompletionDatabase } from "@/lib/sql/oracleCompletionSession";
import { normalizeSqlTableCompletionSchemaQualification, type SqlTableCompletionSchemaQualification } from "@/lib/sql/sqlCompletionSchemaQualification";
export { DEFAULT_SQL_SNIPPETS, resolveSqlSnippetBodyForDatabase } from "@/lib/sql/sqlSnippetTemplates";
@@ -1916,7 +1916,7 @@ class SqlCompletionProvider {
this.items.push(...buildColumnItems(context, this.columnsByTable, this.dialect, this.databaseType, this.input.quoteIdentifiers));
this.items.push(...buildSelectAllColumnItems(context, this.columnsByTable, this.t, this.dialect, this.databaseType));
this.items.push(...buildInsertAllColumnItems(context, this.columnsByTable, this.t, this.dialect, this.input.keywordCase));
- if (isOracleLikeDatabase(this.databaseType) && context.qualifier && !completionQualifierIsReferencedTable(context)) {
+ if ((isOracleLikeDatabase(this.databaseType) || isSequenceCompletionDatabase(this.databaseType)) && context.qualifier && !completionQualifierIsReferencedTable(context)) {
const profileObjects = driverProfileCompletionObjects(this.input.driverProfile, context);
const allObjects = [...(this.input.objects ?? []), ...profileObjects];
const hasKnownSequence = allObjects.some((object) => sequenceMatchesQualifier(object, context));
@@ -4827,7 +4827,7 @@ function buildObjectItems(context: SqlCompletionContext, objects: SqlCompletionO
const onlyProcedures = context.contextKind === "exec";
const onlyFunctions = context.suggestColumns && context.referencedTables.length > 0 && !context.qualifier;
const prioritizeOracleFunctions = isOracleCompletionDatabase(databaseType) && context.statementKind === "select";
- const allowOracleSequences = isOracleCompletionDatabase(databaseType) && !onlyProcedures;
+ const allowOracleSequences = isSequenceCompletionDatabase(databaseType) && !onlyProcedures;
return objects
.filter((object) => {
if (object.type === "sequence") {