diff --git a/.gitee/ISSUE_TEMPLATE/bug.yml b/.gitee/ISSUE_TEMPLATE/bug.yml
index 69fc83d3..ab6e19ff 100644
--- a/.gitee/ISSUE_TEMPLATE/bug.yml
+++ b/.gitee/ISSUE_TEMPLATE/bug.yml
@@ -7,7 +7,7 @@ body:
attributes:
label: 这个 Bug 是否已经存在:
options:
- - label: 我确定已经把 MyBatis-Flex 升级到最新版本 v1.9.5,并已搜索过现有的问题 (https://gitee.com/mybatis-flex/mybatis-flex/issues)
+ - label: 我确定已经把 MyBatis-Flex 升级到最新版本 v1.9.6,并已搜索过现有的问题 (https://gitee.com/mybatis-flex/mybatis-flex/issues)
required: true
- type: textarea
attributes:
diff --git a/changes.md b/changes.md
index ecfd3c53..ef832021 100644
--- a/changes.md
+++ b/changes.md
@@ -2,6 +2,17 @@
查看 [全部代码贡献者](/zh/intro/what-is-mybatisflex.html#贡献者)。
+## v1.9.6 20240818
+- 新增:Mapper 新增 insertBatchSelective 方法
+- 新增:新增 SQL SERVER 返回当前日期和时间,感谢 @macy0122
+- 优化:Mapper 的批量操作方法,由 List 修改为 Collection
+- 修复:Sql Server 多表关联查询,主表去重,执行SQL异常,感谢 @macy0122
+- 修复:processor 回退到 v1.9.3
+- 修复:TableInfoFactory 在某些极端的使用场景可能出现 NPE 的问题
+- 修复:修复分页包含 having 语句时,语法依然被优化问题,感谢 @cearnach
+- 测试:优化一些测试的 DbType 冲突的问题
+
+
## v1.9.5 20240801
- 新增:ID 主键生成策略新增 ULID 算法,感谢 @dh-free
diff --git a/docs/zh/intro/getting-started.md b/docs/zh/intro/getting-started.md
index 42d7aa38..ea141357 100644
--- a/docs/zh/intro/getting-started.md
+++ b/docs/zh/intro/getting-started.md
@@ -53,7 +53,7 @@ VALUES (1, '张三', 18, '2020-01-11'),
com.mybatis-flex
mybatis-flex-spring-boot-starter
- 1.9.5
+ 1.9.6
com.mysql
@@ -81,7 +81,7 @@ VALUES (1, '张三', 18, '2020-01-11'),
com.mybatis-flex
mybatis-flex-spring-boot3-starter
- 1.9.5
+ 1.9.6
com.mysql
diff --git a/docs/zh/intro/gradle.md b/docs/zh/intro/gradle.md
index 005cf235..7f068f56 100644
--- a/docs/zh/intro/gradle.md
+++ b/docs/zh/intro/gradle.md
@@ -10,7 +10,7 @@
```kotlin
dependencies {
- implementation("com.mybatis-flex:mybatis-flex-core:1.9.5")
+ implementation("com.mybatis-flex:mybatis-flex-core:1.9.6")
}
```
@@ -18,7 +18,7 @@ dependencies {
```groovy
dependencies {
- implementation 'com.mybatis-flex:mybatis-flex-core:1.9.5'
+ implementation 'com.mybatis-flex:mybatis-flex-core:1.9.6'
}
```
@@ -28,7 +28,7 @@ dependencies {
```kotlin
dependencies {
- implementation("com.mybatis-flex:mybatis-flex-spring:1.9.5")
+ implementation("com.mybatis-flex:mybatis-flex-spring:1.9.6")
}
```
@@ -36,7 +36,7 @@ dependencies {
```groovy
dependencies {
- implementation 'com.mybatis-flex:mybatis-flex-spring:1.9.5'
+ implementation 'com.mybatis-flex:mybatis-flex-spring:1.9.6'
}
```
@@ -46,7 +46,7 @@ dependencies {
```kotlin
dependencies {
- implementation("com.mybatis-flex:mybatis-flex-spring-boot-starter:1.9.5")
+ implementation("com.mybatis-flex:mybatis-flex-spring-boot-starter:1.9.6")
}
```
@@ -54,7 +54,7 @@ dependencies {
```groovy
dependencies {
- implementation 'com.mybatis-flex:mybatis-flex-spring-boot-starter:1.9.5'
+ implementation 'com.mybatis-flex:mybatis-flex-spring-boot-starter:1.9.6'
}
```
@@ -70,7 +70,7 @@ dependencies {
```kotlin
dependencies {
- annotationProcessor("com.mybatis-flex:mybatis-flex-processor:1.9.5")
+ annotationProcessor("com.mybatis-flex:mybatis-flex-processor:1.9.6")
}
```
@@ -78,6 +78,6 @@ dependencies {
```groovy
dependencies {
- annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.9.5'
+ annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.9.6'
}
```
diff --git a/docs/zh/intro/maven.md b/docs/zh/intro/maven.md
index 3f3ab14f..4a636df4 100644
--- a/docs/zh/intro/maven.md
+++ b/docs/zh/intro/maven.md
@@ -12,12 +12,12 @@
com.mybatis-flex
mybatis-flex-core
- 1.9.5
+ 1.9.6
com.mybatis-flex
mybatis-flex-processor
- 1.9.5
+ 1.9.6
provided
```
@@ -28,12 +28,12 @@
com.mybatis-flex
mybatis-flex-spring
- 1.9.5
+ 1.9.6
com.mybatis-flex
mybatis-flex-processor
- 1.9.5
+ 1.9.6
provided
``````
@@ -44,12 +44,12 @@
com.mybatis-flex
mybatis-flex-spring-boot-starter
- 1.9.5
+ 1.9.6
com.mybatis-flex
mybatis-flex-processor
- 1.9.5
+ 1.9.6
provided
```
@@ -60,12 +60,12 @@
com.mybatis-flex
mybatis-flex-spring-boot3-starter
- 1.9.5
+ 1.9.6
com.mybatis-flex
mybatis-flex-processor
- 1.9.5
+ 1.9.6
provided
```
@@ -88,7 +88,7 @@
com.mybatis-flex
mybatis-flex-processor
- 1.9.5
+ 1.9.6
diff --git a/docs/zh/others/apt.md b/docs/zh/others/apt.md
index 960e2f5c..7793a08b 100644
--- a/docs/zh/others/apt.md
+++ b/docs/zh/others/apt.md
@@ -229,7 +229,7 @@ pom.xml 添加 `annotationProcessorPaths` 配置,
```
dependencies {
...
- annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.9.5'
+ annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.9.6'
}
```
diff --git a/mybatis-flex-annotation/pom.xml b/mybatis-flex-annotation/pom.xml
index 30bcacfa..595ef95d 100644
--- a/mybatis-flex-annotation/pom.xml
+++ b/mybatis-flex-annotation/pom.xml
@@ -5,7 +5,7 @@
parent
com.mybatis-flex
- 1.9.5
+ 1.9.6
4.0.0
diff --git a/mybatis-flex-codegen/pom.xml b/mybatis-flex-codegen/pom.xml
index 729a3a8d..802c5827 100644
--- a/mybatis-flex-codegen/pom.xml
+++ b/mybatis-flex-codegen/pom.xml
@@ -5,7 +5,7 @@
parent
com.mybatis-flex
- 1.9.5
+ 1.9.6
4.0.0
@@ -23,7 +23,7 @@
com.mybatis-flex
mybatis-flex-core
- 1.9.5
+ 1.9.6
com.mybatis-flex
diff --git a/mybatis-flex-core/pom.xml b/mybatis-flex-core/pom.xml
index 81131159..dad0584b 100644
--- a/mybatis-flex-core/pom.xml
+++ b/mybatis-flex-core/pom.xml
@@ -5,7 +5,7 @@
parent
com.mybatis-flex
- 1.9.5
+ 1.9.6
4.0.0
@@ -101,7 +101,7 @@
com.mybatis-flex
mybatis-flex-annotation
- 1.9.5
+ 1.9.6
compile
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 d6b6fd8c..8419d0f7 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.9.5";
+ public static final String VERSION = "1.9.6";
public static final String SQL = "$$sql";
diff --git a/mybatis-flex-dependencies/pom.xml b/mybatis-flex-dependencies/pom.xml
index 445abef5..31b1288f 100644
--- a/mybatis-flex-dependencies/pom.xml
+++ b/mybatis-flex-dependencies/pom.xml
@@ -6,7 +6,7 @@
com.mybatis-flex
mybatis-flex-dependencies
- 1.9.5
+ 1.9.6
pom
@@ -48,7 +48,7 @@
- 1.9.5
+ 1.9.6
diff --git a/mybatis-flex-processor/pom.xml b/mybatis-flex-processor/pom.xml
index 5d35adaa..45ae5df8 100644
--- a/mybatis-flex-processor/pom.xml
+++ b/mybatis-flex-processor/pom.xml
@@ -5,13 +5,13 @@
parent
com.mybatis-flex
- 1.9.5
+ 1.9.6
4.0.0
mybatis-flex-processor
jar
- 1.9.5
+ 1.9.6
@@ -23,7 +23,7 @@
com.mybatis-flex
mybatis-flex-annotation
- 1.9.5
+ 1.9.6
diff --git a/mybatis-flex-solon-plugin/pom.xml b/mybatis-flex-solon-plugin/pom.xml
index 98a5d4c2..0e9cb1ff 100644
--- a/mybatis-flex-solon-plugin/pom.xml
+++ b/mybatis-flex-solon-plugin/pom.xml
@@ -5,7 +5,7 @@
parent
com.mybatis-flex
- 1.9.5
+ 1.9.6
4.0.0
diff --git a/mybatis-flex-spring-boot-starter/pom.xml b/mybatis-flex-spring-boot-starter/pom.xml
index 96d44f68..78f74099 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.9.5
+ 1.9.6
4.0.0
@@ -23,7 +23,7 @@
com.mybatis-flex
mybatis-flex-spring
- 1.9.5
+ 1.9.6
@@ -104,7 +104,7 @@
com.mybatis-flex
mybatis-flex-core
- 1.9.5
+ 1.9.6
diff --git a/mybatis-flex-spring-boot3-starter/pom.xml b/mybatis-flex-spring-boot3-starter/pom.xml
index b2e02d5c..908ee7e9 100644
--- a/mybatis-flex-spring-boot3-starter/pom.xml
+++ b/mybatis-flex-spring-boot3-starter/pom.xml
@@ -6,7 +6,7 @@
com.mybatis-flex
parent
- 1.9.5
+ 1.9.6
mybatis-flex-spring-boot3-starter
@@ -19,7 +19,7 @@
com.mybatis-flex
mybatis-flex-spring-boot-starter
- 1.9.5
+ 1.9.6
org.mybatis
diff --git a/mybatis-flex-spring/pom.xml b/mybatis-flex-spring/pom.xml
index ae2af6df..80f4fca0 100644
--- a/mybatis-flex-spring/pom.xml
+++ b/mybatis-flex-spring/pom.xml
@@ -5,7 +5,7 @@
parent
com.mybatis-flex
- 1.9.5
+ 1.9.6
4.0.0
@@ -22,7 +22,7 @@
com.mybatis-flex
mybatis-flex-core
- 1.9.5
+ 1.9.6
diff --git a/mybatis-flex-test/mybatis-flex-native-test/pom.xml b/mybatis-flex-test/mybatis-flex-native-test/pom.xml
index 1db67f3d..af29f4c6 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.9.5
+ 1.9.6
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 1de1e94d..b0d931b4 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.9.5
+ 1.9.6
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 df4a0b14..fdd50171 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.9.5
+ 1.9.6
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 1769f5f2..f2002662 100644
--- a/mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml
+++ b/mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml
@@ -5,7 +5,7 @@
mybatis-flex-test
com.mybatis-flex
- 1.9.5
+ 1.9.6
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 19fef72c..58a7308b 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.9.5
+ 1.9.6
4.0.0
diff --git a/mybatis-flex-test/pom.xml b/mybatis-flex-test/pom.xml
index 2fa15223..330602fd 100644
--- a/mybatis-flex-test/pom.xml
+++ b/mybatis-flex-test/pom.xml
@@ -5,7 +5,7 @@
parent
com.mybatis-flex
- 1.9.5
+ 1.9.6
4.0.0
diff --git a/pom.xml b/pom.xml
index e386a03f..39faefdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
com.mybatis-flex
parent
pom
- 1.9.5
+ 1.9.6
mybatis-flex
https://mybatis-flex.com
@@ -55,7 +55,7 @@
8
8
- 1.9.5
+ 1.9.6
3.5.15
2.1.2