From d7259955b3e29ba6dcece18201e58c18952e6ce1 Mon Sep 17 00:00:00 2001 From: Suomm <1474983351@qq.com> Date: Sat, 27 Jan 2024 20:01:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2=20R?= =?UTF-8?q?elation=20=E5=92=8C=20Join=20=E4=B8=A4=E7=A7=8D=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E4=B8=8D=E5=BA=94=E8=AF=A5=E6=98=AF=E4=BA=92=E6=96=A5?= =?UTF-8?q?=E7=9A=84=E5=85=B3=E7=B3=BB=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/table/TableInfoFactory.java | 57 ++++++++++++++----- 1 file changed, 42 insertions(+), 15 deletions(-) diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfoFactory.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfoFactory.java index 220f4b1b..5cf8d1d8 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfoFactory.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfoFactory.java @@ -15,7 +15,15 @@ */ package com.mybatisflex.core.table; -import com.mybatisflex.annotation.*; +import com.mybatisflex.annotation.Column; +import com.mybatisflex.annotation.ColumnAlias; +import com.mybatisflex.annotation.ColumnMask; +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.InsertListener; +import com.mybatisflex.annotation.NoneListener; +import com.mybatisflex.annotation.SetListener; +import com.mybatisflex.annotation.Table; +import com.mybatisflex.annotation.UpdateListener; import com.mybatisflex.core.BaseMapper; import com.mybatisflex.core.FlexGlobalConfig; import com.mybatisflex.core.exception.FlexExceptions; @@ -31,17 +39,46 @@ import org.apache.ibatis.io.ResolverUtil; import org.apache.ibatis.reflection.Reflector; import org.apache.ibatis.reflection.TypeParameterResolver; import org.apache.ibatis.session.Configuration; -import org.apache.ibatis.type.*; +import org.apache.ibatis.type.JdbcType; +import org.apache.ibatis.type.TypeException; +import org.apache.ibatis.type.TypeHandler; +import org.apache.ibatis.type.TypeHandlerRegistry; +import org.apache.ibatis.type.UnknownTypeHandler; import org.apache.ibatis.util.MapUtil; -import java.lang.reflect.*; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; import java.math.BigDecimal; import java.math.BigInteger; import java.sql.Time; import java.sql.Timestamp; -import java.time.*; +import java.time.Instant; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.Month; +import java.time.OffsetDateTime; +import java.time.OffsetTime; +import java.time.Year; +import java.time.YearMonth; +import java.time.ZonedDateTime; import java.time.chrono.JapaneseDate; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; @@ -266,16 +303,6 @@ public class TableInfoFactory { continue; } - //忽略 Relation 字段 - //fixed https://gitee.com/mybatis-flex/mybatis-flex/issues/I8SKOP - if (field.isAnnotationPresent(RelationOneToOne.class) - || field.isAnnotationPresent(RelationOneToMany.class) - || field.isAnnotationPresent(RelationManyToOne.class) - || field.isAnnotationPresent(RelationManyToMany.class)) - { - continue; - } - Column columnAnnotation = field.getAnnotation(Column.class); //满足以下 3 种情况，不支持该类型