From bcb1e8ce93cdab836f82924dd96a5ab1478658f8 Mon Sep 17 00:00:00 2001
From: fuziran <2939114013@qq.com>
Date: Thu, 19 Nov 2026 19:32:52 +0800
Subject: [PATCH 01/15] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84=20KingbaseES=20?=
=?UTF-8?q?=E4=B8=89=E7=A7=8D=E5=85=BC=E5=AE=B9=E6=A8=A1=E5=BC=8F=E5=92=8C?=
=?UTF-8?q?=E5=9B=9E=E5=BD=92=E8=A6=86=E7=9B=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
整理开发分支 3cc0a1c1 相对上游 main 的变更,保留模式识别、SQL 与 JDBC 适配及回归基线。
Refs #868, #855
---
pom.xml | 15 +
src/main/java/apijson/orm/AbstractParser.java | 7 +-
.../java/apijson/orm/AbstractSQLConfig.java | 912 ++-
.../java/apijson/orm/AbstractSQLExecutor.java | 750 ++-
.../apijson/orm/KingbaseHavingExpression.java | 123 +
.../apijson/orm/KingbaseModeResolver.java | 135 +
.../orm/KingbaseMySQLCapabilities.java | 94 +
.../apijson/orm/KingbaseMySQLExpressions.java | 115 +
.../apijson/orm/KingbaseMySQLFunctions.java | 26 +
.../apijson/orm/KingbaseMySQLJsonPath.java | 62 +
.../java/apijson/orm/KingbaseSQLDialect.java | 10 +-
.../java/apijson/orm/KingbaseTypeSupport.java | 116 +
src/main/java/apijson/orm/SQLConfig.java | 22 +-
.../java/apijson/orm/SQLServerDateFormat.java | 80 +
.../AbstractSQLConfigAggregatePagingTest.java | 8 +-
.../apijson/orm/JoinColumnOwnershipTest.java | 211 +
.../orm/KingbaseCompatibilityTest.java | 1062 +++-
.../apijson/orm/KingbaseLiveTypeProbe.java | 286 +
.../apijson/orm/KingbaseModeResolverTest.java | 532 ++
...KingbaseMySQLAdaptationRegressionTest.java | 153 +
.../KingbaseMySQLCapabilitiesLiveTest.java | 104 +
.../orm/KingbaseMySQLCapabilitiesTest.java | 170 +
.../orm/KingbaseMySQLReviewLiveTest.java | 349 ++
.../KingbaseMySQLReviewRegressionTest.java | 155 +
.../orm/KingbaseMySQLUpgradeLiveTest.java | 272 +
.../KingbaseMySQLUpgradeRegressionTest.java | 142 +
.../apijson/orm/KingbaseProcedureTest.java | 147 +
.../orm/KingbaseSemanticsLiveTest.java | 121 +
.../orm/KingbaseSemanticsRegressionTest.java | 220 +
.../apijson/orm/KingbaseTypeBoundaryTest.java | 192 +
.../apijson/orm/KingbaseTypeMappingTest.java | 502 ++
.../orm/NativeDatabaseBaselineTest.java | 429 ++
.../orm/NativeDatabaseIsolationTest.java | 123 +
.../apijson/orm/NativeJdbcContractTest.java | 282 +
.../orm/NativeRoutingRegressionTest.java | 181 +
.../orm/OraclePaginationRegressionTest.java | 130 +
.../apijson/orm/RequestStructureJsonTest.java | 175 +
.../orm/UpstreamFeatureRegressionTest.java | 51 +
src/test/resources/kingbase-v9r1c10-types.tsv | 84 +
.../resources/native-isolated-upstream.tsv | 5168 +++++++++++++++++
src/test/scripts/verify_native_isolation.py | 171 +
41 files changed, 13536 insertions(+), 351 deletions(-)
create mode 100644 src/main/java/apijson/orm/KingbaseHavingExpression.java
create mode 100644 src/main/java/apijson/orm/KingbaseModeResolver.java
create mode 100644 src/main/java/apijson/orm/KingbaseMySQLCapabilities.java
create mode 100644 src/main/java/apijson/orm/KingbaseMySQLExpressions.java
create mode 100644 src/main/java/apijson/orm/KingbaseMySQLFunctions.java
create mode 100644 src/main/java/apijson/orm/KingbaseMySQLJsonPath.java
create mode 100644 src/main/java/apijson/orm/KingbaseTypeSupport.java
create mode 100644 src/main/java/apijson/orm/SQLServerDateFormat.java
create mode 100644 src/test/java/apijson/orm/JoinColumnOwnershipTest.java
create mode 100644 src/test/java/apijson/orm/KingbaseLiveTypeProbe.java
create mode 100644 src/test/java/apijson/orm/KingbaseModeResolverTest.java
create mode 100644 src/test/java/apijson/orm/KingbaseMySQLAdaptationRegressionTest.java
create mode 100644 src/test/java/apijson/orm/KingbaseMySQLCapabilitiesLiveTest.java
create mode 100644 src/test/java/apijson/orm/KingbaseMySQLCapabilitiesTest.java
create mode 100644 src/test/java/apijson/orm/KingbaseMySQLReviewLiveTest.java
create mode 100644 src/test/java/apijson/orm/KingbaseMySQLReviewRegressionTest.java
create mode 100644 src/test/java/apijson/orm/KingbaseMySQLUpgradeLiveTest.java
create mode 100644 src/test/java/apijson/orm/KingbaseMySQLUpgradeRegressionTest.java
create mode 100644 src/test/java/apijson/orm/KingbaseProcedureTest.java
create mode 100644 src/test/java/apijson/orm/KingbaseSemanticsLiveTest.java
create mode 100644 src/test/java/apijson/orm/KingbaseSemanticsRegressionTest.java
create mode 100644 src/test/java/apijson/orm/KingbaseTypeBoundaryTest.java
create mode 100644 src/test/java/apijson/orm/KingbaseTypeMappingTest.java
create mode 100644 src/test/java/apijson/orm/NativeDatabaseBaselineTest.java
create mode 100644 src/test/java/apijson/orm/NativeDatabaseIsolationTest.java
create mode 100644 src/test/java/apijson/orm/NativeJdbcContractTest.java
create mode 100644 src/test/java/apijson/orm/NativeRoutingRegressionTest.java
create mode 100644 src/test/java/apijson/orm/OraclePaginationRegressionTest.java
create mode 100644 src/test/java/apijson/orm/RequestStructureJsonTest.java
create mode 100644 src/test/java/apijson/orm/UpstreamFeatureRegressionTest.java
create mode 100644 src/test/resources/kingbase-v9r1c10-types.tsv
create mode 100644 src/test/resources/native-isolated-upstream.tsv
create mode 100644 src/test/scripts/verify_native_isolation.py
diff --git a/pom.xml b/pom.xml
index 25aab26f..56105c51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,6 +29,21 @@
+
+
+
+ kingbase-driver-tests
+
+
+ cn.com.kingbase
+ kingbase8
+ 9.0.0
+ test
+
+
+
+
+
diff --git a/src/main/java/apijson/orm/AbstractParser.java b/src/main/java/apijson/orm/AbstractParser.java
index 159536fd..f485b187 100755
--- a/src/main/java/apijson/orm/AbstractParser.java
+++ b/src/main/java/apijson/orm/AbstractParser.java
@@ -1106,6 +1106,8 @@ public M getStructure(@NotNull String table, String method, String tag, int vers
config.setParser(this);
config.setPrepared(false);
config.setColumn(Arrays.asList("structure"));
+ // Only the three compatibility modes opt into TEXT/CLOB-backed rules.
+ if (config.isKingBaseCompatibilityMode()) config.setJson(Arrays.asList("structure"));
Map where = new HashMap();
where.put("method", method);
@@ -1126,7 +1128,10 @@ public M getStructure(@NotNull String table, String method, String tag, int vers
// AbstractVerifier.REQUEST_MAP.put(cacheKey, versionedMap);
}
- return JSON.get(result, "structure"); //解决返回值套了一层 "structure":{}
+ // Legacy KINGBASE and native databases keep the original cached-rule contract.
+ Object structure = result == null ? null : result.get("structure");
+ return structure instanceof String && createSQLConfig().isKingBaseCompatibilityMode()
+ ? JSON.parseObject(structure) : (M) structure;
}
diff --git a/src/main/java/apijson/orm/AbstractSQLConfig.java b/src/main/java/apijson/orm/AbstractSQLConfig.java
index 2c76d091..3139402f 100755
--- a/src/main/java/apijson/orm/AbstractSQLConfig.java
+++ b/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -11,6 +11,7 @@
import apijson.orm.exception.UnsupportedDataTypeException;
import apijson.orm.model.*;
+import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.Map.Entry;
import java.util.regex.Pattern;
@@ -76,6 +77,13 @@ public abstract class AbstractSQLConfig, L exte
// * 和 / 不能同时出现,防止 /* */ 段注释! # 和 -- 不能出现,防止行注释! ; 不能出现,防止隔断SQL语句!空格不能出现,防止 CRUD,DROP,SHOW TABLES等语句!
public static Pattern PATTERN_RANGE;
public static Pattern PATTERN_FUNCTION;
+ private static final Pattern MYSQL_INTERVAL_LITERAL_PATTERN = Pattern.compile(
+ "(?i)^INTERVAL\\s+([+-]?\\d+|'[+-]?\\d+'|\\?)\\s+"
+ + "(MICROSECOND|SECOND|MINUTE|HOUR|DAY|WEEK|MONTH|QUARTER|YEAR)$"
+ );
+ private static final Pattern MYSQL_TIME_FRACTION_PATTERN = Pattern.compile("\\.([0-9]+)$");
+ private static final int KINGBASE_MYSQL_IDENTIFIER_BYTES = 63;
+ private static final String KINGBASE_MYSQL_PROJECTION_PREFIX = "$apijson$";
/**
* 表 SCHEMA 映射
@@ -157,9 +165,7 @@ public abstract class AbstractSQLConfig, L exte
DATABASE_LIST.add(DATABASE_COCKROACHDB);
DATABASE_LIST.add(DATABASE_DAMENG);
DATABASE_LIST.add(DATABASE_KINGBASE);
- DATABASE_LIST.add(DATABASE_KINGBASE_MYSQL);
- DATABASE_LIST.add(DATABASE_KINGBASE_ORACLE);
- DATABASE_LIST.add(DATABASE_KINGBASE_SQLSERVER);
+ DATABASE_LIST.add(DATABASE_KINGBASE_AUTO);
DATABASE_LIST.add(DATABASE_ELASTICSEARCH);
DATABASE_LIST.add(DATABASE_MANTICORE);
DATABASE_LIST.add(DATABASE_CLICKHOUSE);
@@ -889,6 +895,22 @@ public static boolean allowPartialUpdateFailed(String table) {
@NotNull
@Override
public String getIdKey() {
+ return isKingBaseCompatibilityMode() ? getMetadataIdKey(getTable()) : KEY_ID;
+ }
+
+ protected static String getMetadataIdKey(String table) {
+ if (Table.TAG.equals(table)) {
+ return "table_name";
+ }
+ if (Column.TAG.equals(table)) {
+ return "ordinal_position";
+ }
+ if (PgClass.TAG.equals(table)) {
+ return "oid";
+ }
+ if (PgAttribute.TAG.equals(table)) {
+ return "attnum";
+ }
return KEY_ID;
}
@NotNull
@@ -933,6 +955,11 @@ public String getUserIdKey() {
private List json; //需要转为 JSON 的字段,','分隔
private Subquery from; //子查询临时表
private List column; //表内字段名(或函数名,仅查询操作可用)的字符串数组,','分隔
+ private Map columnAliasExpressionMap;
+ private Map kingbaseMySQLProjectionLabels;
+ private Set kingbaseMySQLLocalDateTimeAliases;
+ private Set kingbaseMySQLSumAliases;
+ private Map kingbaseMySQLHavingOrderAliases;
private List> values; //对应表内字段的值的字符串数组,','分隔
private List nulls;
private Map cast;
@@ -1091,13 +1118,58 @@ public AbstractSQLConfig setDatabase(String database) {
this.database = database;
return this;
}
+ /** Validate a resolved backend/default database against the public configuration allowlist. */
+ public static void validateConfiguredDatabase(String database) {
+ if (!DATABASE_LIST.contains(database)) {
+ throw new IllegalArgumentException("Unsupported database configuration: " + database
+ + "; allowed values: " + DATABASE_LIST);
+ }
+ }
/**
- * @return db == null ? DEFAULT_DATABASE : db
+ * @return the SQL dialect, detecting KINGBASE_AUTO on first use and checking
+ * the optional backend expectation on every resolution
*/
@NotNull
public String gainSQLDatabase() {
- String db = getDatabase();
- return db == null ? DEFAULT_DATABASE : db; // "" 表示已设置,不需要用全局默认的 StringUtil.isEmpty(db, false)) {
+ return resolveSQLDatabase(getDatabase());
+ }
+
+ /** Resolve a configured route, including routes supplied by framework configuration stores. */
+ protected String resolveSQLDatabase(String db) {
+ db = db == null ? DEFAULT_DATABASE : db;
+ if (DATABASE_KINGBASE_AUTO.equals(db)
+ || (KingbaseSQLDialect.from(db).isKingbase() && !DATABASE_KINGBASE.equals(db))) {
+ validateConfiguredDatabase(db);
+ }
+ if (!KingbaseModeResolver.requiresDetection(db)) {
+ return db;
+ }
+ String actual = KINGBASE_MODE_RESOLVER.resolve(this);
+ // Backend expectations are checked for every caller, including cache hits.
+ return KingbaseModeResolver.requireExpectedMode(actual, gainKingbaseExpectedDatabase());
+ }
+
+ /** Shared successful detections; clear after replacing a data source's target. */
+ public static final KingbaseModeResolver KINGBASE_MODE_RESOLVER = new KingbaseModeResolver();
+
+ /** Optional backend-only assertion. Null accepts any supported detected mode.
+ * Override using deployment configuration, never request-controlled values. */
+ protected String gainKingbaseExpectedDatabase() {
+ return null;
+ }
+
+ /**
+ * Borrow a dedicated detection connection. It is closed (returned to its pool)
+ * by the resolver. Override for application-managed DataSources. This method
+ * and the cache key must not depend on an already resolved SQL dialect.
+ */
+ protected java.sql.Connection openKingbaseModeConnection() throws java.sql.SQLException {
+ return java.sql.DriverManager.getConnection(gainDBUri(), gainDBAccount(), gainDBPassword());
+ }
+
+ /** Override when routing uses additional application context. Never include passwords. */
+ protected Object gainKingbaseModeCacheKey() {
+ return Arrays.asList(getClass(), gainDBUri(), gainDBAccount(), getDatasource(), getNamespace(), getCatalog());
}
@Override
@@ -1190,7 +1262,7 @@ public boolean isKingBase() {
return isKingBase(gainSQLDatabase());
}
public static boolean isKingBase(String db) {
- return KingbaseSQLDialect.from(db).isKingbase();
+ return DATABASE_KINGBASE.equals(db);
}
@Override
@@ -1440,7 +1512,7 @@ public String getQuote() { // MongoDB 同时支持 `tbl` 反引号 和 "col"
return "";
}
KingbaseSQLDialect kingbaseDialect = KingbaseSQLDialect.from(gainSQLDatabase());
- if (kingbaseDialect.isKingbase()) {
+ if (kingbaseDialect.isKingbase() && kingbaseDialect != KingbaseSQLDialect.LEGACY) {
return kingbaseDialect.getIdentifierQuote();
}
return isMySQL() || isMariaDB() || isTiDB() || isClickHouse() || isTDengine() || isMilvus() || isDoris() || isStarRocks() ? "`" : "\"";
@@ -1554,6 +1626,21 @@ public String gainSQLTable() {
// return DATABASE_POSTGRESQL.equals(getDatabase()) ? t.toLowerCase() : t;
String ot = getTable();
String nt = TABLE_KEY_MAP.get(ot);
+ if ((isKingBaseSQLServer() || isKingBaseOracle())
+ && (StringUtil.isEmpty(nt) || Objects.equals(ot, nt))) {
+ if (Table.class.getSimpleName().equals(ot)) {
+ nt = Table.TABLE_NAME;
+ }
+ else if (Column.class.getSimpleName().equals(ot)) {
+ nt = Column.TABLE_NAME;
+ }
+ else if (PgClass.class.getSimpleName().equals(ot)) {
+ nt = PgClass.TABLE_NAME;
+ }
+ else if (PgAttribute.class.getSimpleName().equals(ot)) {
+ nt = PgAttribute.TABLE_NAME;
+ }
+ }
return StringUtil.isEmpty(nt) ? ot : nt;
}
@@ -1660,9 +1747,11 @@ public String gainGroupString(boolean hasPrefix) {
group = StringUtil.trim(group);
+ String kingbaseMainGroup = gainKingbaseMySQLMainGroupForJoin(joinGroup);
String[] keys = StringUtil.split(group);
if (keys == null || keys.length <= 0) {
- return StringUtil.isEmpty(joinGroup, true) ? "" : (hasPrefix ? " GROUP BY " : "") + joinGroup;
+ String groups = StringUtil.concat(kingbaseMainGroup, joinGroup, ", ", true);
+ return StringUtil.isEmpty(groups, true) ? "" : (hasPrefix ? " GROUP BY " : "") + groups;
}
for (int i = 0; i < keys.length; i++) {
@@ -1676,7 +1765,43 @@ public String gainGroupString(boolean hasPrefix) {
keys[i] = gainKey(keys[i]);
}
- return (hasPrefix ? " GROUP BY " : "") + StringUtil.concat(StringUtil.get(keys), joinGroup, ", ");
+ String groups = StringUtil.concat(StringUtil.get(keys), kingbaseMainGroup, ", ", true);
+ groups = StringUtil.concat(groups, joinGroup, ", ", true);
+ return (hasPrefix ? " GROUP BY " : "") + groups;
+ }
+
+ /**
+ * MySQL can infer that a selected main-table JOIN key is functionally
+ * dependent on the grouped vice-table key. Kingbase MySQL mode follows the
+ * stricter PostgreSQL grouping rule and requires that selected key to appear
+ * explicitly in GROUP BY. Supplement explicit main-table scalar projections
+ * only when grouping comes from a SQL JOIN; native databases and
+ * ordinary non-JOIN grouping remain unchanged.
+ */
+ protected String gainKingbaseMySQLMainGroupForJoin(String joinGroup) {
+ if (isKingBaseMySQL() == false || StringUtil.isNotEmpty(group, true)
+ || StringUtil.isEmpty(joinGroup, true) || column == null || column.isEmpty()) {
+ return "";
+ }
+
+ String selectedGroup = "";
+ int projection = 1;
+ for (String item : column) {
+ String key = StringUtil.trim(item);
+ int alias = KingbaseMySQLExpressions.aliasIndex(key);
+ if (alias >= 0) key = key.substring(0, alias);
+ if (key.matches("[A-Za-z_][A-Za-z0-9_]*")) {
+ selectedGroup = StringUtil.concat(selectedGroup, gainKey(key), ", ", true);
+ } else if (key.contains("(") && !KingbaseMySQLExpressions.hasAggregateOrWindow(key, SQL_AGGREGATE_FUNCTION_MAP.keySet())
+ && !KingbaseMySQLExpressions.hasVolatileFunction(key)) {
+ // A repeated bound expression has different parameter identities ($1/$2)
+ // and is not an equal GROUP BY expression. Reference its validated SELECT
+ // position instead, without duplicating arguments or evaluating it again.
+ selectedGroup = StringUtil.concat(selectedGroup, String.valueOf(projection), ", ", true);
+ }
+ projection += KingbaseMySQLExpressions.projectionSize(item);
+ }
+ return selectedGroup;
}
@Override
@@ -1771,6 +1896,10 @@ protected String gainHavingItem(String quote, String table, String alias
throw new UnsupportedOperationException("@having:value 的 value 中字符串 " + expression + " 不合法!"
+ "不允许传超过 100 个字符的函数或表达式!请用 @raw 简化传参!");
}
+ if (isKingBaseMySQL() && columnAliasExpressionMap != null && !columnAliasExpressionMap.isEmpty()) {
+ String comparison = KingbaseHavingExpression.parse(expression, columnAliasExpressionMap.keySet(), quote);
+ if (comparison != null) return comparison;
+ }
int start = expression.indexOf("(");
if (start < 0) {
@@ -1805,7 +1934,289 @@ else if (SQL_FUNCTION_MAP.containsKey(method) == false) {
}
}
- return method + parseSQLExpression(KEY_HAVING, expression.substring(start), containRaw, false, null);
+ // MATCH(...) AGAINST(...) is a two-part full-text expression. Passing only
+ // the substring beginning with '(' drops the MATCH function name, which
+ // prevents database-specific full-text conversion from recognizing it.
+ if ((isKingBaseCompatibilityMode() && expression.indexOf(")AGAINST(") > start)
+ || ("length".equalsIgnoreCase(method) && isKingBaseMySQL())) {
+ return parseSQLExpression(KEY_HAVING, expression, containRaw, false, null);
+ }
+ return gainSQLFunction(method) + parseSQLExpression(KEY_HAVING, expression.substring(start), containRaw, false, null);
+ }
+
+ /**
+ * Converts a request-level SQL function name to the function exposed by the
+ * selected database dialect. JSON_LENGTH deliberately retains its full MySQL
+ * contract (objects, scalars and optional paths), supplied by mysql_json on
+ * Kingbase. JSON_ARRAY_LENGTH is not an equivalent replacement.
+ */
+ protected String gainSQLFunction(String function) {
+ return function;
+ }
+
+ /**
+ * Builds a function expression after its arguments have passed the normal
+ * APIJSON validation and quoting pipeline. With mysql_interval_style=off,
+ * Kingbase needs a quoted interval. Keep DATE_ADD/DATE_SUB themselves: their
+ * DATE, DATETIME and text return rules differ from date +/- interval.
+ */
+ protected String gainSQLFunctionExpression(String function, String[] args,
+ boolean distinct, String suffix) {
+ if (isKingBaseMySQL() && ("round".equalsIgnoreCase(function) || "sec_to_time".equalsIgnoreCase(function)) && !distinct
+ && function.equalsIgnoreCase(gainSQLFunction(function))
+ && args != null && args.length == 1 && "?".equals(args[0])
+ && !getPreparedValueList().isEmpty()) {
+ Object value = getPreparedValueList().get(getPreparedValueList().size() - 1);
+ // Supply the numeric context required by these bound-string overloads.
+ // Keep columns, raw literals, invalid text and two-argument ROUND intact.
+ if (value instanceof String && value.toString().matches("[+-]?(?:[0-9]+(?:\\.[0-9]*)?|\\.[0-9]+)(?:[eE][+-]?[0-9]+)?")
+ && Double.isFinite(Double.parseDouble(value.toString()))) {
+ args = new String[]{"round".equalsIgnoreCase(function) ? "CAST(? AS DOUBLE)" : "CAST(? AS pg_catalog.numeric)"};
+ }
+ }
+ if (isKingBaseMySQL() && args != null && isPrepared()
+ && function.equalsIgnoreCase(gainSQLFunction(function))
+ && Arrays.asList("concat_ws", "field", "find_in_set", "timestamp", "json_object", "json_set")
+ .contains(function.toLowerCase(Locale.ROOT))) {
+ // Polymorphic functions need TEXT, not the driver's untyped setObject
+ // or VARCHAR binding (FIELD/JSON_SET behave differently for VARCHAR).
+ args = args.clone();
+ List