diff --git a/agents/drivers/oceanbase-oracle/src/main/java/com/dbx/agent/oceanbaseoracle/OceanBaseOracleAgent.java b/agents/drivers/oceanbase-oracle/src/main/java/com/dbx/agent/oceanbaseoracle/OceanBaseOracleAgent.java index f21d5d6057..dcc218dfae 100644 --- a/agents/drivers/oceanbase-oracle/src/main/java/com/dbx/agent/oceanbaseoracle/OceanBaseOracleAgent.java +++ b/agents/drivers/oceanbase-oracle/src/main/java/com/dbx/agent/oceanbaseoracle/OceanBaseOracleAgent.java @@ -35,6 +35,7 @@ import java.util.stream.Collectors; public final class OceanBaseOracleAgent extends ConfiguredJdbcAgent { private static final long MICROS_PER_SECOND = 1_000_000L; + private static final long UNLIMITED_QUERY_TIMEOUT_MICROS = 3_216_672_000_000_000L; private static final String COMPATIBLE_OJDBC_VERSION = "compatibleOjdbcVersion"; private static final String DEFAULT_COMPATIBLE_OJDBC_VERSION = "compatibleOjdbcVersion=8"; private static final Set SYSTEM_SCHEMAS = Set.of( @@ -120,7 +121,10 @@ public final class OceanBaseOracleAgent extends ConfiguredJdbcAgent { if (timeoutSecs < 0) { throw new IllegalArgumentException("Query timeout cannot be negative: " + timeoutSecs); } - return "ALTER SESSION SET ob_query_timeout = " + timeoutSecs * MICROS_PER_SECOND; + long timeoutMicros = timeoutSecs == 0 + ? UNLIMITED_QUERY_TIMEOUT_MICROS + : timeoutSecs * MICROS_PER_SECOND; + return "ALTER SESSION SET ob_query_timeout = " + timeoutMicros; } private static boolean isReadOnlyTransactionError(SQLException error) { diff --git a/agents/drivers/oceanbase-oracle/src/test/java/com/dbx/agent/oceanbaseoracle/OceanBaseOracleAgentTest.java b/agents/drivers/oceanbase-oracle/src/test/java/com/dbx/agent/oceanbaseoracle/OceanBaseOracleAgentTest.java index 9ab8f63cab..7333f0ea34 100644 --- a/agents/drivers/oceanbase-oracle/src/test/java/com/dbx/agent/oceanbaseoracle/OceanBaseOracleAgentTest.java +++ b/agents/drivers/oceanbase-oracle/src/test/java/com/dbx/agent/oceanbaseoracle/OceanBaseOracleAgentTest.java @@ -88,7 +88,7 @@ class OceanBaseOracleAgentTest { OceanBaseOracleAgent.queryTimeoutSql(300) ); Assertions.assertEquals( - "ALTER SESSION SET ob_query_timeout = 0", + "ALTER SESSION SET ob_query_timeout = 3216672000000000", OceanBaseOracleAgent.queryTimeoutSql(0) ); Assertions.assertEquals( @@ -102,6 +102,23 @@ class OceanBaseOracleAgentTest { Assertions.assertThrows(IllegalArgumentException.class, () -> OceanBaseOracleAgent.queryTimeoutSql(-1)); } + @Test + void treatsZeroQueryTimeoutAsUnlimitedForOceanBaseSession() { + List sql = new ArrayList<>(); + List queryTimeouts = new ArrayList<>(); + OceanBaseOracleAgent agent = new OceanBaseOracleAgent(); + Connection connection = executionConnection(sql, queryTimeouts, List.of()); + TestSupport.setPrivateConnection(agent, connection); + + agent.executeQuery("INSERT INTO ITEMS (ID) VALUES (1)", null, new ExecuteQueryOptions(10, null, 0)); + + Assertions.assertEquals(List.of( + "ALTER SESSION SET ob_query_timeout = 3216672000000000", + "INSERT INTO ITEMS (ID) VALUES (1)" + ), sql); + Assertions.assertEquals(List.of(), queryTimeouts); + } + @Test void synchronizesSessionTimeoutForEveryQueryEntryPoint() { List sql = new ArrayList<>(); @@ -122,7 +139,7 @@ class OceanBaseOracleAgentTest { "SELECT 2 FROM DUAL", "ALTER SESSION SET ob_query_timeout = 14000000", "SELECT 3 FROM DUAL", - "ALTER SESSION SET ob_query_timeout = 0" + "ALTER SESSION SET ob_query_timeout = 3216672000000000" ), sql); Assertions.assertEquals(List.of(12, 13, 14), queryTimeouts); } diff --git a/apps/desktop/src/components/icons/DatabaseIcon.spec.ts b/apps/desktop/src/components/icons/DatabaseIcon.spec.ts new file mode 100644 index 0000000000..7ac8a0176e --- /dev/null +++ b/apps/desktop/src/components/icons/DatabaseIcon.spec.ts @@ -0,0 +1,22 @@ +// @vitest-environment happy-dom + +import { createApp, nextTick } from "vue"; +import { afterEach, describe, expect, it } from "vitest"; +import DatabaseIcon from "./DatabaseIcon.vue"; + +describe("DatabaseIcon", () => { + afterEach(() => { + document.body.innerHTML = ""; + }); + + it("uses the OceanBase asset for Oracle mode", async () => { + const container = document.createElement("div"); + document.body.appendChild(container); + const app = createApp(DatabaseIcon, { dbType: "oceanbase-oracle" }); + app.mount(container); + await nextTick(); + + expect(container.querySelector("img")?.getAttribute("src")).toBe("/icons/database/oceanbase.svg"); + app.unmount(); + }); +}); diff --git a/apps/desktop/src/components/icons/DatabaseIcon.vue b/apps/desktop/src/components/icons/DatabaseIcon.vue index 6468c676f4..1a481017b2 100644 --- a/apps/desktop/src/components/icons/DatabaseIcon.vue +++ b/apps/desktop/src/components/icons/DatabaseIcon.vue @@ -35,6 +35,7 @@ const assetIcons: Record = { sqlserver: "sqlserver", access: "access.png", oceanbase: "oceanbase", + oceanbase_oracle: "oceanbase", opengauss: "opengauss", gaussdb: "gaussdb", questdb: "questdb", diff --git a/apps/desktop/src/lib/__tests__/database/databaseFeatureSupport.spec.ts b/apps/desktop/src/lib/__tests__/database/databaseFeatureSupport.spec.ts index 58e0e296e4..9dc2e922ce 100644 --- a/apps/desktop/src/lib/__tests__/database/databaseFeatureSupport.spec.ts +++ b/apps/desktop/src/lib/__tests__/database/databaseFeatureSupport.spec.ts @@ -2,7 +2,7 @@ import { describe, expect, it } from "vitest"; import { connectionNamespaceCreationTarget, databaseNodeNamespaceCreationTarget } from "@/lib/database/databaseNamespaceCreation"; import { editableDatabasePropertyGroups, editableSchemaPropertyGroups } from "@/lib/database/databasePropertyEditing"; import { buildGetDatabaseCommentSql } from "@/lib/database/dbAdminSql"; -import { isSchemaAware, supportsDatabaseNameCompletion, supportsDatabaseSchemaQualifier, supportsSqlInListPaste, supportsTransaction } from "@/lib/database/databaseFeatureSupport"; +import { isSchemaAware, supportsDatabaseNameCompletion, supportsDatabaseSchemaQualifier, supportsSqlInListPaste, supportsTableImport, supportsTransaction } from "@/lib/database/databaseFeatureSupport"; describe("schema awareness", () => { it("keeps SQLite database aliases separate from schema-capable databases", () => { @@ -89,6 +89,12 @@ describe("supportsSqlInListPaste", () => { }); }); +describe("supportsTableImport", () => { + it("enables OceanBase Oracle table import", () => { + expect(supportsTableImport("oceanbase-oracle")).toBe(true); + }); +}); + describe("database property editing", () => { it("allows MySQL-compatible charset and collation edits on database nodes", () => { expect(editableDatabasePropertyGroups({ db_type: "mysql" }, { type: "database", database: "app" })).toEqual(["charsetCollation"]); diff --git a/crates/dbx-core/assets/database-drivers.manifest.json b/crates/dbx-core/assets/database-drivers.manifest.json index b19e83e576..743e7d9116 100644 --- a/crates/dbx-core/assets/database-drivers.manifest.json +++ b/crates/dbx-core/assets/database-drivers.manifest.json @@ -1201,7 +1201,7 @@ "diagram": true, "tableDataEdit": true, "tableStructureEdit": true, - "tableImport": false, + "tableImport": true, "dataTransfer": true, "sqlFileExecution": true, "databaseCreate": false,