feat(dameng): preserve character length units
This commit is contained in:
1 parent
8020fe5886
commit
32b4acee3a
13 files changed
+382
-24
No files matched your search
@@ -666,6 +666,7 @@ public final class DamengAgent extends BaseDatabaseAgent {
|
||||
c.DATA_SCALE,
|
||||
c.DATA_LENGTH,
|
||||
c.CHAR_LENGTH,
|
||||
c.CHAR_USED,
|
||||
cc.COMMENTS
|
||||
FROM ALL_TAB_COLUMNS c
|
||||
LEFT JOIN ALL_COL_COMMENTS cc
|
||||
@@ -688,7 +689,8 @@ public final class DamengAgent extends BaseDatabaseAgent {
|
||||
Integer numScale = intObject(rs, "DATA_SCALE");
|
||||
Integer dataLen = intObject(rs, "DATA_LENGTH");
|
||||
Integer charLen = intObject(rs, "CHAR_LENGTH");
|
||||
String dataType = formatDataType(baseType, numPrec, numScale, dataLen, charLen);
|
||||
String charUsed = rs.getString("CHAR_USED");
|
||||
String dataType = formatDataType(baseType, numPrec, numScale, dataLen, charLen, charUsed);
|
||||
|
||||
result.add(new ColumnInfo(
|
||||
name,
|
||||
@@ -965,9 +967,20 @@ public final class DamengAgent extends BaseDatabaseAgent {
|
||||
return "jdbc:dm://" + params.getHost() + ":" + params.getPort() + suffix;
|
||||
}
|
||||
|
||||
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
|
||||
) {
|
||||
return switch (base.toUpperCase(Locale.ROOT)) {
|
||||
case "VARCHAR2", "NVARCHAR2", "VARCHAR", "CHAR", "NCHAR" -> {
|
||||
case "VARCHAR2", "VARCHAR", "CHAR" -> {
|
||||
Integer length = characterLength(dataLen, charLen, charUsed);
|
||||
yield length != null ? base + "(" + length + characterLengthUnit(charUsed) + ")" : base;
|
||||
}
|
||||
case "NVARCHAR2", "NCHAR" -> {
|
||||
Integer length = charLen != null ? charLen : dataLen;
|
||||
yield length != null ? base + "(" + length + ")" : base;
|
||||
}
|
||||
@@ -982,6 +995,25 @@ public final class DamengAgent extends BaseDatabaseAgent {
|
||||
};
|
||||
}
|
||||
|
||||
private static Integer characterLength(Integer dataLen, Integer charLen, String charUsed) {
|
||||
String normalized = charUsed == null ? "" : charUsed.trim().toUpperCase(Locale.ROOT);
|
||||
if ("B".equals(normalized) || "BYTE".equals(normalized)) {
|
||||
return dataLen != null ? dataLen : charLen;
|
||||
}
|
||||
return charLen != null ? charLen : dataLen;
|
||||
}
|
||||
|
||||
private static String characterLengthUnit(String charUsed) {
|
||||
if (charUsed == null) {
|
||||
return "";
|
||||
}
|
||||
return switch (charUsed.trim().toUpperCase(Locale.ROOT)) {
|
||||
case "B", "BYTE" -> " BYTE";
|
||||
case "C", "CHAR" -> " CHAR";
|
||||
default -> "";
|
||||
};
|
||||
}
|
||||
|
||||
private static Integer intObject(ResultSet rs, String column) throws Exception {
|
||||
Object value = rs.getObject(column);
|
||||
return value == null ? null : ((Number) value).intValue();
|
||||
|
||||
+73
-10
@@ -34,6 +34,7 @@ class DamengAgentMetadataTest {
|
||||
.findFirst()
|
||||
.orElseThrow();
|
||||
Assertions.assertTrue(columnsSql.contains("LEFT JOIN ALL_COL_COMMENTS"), columnsSql);
|
||||
Assertions.assertTrue(columnsSql.contains("c.CHAR_USED"), columnsSql);
|
||||
Assertions.assertTrue(columnsSql.startsWith("SELECT /*+ PARALLEL(1) */"), columnsSql);
|
||||
}
|
||||
|
||||
@@ -206,6 +207,30 @@ class DamengAgentMetadataTest {
|
||||
Assertions.assertEquals("identity", columns.get(0).getExtra());
|
||||
}
|
||||
|
||||
@Test
|
||||
void preservesCharacterLengthUnitsFromMetadata() {
|
||||
DamengAgent agent = new DamengAgent();
|
||||
TestSupport.setPrivateConnection(agent, metadataConnectionForColumns(List.of(
|
||||
Arrays.asList("BYTE_VALUE", "VARCHAR2", "Y", null, null, 256, 64, "B", "byte length"),
|
||||
Arrays.asList("CHAR_VALUE", "VARCHAR", "Y", null, null, 256, 64, "C", "character length"),
|
||||
Arrays.asList("FIXED_VALUE", "CHAR", "Y", null, null, 40, 10, "C", "fixed length"),
|
||||
Arrays.asList("DEFAULT_VALUE", "VARCHAR2", "Y", null, null, 80, 20, null, "default length"),
|
||||
Arrays.asList("WORD_VALUE", "VARCHAR2", "Y", null, null, 128, 32, "BYTE", "word byte length"),
|
||||
Arrays.asList("NATIONAL_VALUE", "NVARCHAR2", "Y", null, null, 80, 20, "C", "national length"),
|
||||
Arrays.asList("NATIONAL_FIXED", "NCHAR", "Y", null, null, 40, 10, "B", "national fixed length")
|
||||
)));
|
||||
|
||||
List<ColumnInfo> columns = agent.getColumns("APP", "USERS");
|
||||
|
||||
Assertions.assertEquals("VARCHAR2(256 BYTE)", columns.get(0).getData_type());
|
||||
Assertions.assertEquals("VARCHAR(64 CHAR)", columns.get(1).getData_type());
|
||||
Assertions.assertEquals("CHAR(10 CHAR)", columns.get(2).getData_type());
|
||||
Assertions.assertEquals("VARCHAR2(20)", columns.get(3).getData_type());
|
||||
Assertions.assertEquals("VARCHAR2(128 BYTE)", columns.get(4).getData_type());
|
||||
Assertions.assertEquals("NVARCHAR2(20)", columns.get(5).getData_type());
|
||||
Assertions.assertEquals("NCHAR(10)", columns.get(6).getData_type());
|
||||
}
|
||||
|
||||
@Test
|
||||
void appendsTableAndColumnCommentsToTableDdl() {
|
||||
DamengAgent agent = new DamengAgent();
|
||||
@@ -367,6 +392,38 @@ class DamengAgentMetadataTest {
|
||||
List<List<Object>> independentIndexes,
|
||||
List<String> sqls,
|
||||
String dbmsMetadataDdl
|
||||
) {
|
||||
return metadataConnection(
|
||||
allColumnComment,
|
||||
fallbackColumnComment,
|
||||
includeMaterializedView,
|
||||
independentIndexes,
|
||||
sqls,
|
||||
dbmsMetadataDdl,
|
||||
defaultColumnMetadataRows(allColumnComment)
|
||||
);
|
||||
}
|
||||
|
||||
private static Connection metadataConnectionForColumns(List<List<Object>> columnRows) {
|
||||
return metadataConnection(
|
||||
"id comment",
|
||||
null,
|
||||
false,
|
||||
List.of(),
|
||||
null,
|
||||
"CREATE TABLE \"APP\".\"USERS\" (\n \"ID\" NUMBER\n);",
|
||||
columnRows
|
||||
);
|
||||
}
|
||||
|
||||
private static Connection metadataConnection(
|
||||
String allColumnComment,
|
||||
String fallbackColumnComment,
|
||||
boolean includeMaterializedView,
|
||||
List<List<Object>> independentIndexes,
|
||||
List<String> sqls,
|
||||
String dbmsMetadataDdl,
|
||||
List<List<Object>> columnRows
|
||||
) {
|
||||
boolean[] dbmsMetadataResultOpen = {false};
|
||||
return proxy(Connection.class, (method, args) -> {
|
||||
@@ -440,16 +497,7 @@ class DamengAgentMetadataTest {
|
||||
return metadataStatement(List.of());
|
||||
}
|
||||
if (sql.contains("ALL_TAB_COLUMNS")) {
|
||||
return metadataStatement(List.of(Arrays.asList(
|
||||
"ID",
|
||||
"NUMBER",
|
||||
"N",
|
||||
Integer.valueOf(10),
|
||||
Integer.valueOf(0),
|
||||
Integer.valueOf(22),
|
||||
Integer.valueOf(10),
|
||||
allColumnComment
|
||||
)));
|
||||
return metadataStatement(columnRows);
|
||||
}
|
||||
}
|
||||
if ("close".equals(name)) {
|
||||
@@ -462,6 +510,20 @@ class DamengAgentMetadataTest {
|
||||
});
|
||||
}
|
||||
|
||||
private static List<List<Object>> defaultColumnMetadataRows(String allColumnComment) {
|
||||
return List.of(Arrays.asList(
|
||||
"ID",
|
||||
"NUMBER",
|
||||
"N",
|
||||
Integer.valueOf(10),
|
||||
Integer.valueOf(0),
|
||||
Integer.valueOf(22),
|
||||
Integer.valueOf(10),
|
||||
null,
|
||||
allColumnComment
|
||||
));
|
||||
}
|
||||
|
||||
private static List<Object> indexRow(String name, String columns, String uniqueness, String indexType) {
|
||||
return List.of(name, columns, uniqueness, indexType);
|
||||
}
|
||||
@@ -570,6 +632,7 @@ class DamengAgentMetadataTest {
|
||||
case "DATA_TYPE" -> string(rows, index[0], 1);
|
||||
case "NULLABLE" -> string(rows, index[0], 2);
|
||||
case "DATA_DEFAULT" -> null;
|
||||
case "CHAR_USED" -> string(rows, index[0], 7);
|
||||
case "COMMENTS", "COMMENT$" -> string(rows, index[0], rows.get(index[0]).size() - 1);
|
||||
case "COLNAME" -> string(rows, index[0], 0);
|
||||
default -> null;
|
||||
|
||||
Reference in new issue
Block a user