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。

fix(gbase8s): preserve varchar2 length in ddl

zipgee9f7cd77ed3
diff --git a/agents/common/src/main/java/com/dbx/agent/DdlBuilder.java b/agents/common/src/main/java/com/dbx/agent/DdlBuilder.java
index d71d4b59d0..281c8c9fa3 100644
--- a/agents/common/src/main/java/com/dbx/agent/DdlBuilder.java
+++ b/agents/common/src/main/java/com/dbx/agent/DdlBuilder.java
@@ -418,7 +418,9 @@ public final class DdlBuilder {
private static boolean isCharacterType(String normalized) {
return "character varying".equals(normalized)
|| "varchar".equals(normalized)
+ || "varchar2".equals(normalized)
|| "nvarchar".equals(normalized)
+ || "nvarchar2".equals(normalized)
|| "char".equals(normalized)
|| "nchar".equals(normalized)
|| "character".equals(normalized);
diff --git a/agents/drivers/gbase8s/src/main/java/com/dbx/agent/gbase8s/Gbase8sAgent.java b/agents/drivers/gbase8s/src/main/java/com/dbx/agent/gbase8s/Gbase8sAgent.java
index 141ae89aac..9d23b078af 100644
--- a/agents/drivers/gbase8s/src/main/java/com/dbx/agent/gbase8s/Gbase8sAgent.java
+++ b/agents/drivers/gbase8s/src/main/java/com/dbx/agent/gbase8s/Gbase8sAgent.java
@@ -981,6 +981,8 @@ public final class Gbase8sAgent extends ConfiguredJdbcAgent {
case 41 -> "BOOLEAN";
case 43, 52 -> "BIGINT";
case 44, 53 -> "BIGSERIAL";
+ case 63 -> "VARCHAR2";
+ case 64 -> "NVARCHAR2";
// MySQL-compat extended types (SQLMODE=mysql); codes match the
// 3.6.5+ driver's IfxBigIntUnsigned/IfxTinyInt/IfxMediumInt/IfxBit.
case 66 -> "BIGINT UNSIGNED";
@@ -1107,7 +1109,7 @@ public final class Gbase8sAgent extends ConfiguredJdbcAgent {
private static Integer characterMaximumLength(int baseType, int length) {
return switch (baseType) {
- case 0, 13, 15, 16, 40 -> length;
+ case 0, 13, 15, 16, 40, 63, 64 -> length;
default -> null;
};
}
diff --git a/agents/drivers/gbase8s/src/test/java/com/dbx/agent/gbase8s/Gbase8sAgentTest.java b/agents/drivers/gbase8s/src/test/java/com/dbx/agent/gbase8s/Gbase8sAgentTest.java
index b35db7bfb3..16fe71dca2 100644
--- a/agents/drivers/gbase8s/src/test/java/com/dbx/agent/gbase8s/Gbase8sAgentTest.java
+++ b/agents/drivers/gbase8s/src/test/java/com/dbx/agent/gbase8s/Gbase8sAgentTest.java
@@ -2,6 +2,7 @@ package com.dbx.agent.gbase8s;
import com.dbx.agent.ConnectParams;
import com.dbx.agent.ColumnInfo;
+import com.dbx.agent.DdlBuilder;
import com.dbx.agent.IndexInfo;
import com.dbx.agent.MetadataListConstraints;
import com.dbx.agent.ObjectSource;
@@ -395,6 +396,42 @@ class Gbase8sAgentTest {
Assertions.assertTrue(sql.get(2).contains("LEFT JOIN syscolcomms"), sql.get(2));
}
+ @Test
+ void extendedCharacterColumnsPreserveTypeLengthAndNullabilityInDdl() {
+ Gbase8sAgent agent = new Gbase8sAgent();
+ TestSupport.setPrivateConnection(agent, preparedConnection(
+ new ArrayList<>(),
+ resultSet(new String[]{"part1"}, new Object[][]{}),
+ resultSet(new String[]{"colname", "column_default"}, new Object[][]{}),
+ resultSet(
+ new String[]{"colname", "coltype", "colno", "collength", "comments"},
+ new Object[][]{
+ {"channel_list", 63, 1, 1024, null},
+ {"name", 63 + 256, 2, 4096, null},
+ {"national_text", 64, 3, 64, null},
+ {"required_text", 64 + 256, 4, 128, null}
+ }
+ )
+ ));
+
+ List<ColumnInfo> columns = agent.getColumns("root", "activity");
+ Assertions.assertEquals(List.of("VARCHAR2", "VARCHAR2", "NVARCHAR2", "NVARCHAR2"),
+ columns.stream().map(ColumnInfo::getData_type).toList());
+ Assertions.assertEquals(List.of(1024, 4096, 64, 128),
+ columns.stream().map(ColumnInfo::getCharacter_maximum_length).toList());
+ Assertions.assertEquals(List.of(true, false, true, false),
+ columns.stream().map(ColumnInfo::getIs_nullable).toList());
+ String ddl = DdlBuilder.buildTableDdl("root", "activity", columns, List.of(), List.of());
+ Assertions.assertEquals("""
+ CREATE TABLE "root"."activity" (
+ "channel_list" VARCHAR2(1024),
+ "name" VARCHAR2(4096) NOT NULL,
+ "national_text" NVARCHAR2(64),
+ "required_text" NVARCHAR2(128) NOT NULL
+ );
+ """, ddl);
+ }
+
@Test
void getColumnsLoadsDefaultsFromDefaultExpressionCatalogInMysqlCompatMode() throws Exception {
List<String> sql = new ArrayList<>();
diff --git a/agents/drivers/gbase8s/src/test/java/com/dbx/agent/gbase8s/Gbase8sCharacterTypesLiveTest.java b/agents/drivers/gbase8s/src/test/java/com/dbx/agent/gbase8s/Gbase8sCharacterTypesLiveTest.java
new file mode 100644
index 0000000000..1b13cfdae9
--- /dev/null
+++ b/agents/drivers/gbase8s/src/test/java/com/dbx/agent/gbase8s/Gbase8sCharacterTypesLiveTest.java
@@ -0,0 +1,65 @@
+package com.dbx.agent.gbase8s;
+
+import com.dbx.agent.ColumnInfo;
+import com.dbx.agent.ConnectParams;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
+
+class Gbase8sCharacterTypesLiveTest {
+ @Test
+ @EnabledIfEnvironmentVariable(named = "DBX_TEST_GBASE8S_URL", matches = ".+")
+ void characterColumnDdlReplaysWithTheSameTypesLengthsAndNullability() throws Exception {
+ String source = "dbx_char_" + UUID.randomUUID().toString().replace("-", "");
+ String target = source + "_copy";
+ Gbase8sAgent agent = new Gbase8sAgent();
+ agent.connect(new ConnectParams(
+ "", 0, "", System.getenv("DBX_TEST_GBASE8S_USER"), System.getenv("DBX_TEST_GBASE8S_PASSWORD"),
+ "", System.getenv("DBX_TEST_GBASE8S_URL"), false
+ ));
+ List<String> createdTables = new ArrayList<>();
+ try (Statement statement = agent.getConnection().createStatement()) {
+ try {
+ statement.execute("CREATE TABLE " + source + " (payload VARCHAR2(1024), required VARCHAR2(4096) NOT NULL, "
+ + "national NVARCHAR2(64), required_national NVARCHAR2(128) NOT NULL)");
+ createdTables.add(source);
+ String ddl = agent.getTableDdl("", source);
+ Assertions.assertFalse(ddl.contains("UNKNOWN("), ddl);
+ Assertions.assertTrue(ddl.contains("VARCHAR2(1024)"), ddl);
+ Assertions.assertTrue(ddl.contains("NVARCHAR2(128) NOT NULL"), ddl);
+ statement.execute(ddl.replace(source, target));
+ createdTables.add(target);
+ statement.execute("INSERT INTO " + target + " VALUES ('channel', 'required-value', 'national-value', 'required-national')");
+ try (ResultSet rows = statement.executeQuery("SELECT payload, national FROM " + target)) {
+ Assertions.assertTrue(rows.next());
+ Assertions.assertEquals("channel", rows.getString(1));
+ Assertions.assertEquals("national-value", rows.getString(2));
+ Assertions.assertFalse(rows.next());
+ }
+ List<ColumnInfo> original = agent.getColumns("", source);
+ List<ColumnInfo> replayed = agent.getColumns("", target);
+ Assertions.assertEquals(List.of("VARCHAR2", "VARCHAR2", "NVARCHAR2", "NVARCHAR2"),
+ original.stream().map(ColumnInfo::getData_type).toList());
+ Assertions.assertEquals(List.of(1024, 4096, 64, 128),
+ original.stream().map(ColumnInfo::getCharacter_maximum_length).toList());
+ Assertions.assertEquals(original.stream().map(ColumnInfo::getData_type).toList(),
+ replayed.stream().map(ColumnInfo::getData_type).toList());
+ Assertions.assertEquals(original.stream().map(ColumnInfo::getCharacter_maximum_length).toList(),
+ replayed.stream().map(ColumnInfo::getCharacter_maximum_length).toList());
+ Assertions.assertEquals(List.of(true, false, true, false),
+ replayed.stream().map(ColumnInfo::getIs_nullable).toList());
+ } finally {
+ Collections.reverse(createdTables);
+ for (String name : createdTables) statement.execute("DROP TABLE " + name);
+ }
+ } finally {
+ agent.disconnect();
+ }
+ }
+}