更新

sagframe · Jul 12, 2024 · 9cf1da0 · 9cf1da0
1 parent 2910518
commit 9cf1da0
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 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.11.RC4</version>
+	<version>5.6.11.RC8</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/plugins/function/FunctionUtils.java b/trunk/sqltoy-orm-core/src/main/java/org/sagacity/sqltoy/plugins/function/FunctionUtils.java
@@ -117,7 +117,7 @@ private static String replaceFunction(String sqlContent, int dbType, IFunction f
 				if (StringUtil.matches(functionParams, function.regex())) {
 					functionParams = replaceFunction(functionParams, dbType, function);
 				}
-				if (functionParams.trim().equals("")) {
+				if (functionParams == null || functionParams.trim().equals("")) {
 					args = null;
 				} else {
 					args = StringUtil.splitExcludeSymMark(functionParams, ",", SqlToyConstants.filters);

diff --git a/trunk/sqltoy-orm-core/src/main/java/org/sagacity/sqltoy/plugins/function/impl/Nvl.java b/trunk/sqltoy-orm-core/src/main/java/org/sagacity/sqltoy/plugins/function/impl/Nvl.java
@@ -59,7 +59,7 @@ public String wrap(int dialect, String functionName, boolean hasArgs, String...
 			return wrapArgs("coalesce", args);
 		}
 		if (dialect == DBType.MYSQL || dialect == DBType.TIDB || dialect == DBType.MYSQL57) {
-			if (args != null && args.length == 1) {
+			if (args.length == 1) {
 				return wrapArgs("isnull", args);
 			}
 			return wrapArgs("ifnull", args);

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.11.RC4</version>
+    <version>5.6.11.RC8</version>
 
     <artifactId>sagacity-sqltoy-solon-plugin</artifactId>
     <name>sagacity-sqltoy-solon-plugin</name>
@@ -16,8 +16,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <solon.version>2.8.4</solon.version>
-        <redisx.version>1.6.4</redisx.version>
+        <solon.version>2.8.5</solon.version>
+        <redisx.version>1.6.5</redisx.version>
         <mongo.version>3.12.14</mongo.version>
         <slf4j.version>2.0.13</slf4j.version>
         <caffeine.version>3.1.8</caffeine.version>

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.11.RC4</version>
+	<version>5.6.11.RC8</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,14 +3,14 @@
 	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.11.RC4</version>
+	<version>5.6.11.RC8</version>
 	<name>sagacity-sqltoy-spring</name>
 	<description>sagacity-sqltoy-spring</description>
 	<artifactId>sagacity-sqltoy-spring</artifactId>
 	<url>https://github.com/sagframe/sagacity-sqltoy</url>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-framework.version>6.1.10</spring-framework.version>
+		<spring-framework.version>6.1.11</spring-framework.version>
 		<spring-data-commons.version>3.2.7</spring-data-commons.version>
 		<spring-data-redis.version>3.2.7</spring-data-redis.version>
 		<spring-data-mongo.version>4.2.7</spring-data-mongo.version>