fix(goldendb): return column charset metadata for table structure edits

This commit is contained in:
zipg authored and GitHub committed 2026-09-17 11:27:39 +08:00
1 parent 3a47487cf9
commit c675c81131
5 files changed
+210 -4

No files matched your search

@@ -248,7 +248,8 @@ public final class GoldendbAgent extends AbstractJdbcAgent {
try (java.sql.PreparedStatement stmt = requireConnected().prepareStatement(
"""
SELECT COLUMN_NAME, COLUMN_TYPE, IS_NULLABLE, COLUMN_DEFAULT, EXTRA, COLUMN_COMMENT,
NUMERIC_PRECISION, NUMERIC_SCALE, CHARACTER_MAXIMUM_LENGTH
NUMERIC_PRECISION, NUMERIC_SCALE, CHARACTER_MAXIMUM_LENGTH,
CHARACTER_SET_NAME, COLLATION_NAME
FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ?
ORDER BY ORDINAL_POSITION
@@ -269,7 +270,9 @@ public final class GoldendbAgent extends AbstractJdbcAgent {
emptyToNull(rs.getString("COLUMN_COMMENT")),
integerOrNull(rs, "NUMERIC_PRECISION"),
integerOrNull(rs, "NUMERIC_SCALE"),
numberToIntOrNull(rs, "CHARACTER_MAXIMUM_LENGTH")
numberToIntOrNull(rs, "CHARACTER_MAXIMUM_LENGTH"),
emptyToNull(rs.getString("CHARACTER_SET_NAME")),
emptyToNull(rs.getString("COLLATION_NAME"))
));
}
}
@@ -4,12 +4,31 @@ import com.dbx.agent.MetadataListConstraints;
import com.dbx.agent.test.TestSupport;
import com.dbx.agent.test.JdbcAgentFake;
import com.dbx.agent.test.JdbcMetadataSqlFake;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
class GoldendbAgentMetadataTest {
@Test
void returnsCharacterSetAndCollationForEditableColumns() {
GoldendbAgent agent = new GoldendbAgent();
TestSupport.setPrivateConnection(agent, columnsConnection());
var columns = agent.getColumns("app", "orders");
Assertions.assertEquals(1, columns.size());
Assertions.assertEquals("utf8mb4", columns.get(0).getCharacter_set());
Assertions.assertEquals("utf8mb4_bin", columns.get(0).getCollation());
}
@Test
void quotesSchemaAndTableIdentifiersInIndexMetadataSql() {
GoldendbAgent agent = new GoldendbAgent();
@@ -51,4 +70,71 @@ class GoldendbAgentMetadataTest {
Assertions.assertTrue(sql.contains("ORDER BY CASE OBJECT_TYPE"), sql);
Assertions.assertTrue(sql.endsWith("LIMIT 10"), sql);
}
private static Connection columnsConnection() {
InvocationHandler connectionHandler = (proxy, method, args) -> {
if ("prepareStatement".equals(method.getName())) {
String sql = (String) args[0];
boolean columnsQuery = sql.contains("CHARACTER_SET_NAME");
return preparedStatement(columnsQuery ? columnResultSet() : emptyResultSet());
}
if ("getAutoCommit".equals(method.getName())) return true;
if ("close".equals(method.getName())) return null;
return defaultValue(method.getReturnType());
};
return proxy(Connection.class, connectionHandler);
}
private static PreparedStatement preparedStatement(ResultSet resultSet) {
InvocationHandler handler = (proxy, method, args) -> {
if ("executeQuery".equals(method.getName())) return resultSet;
if ("setString".equals(method.getName()) || "close".equals(method.getName())) return null;
return defaultValue(method.getReturnType());
};
return proxy(PreparedStatement.class, handler);
}
private static ResultSet emptyResultSet() {
return resultSet(List.of());
}
private static ResultSet columnResultSet() {
Map<String, Object> row = new HashMap<>();
row.put("COLUMN_NAME", "name");
row.put("COLUMN_TYPE", "varchar(64)");
row.put("IS_NULLABLE", "YES");
row.put("COLUMN_DEFAULT", "'guest'");
row.put("EXTRA", "");
row.put("COLUMN_COMMENT", "");
row.put("NUMERIC_PRECISION", null);
row.put("NUMERIC_SCALE", null);
row.put("CHARACTER_MAXIMUM_LENGTH", 64);
row.put("CHARACTER_SET_NAME", "utf8mb4");
row.put("COLLATION_NAME", "utf8mb4_bin");
return resultSet(List.of(row));
}
private static ResultSet resultSet(List<Map<String, Object>> rows) {
int[] index = {-1};
InvocationHandler handler = (proxy, method, args) -> {
if ("next".equals(method.getName())) return ++index[0] < rows.size();
if (("getString".equals(method.getName()) || "getObject".equals(method.getName())) && args != null && args.length == 1) {
return rows.get(index[0]).get(args[0]);
}
if ("close".equals(method.getName())) return null;
return defaultValue(method.getReturnType());
};
return proxy(ResultSet.class, handler);
}
private static <T> T proxy(Class<T> type, InvocationHandler handler) {
return type.cast(Proxy.newProxyInstance(type.getClassLoader(), new Class<?>[]{type}, handler));
}
private static Object defaultValue(Class<?> type) {
if (Boolean.TYPE.equals(type)) return false;
if (Integer.TYPE.equals(type)) return 0;
if (Long.TYPE.equals(type)) return 0L;
return null;
}
}