Skip to content

Commit b05016f

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 3c21439 + 957ba3d commit b05016f

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6350,12 +6350,9 @@ LEFT JOIN ( SELECT count(*) AS count FROM sys.Comment ) AS Comment ON Comment.m
63506350
//解决 pg 如果只查询关联键,会报找不到column的错误
63516351
///* SELECT count(*) AS count FROM sys.Moment AS Moment
63526352
// LEFT JOIN ( SELECT * FROM sys.Comment ) AS Comment ON Comment.momentId = Moment.id LIMIT 1 OFFSET 0 */
6353-
if (joinConfig.isMySQL()) {
6354-
if (column != null) {
6355-
for (On on : onList) {
6356-
column.add(on.getKey());
6357-
}
6358-
6353+
if (column != null && joinConfig.isMSQL()) { // 暂时这样兼容 PostgreSQL 等不支持 SELECT 中不包含对应 key 的隐式 ON 关联字段的数据库
6354+
for (On on : onList) {
6355+
column.add(on.getKey()); // TODO PostgreSQL 等需要找到具体的 targetTable 对应 targetKey 来加到 SELECT,比直接 SELECT * 性能更好
63596356
}
63606357
}
63616358

0 commit comments

Comments
 (0)