From 58dc072199663538654073e3f407404d84c49c8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=80=E6=BA=90=E6=B5=B7=E5=93=A5?= Date: Sun, 20 Aug 2023 12:30:11 +0800 Subject: [PATCH] build: v1.5.8 release (^.^)YYa!! --- mybatis-flex-annotation/pom.xml | 2 +- mybatis-flex-codegen/pom.xml | 2 +- mybatis-flex-core/pom.xml | 2 +- .../src/main/java/com/mybatisflex/core/FlexConsts.java | 2 +- .../src/main/java/com/mybatisflex/core/query/RawFragment.java | 4 ++-- mybatis-flex-processor/pom.xml | 2 +- mybatis-flex-solon-plugin/pom.xml | 2 +- mybatis-flex-spring-boot-starter/pom.xml | 2 +- mybatis-flex-spring/pom.xml | 2 +- mybatis-flex-test/mybatis-flex-native-test/pom.xml | 2 +- mybatis-flex-test/mybatis-flex-seata-test/pom.xml | 2 +- mybatis-flex-test/mybatis-flex-spring-boot-test/pom.xml | 2 +- mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml | 2 +- mybatis-flex-test/mybatis-flex-spring-test/pom.xml | 2 +- mybatis-flex-test/pom.xml | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/mybatis-flex-annotation/pom.xml b/mybatis-flex-annotation/pom.xml index 92d91ce8..308bf593 100644 --- a/mybatis-flex-annotation/pom.xml +++ b/mybatis-flex-annotation/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.5.7 + 1.5.8 4.0.0 diff --git a/mybatis-flex-codegen/pom.xml b/mybatis-flex-codegen/pom.xml index 5a4fbb17..1b390a3b 100644 --- a/mybatis-flex-codegen/pom.xml +++ b/mybatis-flex-codegen/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.5.7 + 1.5.8 4.0.0 diff --git a/mybatis-flex-core/pom.xml b/mybatis-flex-core/pom.xml index cd315fbf..44bddc52 100644 --- a/mybatis-flex-core/pom.xml +++ b/mybatis-flex-core/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.5.7 + 1.5.8 4.0.0 diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexConsts.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexConsts.java index 5221b905..67016b25 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexConsts.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexConsts.java @@ -27,7 +27,7 @@ public class FlexConsts { } public static final String NAME = "MyBatis-Flex"; - public static final String VERSION = "1.5.7"; + public static final String VERSION = "1.5.8"; public static final String SQL = "$$sql"; diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/RawFragment.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/RawFragment.java index 31466c02..dd137010 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/RawFragment.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/RawFragment.java @@ -43,8 +43,8 @@ public class RawFragment extends QueryCondition { boolean containsTable(String... tables) { for (String table : tables) { String[] tableNameWithAlisa = StringUtil.getTableNameWithAlisa(table); - if (content.contains(tableNameWithAlisa[1]) - || content.contains(tableNameWithAlisa[0])) { + if (content.contains(tableNameWithAlisa[0]) + || (tableNameWithAlisa[1] != null && content.contains(tableNameWithAlisa[1]))) { return true; } } diff --git a/mybatis-flex-processor/pom.xml b/mybatis-flex-processor/pom.xml index b50270a0..fdaecafe 100644 --- a/mybatis-flex-processor/pom.xml +++ b/mybatis-flex-processor/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.5.7 + 1.5.8 4.0.0 diff --git a/mybatis-flex-solon-plugin/pom.xml b/mybatis-flex-solon-plugin/pom.xml index c7db9919..c087f927 100644 --- a/mybatis-flex-solon-plugin/pom.xml +++ b/mybatis-flex-solon-plugin/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.5.7 + 1.5.8 4.0.0 diff --git a/mybatis-flex-spring-boot-starter/pom.xml b/mybatis-flex-spring-boot-starter/pom.xml index 81ed16d5..665a3feb 100644 --- a/mybatis-flex-spring-boot-starter/pom.xml +++ b/mybatis-flex-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.5.7 + 1.5.8 4.0.0 diff --git a/mybatis-flex-spring/pom.xml b/mybatis-flex-spring/pom.xml index fabfebcc..1009ee02 100644 --- a/mybatis-flex-spring/pom.xml +++ b/mybatis-flex-spring/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.5.7 + 1.5.8 4.0.0 diff --git a/mybatis-flex-test/mybatis-flex-native-test/pom.xml b/mybatis-flex-test/mybatis-flex-native-test/pom.xml index 61da5f2b..b16485b9 100644 --- a/mybatis-flex-test/mybatis-flex-native-test/pom.xml +++ b/mybatis-flex-test/mybatis-flex-native-test/pom.xml @@ -5,7 +5,7 @@ mybatis-flex-test com.mybatis-flex - 1.5.7 + 1.5.8 4.0.0 diff --git a/mybatis-flex-test/mybatis-flex-seata-test/pom.xml b/mybatis-flex-test/mybatis-flex-seata-test/pom.xml index ed1a9e66..c56fe05b 100644 --- a/mybatis-flex-test/mybatis-flex-seata-test/pom.xml +++ b/mybatis-flex-test/mybatis-flex-seata-test/pom.xml @@ -4,7 +4,7 @@ mybatis-flex-test com.mybatis-flex - 1.5.7 + 1.5.8 4.0.0 diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-test/pom.xml b/mybatis-flex-test/mybatis-flex-spring-boot-test/pom.xml index 955dc055..d2fcf3d1 100644 --- a/mybatis-flex-test/mybatis-flex-spring-boot-test/pom.xml +++ b/mybatis-flex-test/mybatis-flex-spring-boot-test/pom.xml @@ -5,7 +5,7 @@ mybatis-flex-test com.mybatis-flex - 1.5.7 + 1.5.8 4.0.0 diff --git a/mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml b/mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml index 11284ce1..0b7096cd 100644 --- a/mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml +++ b/mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml @@ -4,7 +4,7 @@ mybatis-flex-test com.mybatis-flex - 1.5.7 + 1.5.8 4.0.0 diff --git a/mybatis-flex-test/mybatis-flex-spring-test/pom.xml b/mybatis-flex-test/mybatis-flex-spring-test/pom.xml index b7681250..1fbdecca 100644 --- a/mybatis-flex-test/mybatis-flex-spring-test/pom.xml +++ b/mybatis-flex-test/mybatis-flex-spring-test/pom.xml @@ -5,7 +5,7 @@ mybatis-flex-test com.mybatis-flex - 1.5.7 + 1.5.8 4.0.0 diff --git a/mybatis-flex-test/pom.xml b/mybatis-flex-test/pom.xml index 64d8312b..c5f4e931 100644 --- a/mybatis-flex-test/pom.xml +++ b/mybatis-flex-test/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.5.7 + 1.5.8 4.0.0