Merge branch 'dev' into 5.6

sagframe · Sep 29, 2024 · 883c6b3 · 883c6b3
2 parents 5ab7316 + 309488a
commit 883c6b3
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 12 deletions.
diff --git 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">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.sagframe</groupId>
-	<version>5.6.25.RC3</version>
+	<version>5.6.25</version>
 	<name>sagacity-sqltoy</name>
 	<description>sqltoy core code</description>
 	<artifactId>sagacity-sqltoy</artifactId>

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
@@ -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
@@ -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
@@ -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
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.sagframe</groupId>
-    <version>5.6.25.RC3</version>
+    <version>5.6.25</version>
 
     <artifactId>sagacity-sqltoy-solon-plugin</artifactId>
     <name>sagacity-sqltoy-solon-plugin</name>

diff --git 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">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.sagframe</groupId>
-	<version>5.6.25.RC3</version>
+	<version>5.6.25</version>
 	<name>sagacity-sqltoy-spring-starter</name>
 	<artifactId>sagacity-sqltoy-spring-starter</artifactId>
 	<description>sqltoy springboot starter</description>

diff --git 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">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.sagframe</groupId>
-	<version>5.6.25.RC3</version>
+	<version>5.6.25</version>
 	<name>sagacity-sqltoy-spring</name>
 	<description>sagacity-sqltoy-spring</description>
 	<artifactId>sagacity-sqltoy-spring</artifactId>