fix: 2.0.6

dromara · May 11, 2024 · 87d554a · 87d554a
1 parent 5cb899c
commit 87d554a
Show file tree

Hide file tree

Showing 34 changed files with 44 additions and 57 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.easy-query</groupId>
     <artifactId>easy-query-all</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.5</version>
+    <version>2.0.6</version>
     <name>easy-query</name>
     <description>java object query distributed connector</description>
     <url>https://github.com/xuejmnet/easy-query</url>

diff --git a/samples/console-demo/pom.xml b/samples/console-demo/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>samples</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
     </parent>
 
     <artifactId>console-demo</artifactId>
@@ -22,21 +22,21 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-mysql</artifactId>
-            <version>2.0.5</version>
+            <version>2.0.6</version>
             <scope>compile</scope>
         </dependency>
         <!-- apt生成代理类 -->
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-processor</artifactId>
-            <version>2.0.5</version>
+            <version>2.0.6</version>
             <scope>compile</scope>
         </dependency>
         <!-- 代理api -->
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-api-proxy</artifactId>
-            <version>2.0.5</version>
+            <version>2.0.6</version>
             <scope>compile</scope>
         </dependency>
         <!-- mysql驱动 -->

diff --git a/samples/easy-query-solon-web/pom.xml b/samples/easy-query-solon-web/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>samples</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
     </parent>
 
     <groupId>com.easy.query.solon</groupId>
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-solon-plugin</artifactId>
-            <version>2.0.5</version>
+            <version>2.0.6</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-processor</artifactId>
-            <version>2.0.5</version>
+            <version>2.0.6</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/samples/multi-datasource-demo/pom.xml b/samples/multi-datasource-demo/pom.xml
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-springboot-starter</artifactId>
-            <version>2.0.5</version>
+            <version>2.0.6</version>
             <scope>compile</scope>
         </dependency>
 

diff --git a/samples/pom.xml b/samples/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easy-query-all</artifactId>
         <groupId>com.easy-query</groupId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-springboot-starter</artifactId>
-            <version>2.0.5</version>
+            <version>2.0.6</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/samples/solon-sharding-demo/pom.xml b/samples/solon-sharding-demo/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>samples</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
     </parent>
 
     <groupId>com.easy.query</groupId>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-solon-plugin</artifactId>
-            <version>2.0.5</version>
+            <version>2.0.6</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/samples/spring-sharding-demo/pom.xml b/samples/spring-sharding-demo/pom.xml
@@ -55,13 +55,13 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-processor</artifactId>
-            <version>2.0.5</version>
+            <version>2.0.6</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-springboot-starter</artifactId>
-            <version>2.0.5</version>
+            <version>2.0.6</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/samples/springbootdemo/pom.xml b/samples/springbootdemo/pom.xml
@@ -62,13 +62,13 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-processor</artifactId>
-            <version>2.0.5</version>
+            <version>2.0.6</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-springboot-starter</artifactId>
-            <version>2.0.5</version>
+            <version>2.0.6</version>
             <scope>compile</scope>
         </dependency>
         <!--        &lt;!&ndash; https://mvnrepository.com/artifact/com.alibaba/druid &ndash;&gt;-->
@@ -108,7 +108,7 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-cache</artifactId>
-            <version>2.0.5</version>
+            <version>2.0.6</version>
             <scope>compile</scope>
         </dependency>
 

diff --git a/sql-core/pom.xml b/sql-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easy-query-all</artifactId>
         <groupId>com.easy-query</groupId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sql-core/src/main/java/com/easy/query/core/metadata/EntityMetadata.java b/sql-core/src/main/java/com/easy/query/core/metadata/EntityMetadata.java
