diff --git a/trunk/sqltoy-orm-core/pom.xml b/trunk/sqltoy-orm-core/pom.xml
index 438fb4642..9dde7ac57 100644
--- a/trunk/sqltoy-orm-core/pom.xml
+++ b/trunk/sqltoy-orm-core/pom.xml
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
com.sagframe
- 5.6.25.RC3
+ 5.6.25
sagacity-sqltoy
sqltoy core code
sagacity-sqltoy
diff --git a/trunk/sqltoy-orm-core/src/main/java/org/sagacity/sqltoy/utils/DateUtil.java b/trunk/sqltoy-orm-core/src/main/java/org/sagacity/sqltoy/utils/DateUtil.java
index 92e36523c..f6dd148d5 100644
--- a/trunk/sqltoy-orm-core/src/main/java/org/sagacity/sqltoy/utils/DateUtil.java
+++ b/trunk/sqltoy-orm-core/src/main/java/org/sagacity/sqltoy/utils/DateUtil.java
@@ -853,8 +853,8 @@ public static int getIntervalYears(Object floorDate, Object goalDate) {
*/
public static int getIntervalDays(Object floorDate, Object goalDate) {
BigDecimal result = new BigDecimal(
- Double.valueOf(getIntervalMillSeconds(DateUtil.formatDate(floorDate, FORMAT.DATE_HORIZONTAL),
- DateUtil.formatDate(goalDate, FORMAT.DATE_HORIZONTAL))) / (3600 * 1000 * 24));
+ Double.valueOf(getIntervalMillSeconds(formatDate(floorDate, FORMAT.DATE_HORIZONTAL),
+ formatDate(goalDate, FORMAT.DATE_HORIZONTAL))) / (3600 * 1000 * 24));
return result.setScale(1, RoundingMode.HALF_UP).intValue();
}
diff --git a/trunk/sqltoy-orm-core/src/main/java/org/sagacity/sqltoy/utils/FileUtil.java b/trunk/sqltoy-orm-core/src/main/java/org/sagacity/sqltoy/utils/FileUtil.java
index c3e86bbad..566a5bfb7 100644
--- a/trunk/sqltoy-orm-core/src/main/java/org/sagacity/sqltoy/utils/FileUtil.java
+++ b/trunk/sqltoy-orm-core/src/main/java/org/sagacity/sqltoy/utils/FileUtil.java
@@ -971,7 +971,7 @@ public static String getParentPath(String fileName) {
* @return
*/
public static String skipPath(String basePath, String skipFile) {
- String realFile = FileUtil.formatPath(skipFile).trim();
+ String realFile = formatPath(skipFile).trim();
if (realFile.indexOf("." + File.separator) == 0) {
realFile = realFile.substring(2);
}
diff --git a/trunk/sqltoy-orm-core/src/main/java/org/sagacity/sqltoy/utils/SqlUtil.java b/trunk/sqltoy-orm-core/src/main/java/org/sagacity/sqltoy/utils/SqlUtil.java
index 6b11e4339..15bc00f40 100644
--- a/trunk/sqltoy-orm-core/src/main/java/org/sagacity/sqltoy/utils/SqlUtil.java
+++ b/trunk/sqltoy-orm-core/src/main/java/org/sagacity/sqltoy/utils/SqlUtil.java
@@ -2226,12 +2226,19 @@ public static String combineArray(Object[] array) {
* @return
*/
public static String adjustMergeIntoSql(String sql, Integer dbType) {
+ String sqlTrimLow = sql.toLowerCase().trim();
+ // 非merge into 不做任何处理
+ if (!StringUtil.matches(sqlTrimLow, MERGE_INTO_PATTERN)) {
+ return sql;
+ }
+ boolean isBranchEnd = sqlTrimLow.endsWith(";");
// sqlserver merge into 要以;结尾
- if (dbType == DBType.SQLSERVER) {
- String sqlTrimLow = sql.toLowerCase().trim();
- if (StringUtil.matches(sqlTrimLow, MERGE_INTO_PATTERN) && !sqlTrimLow.endsWith(";")) {
- return sql.concat(";");
- }
+ if (dbType == DBType.SQLSERVER && !isBranchEnd) {
+ return sql.concat(";");
+ }
+ // 其他数据库merge into 以;结尾则需要剔除分号
+ if (isBranchEnd) {
+ return sql.substring(0, sql.lastIndexOf(";"));
}
return sql;
}
diff --git a/trunk/sqltoy-orm-solon-plugin/pom.xml b/trunk/sqltoy-orm-solon-plugin/pom.xml
index 38573c7e6..3cd6128c0 100644
--- a/trunk/sqltoy-orm-solon-plugin/pom.xml
+++ b/trunk/sqltoy-orm-solon-plugin/pom.xml
@@ -5,7 +5,7 @@
4.0.0
com.sagframe
- 5.6.25.RC3
+ 5.6.25
sagacity-sqltoy-solon-plugin
sagacity-sqltoy-solon-plugin
diff --git a/trunk/sqltoy-orm-spring-starter/pom.xml b/trunk/sqltoy-orm-spring-starter/pom.xml
index 9ae73b751..db275dcb9 100644
--- a/trunk/sqltoy-orm-spring-starter/pom.xml
+++ b/trunk/sqltoy-orm-spring-starter/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
com.sagframe
- 5.6.25.RC3
+ 5.6.25
sagacity-sqltoy-spring-starter
sagacity-sqltoy-spring-starter
sqltoy springboot starter
diff --git a/trunk/sqltoy-orm-spring/pom.xml b/trunk/sqltoy-orm-spring/pom.xml
index 3f03207ff..1ec48d3f0 100644
--- a/trunk/sqltoy-orm-spring/pom.xml
+++ b/trunk/sqltoy-orm-spring/pom.xml
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
com.sagframe
- 5.6.25.RC3
+ 5.6.25
sagacity-sqltoy-spring
sagacity-sqltoy-spring
sagacity-sqltoy-spring