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(oceanbase-oracle): keep char units and negative NUMBER scale
efeire6748009181ba
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.javaindex afec2e0668..8f32698dcc 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@@ -918,7 +918,7 @@ public final class OceanBaseOracleAgent extends ConfiguredJdbcAgent {String tableName = normalizeObjectName(table);String sql = """SELECT c.COLUMN_NAME, c.DATA_TYPE, c.NULLABLE, c.DATA_PRECISION, c.DATA_SCALE,- c.DATA_LENGTH, c.CHAR_LENGTH, c.DATA_DEFAULT, cc.COMMENTS,+ c.DATA_LENGTH, c.CHAR_LENGTH, c.CHAR_USED, c.DATA_DEFAULT, cc.COMMENTS,CASE WHEN pk.COLUMN_NAME IS NULL THEN 0 ELSE 1 END AS IS_PKFROM ALL_TAB_COLUMNS cLEFT JOIN ALL_COL_COMMENTS cc@@ -952,7 +952,7 @@ public final class OceanBaseOracleAgent extends ConfiguredJdbcAgent {Integer charLen = intOrNull(rs, "CHAR_LENGTH");result.add(new ColumnInfo(name,- formatDataType(baseType, numPrec, numScale, dataLen, charLen),+ formatDataType(baseType, numPrec, numScale, dataLen, charLen, rs.getString("CHAR_USED")),"Y".equalsIgnoreCase(rs.getString("NULLABLE")),defaultValue,rs.getInt("IS_PK") == 1,@@ -1532,17 +1532,23 @@ public final class OceanBaseOracleAgent extends ConfiguredJdbcAgent {return false;}- private static String formatDataType(String base, Integer numPrec, Integer numScale, Integer dataLen, Integer charLen) {+ private static String formatDataType(String base, Integer numPrec, Integer numScale, Integer dataLen, Integer charLen, String charUsed) {if (base == null || base.isBlank()) {return "";}return switch (base.toUpperCase(Locale.ROOT)) {- case "VARCHAR2", "NVARCHAR2", "CHAR", "NCHAR" -> {+ case "VARCHAR2", "CHAR" -> {+ if ("B".equalsIgnoreCase(charUsed) && dataLen != null) yield base + "(" + dataLen + " BYTE)";+ if ("C".equalsIgnoreCase(charUsed) && charLen != null) yield base + "(" + charLen + " CHAR)";+ Integer len = charLen == null ? dataLen : charLen;+ yield len == null ? base : base + "(" + len + ")";+ }+ case "NVARCHAR2", "NCHAR" -> {Integer len = charLen == null ? dataLen : charLen;yield len == null ? base : base + "(" + len + ")";}case "NUMBER" -> {- if (numPrec != null && numScale != null && numScale > 0) {+ if (numPrec != null && numScale != null && numScale != 0) {yield base + "(" + numPrec + "," + numScale + ")";}if (numPrec != null && numPrec > 0) {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.javaindex 285d2594c4..a9ab278ad4 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@@ -785,6 +785,28 @@ class OceanBaseOracleAgentTest {Assertions.assertTrue(sql.get(0).contains("c.DATA_DEFAULT"), sql.get(0));}+ @Test+ void getColumnsPreservesCharacterUnitsAndNegativeScale() {+ List<String> sql = new ArrayList<>();+ OceanBaseOracleAgent agent = new OceanBaseOracleAgent();+ TestSupport.setPrivateConnection(agent, preparedConnection(sql, columnResultSet(new Object[][]{+ {"VB", "VARCHAR2", "Y", null, null, 8, 8, null, null, 0, "B"},+ {"VC", "VARCHAR2", "Y", null, null, 32, 8, null, null, 0, "C"},+ {"NC", "NVARCHAR2", "Y", null, null, 32, 8, null, null, 0, "C"},+ {"CB", "CHAR", "Y", null, null, 12, 4, null, null, 0, "B"},+ {"CC", "CHAR", "Y", null, null, 32, 8, null, null, 0, "C"},+ {"NR", "NUMBER", "Y", 10, -2, 22, 0, null, null, 0, null},+ {"NZ", "NUMBER", "Y", 10, 0, 22, 0, null, null, 0, null},+ {"NP", "NUMBER", "Y", 10, 2, 22, 0, null, null, 0, null},+ {"NU", "NUMBER", "Y", null, null, 22, 0, null, null, 0, null},+ {"VU", "VARCHAR2", "Y", null, null, 32, 8, null, null, 0, null}+ })));+ List<ColumnInfo> columns = agent.getColumns("APP", "USERS");+ Assertions.assertEquals(List.of("VARCHAR2(8 BYTE)", "VARCHAR2(8 CHAR)", "NVARCHAR2(8)", "CHAR(12 BYTE)", "CHAR(8 CHAR)", "NUMBER(10,-2)", "NUMBER(10)", "NUMBER(10,2)", "NUMBER", "VARCHAR2(8)"),+ columns.stream().map(ColumnInfo::getData_type).toList());+ Assertions.assertTrue(sql.get(0).contains("c.CHAR_USED"));+ }+@Testvoid getColumnsResolvesTheCurrentSchemaWhenSchemaIsEmpty() {List<String> sql = new ArrayList<>();@@ -1054,9 +1076,10 @@ class OceanBaseOracleAgentTest {"CHAR_LENGTH","DATA_DEFAULT","COMMENTS",- "IS_PK"+ "IS_PK",+ "CHAR_USED"},- rows+ java.util.Arrays.stream(rows).map(row -> java.util.Arrays.copyOf(row, 11)).toArray(Object[][]::new));}diff --git a/apps/desktop/src/components/structure/TableStructureEditor.vue b/apps/desktop/src/components/structure/TableStructureEditor.vueindex af07b3cf24..c30899077b 100644--- a/apps/desktop/src/components/structure/TableStructureEditor.vue+++ b/apps/desktop/src/components/structure/TableStructureEditor.vue@@ -1368,7 +1368,7 @@ const usesNativeMysqlIndexNames = computed(() => {const profile = connection.value?.driver_profile?.trim().toLowerCase();return databaseType.value === "mysql" && connection.value?.db_type === "mysql" && (!profile || profile === "mysql");});-const supportsCharacterLengthUnits = computed(() => databaseType.value === "dameng" || databaseType.value === "oracle");+const supportsCharacterLengthUnits = computed(() => databaseType.value === "dameng" || databaseType.value === "oracle" || databaseType.value === "oceanbase-oracle");const usesMysql8SafeDefaults = computed(() => databaseType.value === "mysql" && connection.value?.db_type === "mysql" && connection.value.driver_profile === "mysql");const structureCapabilities = computed(() => getTableStructureCapabilities(databaseType.value, connection.value?.db_type, connection.value?.database_info?.productVersion));const tableMetadataCapabilities = computed(() => getTableMetadataCapabilities(databaseType.value));diff --git a/apps/desktop/src/lib/__tests__/table/tableStructureEditorState.spec.ts b/apps/desktop/src/lib/__tests__/table/tableStructureEditorState.spec.tsindex df9014332c..0b4a2558d1 100644--- a/apps/desktop/src/lib/__tests__/table/tableStructureEditorState.spec.ts+++ b/apps/desktop/src/lib/__tests__/table/tableStructureEditorState.spec.ts@@ -670,10 +670,11 @@ describe("tableStructureEditorState", () => {expect(combineDataTypeForDatabaseWithLengthUnit("dameng", "varchar2", "255", "")).toBe("varchar2(255)");});- it("separates and reconstructs Oracle character length units", () => {- expect(dataTypeLengthInputValue("oracle", "VARCHAR2(255 CHAR)")).toBe("255");- expect(dataTypeLengthUnitValue("oracle", "VARCHAR2(255 CHAR)")).toBe("CHAR");- expect(combineDataTypeForDatabaseWithLengthUnit("oracle", "VARCHAR2", "64", "BYTE")).toBe("VARCHAR2(64 BYTE)");+ it.each(["oracle", "oceanbase-oracle"] as const)("separates and reconstructs %s character length units", (databaseType) => {+ expect(dataTypeLengthInputValue(databaseType, "VARCHAR2(255 CHAR)")).toBe("255");+ expect(dataTypeLengthUnitValue(databaseType, "VARCHAR2(255 CHAR)")).toBe("CHAR");+ expect(combineDataTypeForDatabaseWithLengthUnit(databaseType, "VARCHAR2", "64", "BYTE")).toBe("VARCHAR2(64 BYTE)");+ expect(getDataTypeLengthUnitOptions(databaseType, "NVARCHAR2(10)")).toEqual([]);});it("does not reinterpret unsupported length parameters or dialects", () => {@@ -725,10 +726,10 @@ describe("tableStructureEditorState", () => {expect(restored?.original?.data_type).toBe("VARCHAR2(255 BYTE)");});- it("keeps a saved Oracle length unit when refreshed metadata omits it", () => {- const [legacyAgentDraft] = createColumnDrafts([{ name: "DISPLAY_NAME", data_type: "VARCHAR2(255)", is_nullable: true, column_default: null, is_primary_key: false, extra: null }], "oracle");+ it.each(["oracle", "oceanbase-oracle"] as const)("keeps a saved %s length unit when refreshed metadata omits it", (databaseType) => {+ const [legacyAgentDraft] = createColumnDrafts([{ name: "DISPLAY_NAME", data_type: "VARCHAR2(255)", is_nullable: true, column_default: null, is_primary_key: false, extra: null }], databaseType);- const [restored] = restoreCharacterLengthUnitsAfterSave("oracle", [legacyAgentDraft!], new Map([["display_name", "VARCHAR2(255 CHAR)"]]));+ const [restored] = restoreCharacterLengthUnitsAfterSave(databaseType, [legacyAgentDraft!], new Map([["display_name", "VARCHAR2(255 CHAR)"]]));expect(restored?.dataType).toBe("VARCHAR2(255 CHAR)");expect(restored?.original?.data_type).toBe("VARCHAR2(255 CHAR)");diff --git a/apps/desktop/src/lib/table/tableStructureEditorState.ts b/apps/desktop/src/lib/table/tableStructureEditorState.tsindex 4b672cd54b..4cdb660c46 100644--- a/apps/desktop/src/lib/table/tableStructureEditorState.ts+++ b/apps/desktop/src/lib/table/tableStructureEditorState.ts@@ -1471,7 +1471,7 @@ function normalizedDataTypeName(rawDataType: string): string {}export function getDataTypeLengthUnitOptions(dbType: DatabaseType | undefined, rawDataType: string): readonly DataTypeLengthUnit[] {- if (dbType !== "dameng" && dbType !== "oracle") return [];+ if (dbType !== "dameng" && dbType !== "oracle" && dbType !== "oceanbase-oracle") return [];return CHARACTER_LENGTH_UNIT_TYPES.has(normalizedDataTypeName(rawDataType)) ? CHARACTER_LENGTH_UNITS : [];}