@@ -255,7 +255,6 @@ private void createNavigateMetadata(boolean tableEntity, Navigate navigate, Fiel
 
         String selfProperty = tableEntity ? navigate.selfProperty() : null;
         String targetProperty = tableEntity ? navigate.targetProperty() : null;
-        String mappingProp = tableEntity ? null : navigate.mappingProp();
         RelationTypeEnum relationType = navigate.value();
         Class<?> navigateType = getNavigateType(relationType, field, fastBeanProperty);
         if (navigateType == null) {
@@ -264,7 +263,7 @@ private void createNavigateMetadata(boolean tableEntity, Navigate navigate, Fiel
 
         Property<Object, ?> beanGetter = fastBean.getBeanGetter(fastBeanProperty);
         PropertySetterCaller<Object> beanSetter = fastBean.getBeanSetter(fastBeanProperty);
-        NavigateOption navigateOption = new NavigateOption(this, property, fastBeanProperty.getPropertyType(), navigateType, relationType, selfProperty, targetProperty,mappingProp);
+        NavigateOption navigateOption = new NavigateOption(this, property, fastBeanProperty.getPropertyType(), navigateType, relationType, selfProperty, targetProperty);
 
         if (tableEntity) {
             Class<? extends NavigateExtraFilterStrategy> extraFilterStrategyClass = navigate.extraFilter();

diff --git a/sql-core/src/main/java/com/easy/query/core/metadata/NavigateMetadata.java b/sql-core/src/main/java/com/easy/query/core/metadata/NavigateMetadata.java
@@ -34,7 +34,6 @@ public class NavigateMetadata {
      * 关联关系
      */
     private final RelationTypeEnum relationType;
-    private final String mappingProp;
     private final boolean basicType;
     private final String selfProperty;
     /**
@@ -62,7 +61,6 @@ public NavigateMetadata(NavigateOption navigateOption,
         this.selfMappingProperty = navigateOption.getSelfMappingProperty();
         this.targetMappingProperty = navigateOption.getTargetMappingProperty();
         this.predicateFilterExpression = navigateOption.getPredicateFilterExpression();
-        this.mappingProp=navigateOption.getMappingProp();
         this.basicType=navigateOption.isBasicType();
         this.getter = getter;
         this.setter = setter;
@@ -153,9 +151,6 @@ public void predicateFilterApply(WherePredicate<?> wherePredicate){
             predicateFilterExpression.apply(wherePredicate);
         }
     }
-    public String getMappingProp() {
-        return mappingProp;
-    }
 
     public boolean isBasicType() {
         return basicType;

diff --git a/sql-core/src/main/java/com/easy/query/core/metadata/NavigateOption.java b/sql-core/src/main/java/com/easy/query/core/metadata/NavigateOption.java
@@ -19,7 +19,6 @@ public class NavigateOption {
     private final RelationTypeEnum relationType;
     private final String selfProperty;
     private final String targetProperty;
-    private final String mappingProp;
     private final boolean basicType;
     private Class<?> mappingClass;
     private String selfMappingProperty;
@@ -32,8 +31,7 @@ public NavigateOption(EntityMetadata entityMetadata,
                           Class<?> navigatePropertyType,
                           RelationTypeEnum relationType,
                           String selfProperty,
-                          String targetProperty,
-                          String mappingProp){
+                          String targetProperty){
 
         this.entityMetadata = entityMetadata;
         this.propertyName = propertyName;
@@ -42,7 +40,6 @@ public NavigateOption(EntityMetadata entityMetadata,
         this.relationType = relationType;
         this.selfProperty = selfProperty;
         this.targetProperty = targetProperty;
-        this.mappingProp = mappingProp;
         this.basicType = EasyClassUtil.isBasicType(navigatePropertyType);
     }
 
@@ -106,10 +103,6 @@ public void setPredicateFilterExpression(SQLExpression1<WherePredicate<?>> predi
         this.predicateFilterExpression = predicateFilterExpression;
     }
 
-    public String getMappingProp() {
-        return mappingProp;
-    }
-
     public boolean isBasicType() {
         return basicType;
     }

diff --git a/sql-db-support/pom.xml b/sql-db-support/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
     </parent>
 
     <artifactId>sql-db-support</artifactId>

diff --git a/sql-db-support/sql-clickhouse/pom.xml b/sql-db-support/sql-clickhouse/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-db-support/sql-dameng/pom.xml b/sql-db-support/sql-dameng/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-db-support/sql-gauss-db/pom.xml b/sql-db-support/sql-gauss-db/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-db-support/sql-h2/pom.xml b/sql-db-support/sql-h2/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-db-support/sql-kingbase-es/pom.xml b/sql-db-support/sql-kingbase-es/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sql-kingbase-es</artifactId>

diff --git a/sql-db-support/sql-mssql/pom.xml b/sql-db-support/sql-mssql/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-db-support/sql-mysql/pom.xml b/sql-db-support/sql-mysql/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-db-support/sql-oracle/pom.xml b/sql-db-support/sql-oracle/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-db-support/sql-pgsql/pom.xml b/sql-db-support/sql-pgsql/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-db-support/sql-sqlite/pom.xml b/sql-db-support/sql-sqlite/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-extension/pom.xml b/sql-extension/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
     </parent>
 
     <artifactId>sql-extension</artifactId>

diff --git a/sql-extension/sql-cache/pom.xml b/sql-extension/sql-cache/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-extension/sql-kt-springboot-starter/pom.xml b/sql-extension/sql-kt-springboot-starter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-extension/sql-solon-plugin/pom.xml b/sql-extension/sql-solon-plugin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-extension/sql-springboot-starter/pom.xml b/sql-extension/sql-springboot-starter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/sql-platform/pom.xml b/sql-platform/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
     </parent>
 
     <artifactId>sql-platform</artifactId>