[0.3.5] 修复 ConditionalBuilder 对于参数未添加 AND 链接的问题

CarmJos · Jan 29, 2022 · bb4801b · bb4801b
1 parent 7acc284
commit bb4801b
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 15 deletions.
diff --git a/easysql-api/pom.xml b/easysql-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cc.carm.lib</groupId>
         <artifactId>easysql-parent</artifactId>
-        <version>0.3.4</version>
+        <version>0.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/easysql-impl/pom.xml b/easysql-impl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.3.4</version>
+        <version>0.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/easysql-impl/src/main/java/cc/carm/lib/easysql/builder/impl/AbstractConditionalBuilder.java b/easysql-impl/src/main/java/cc/carm/lib/easysql/builder/impl/AbstractConditionalBuilder.java
@@ -120,9 +120,9 @@ protected String buildConditionSQL() {
 			Iterator<String> iterator = conditionSQLs.iterator();
 			while (iterator.hasNext()) {
 				conditionBuilder.append(iterator.next());
-				if (iterator.hasNext()) conditionBuilder.append(" ");
+				if (iterator.hasNext()) conditionBuilder.append(" AND ");
 			}
-			return conditionBuilder.toString();
+			return conditionBuilder.toString().trim();
 		} else {
 			return null;
 		}

diff --git a/example/easysql-demo/pom.xml b/example/easysql-demo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.3.4</version>
+        <version>0.3.5</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/example/easysql-test/pom.xml b/example/easysql-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.3.4</version>
+        <version>0.3.5</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -28,7 +28,7 @@
     <dependencies>
         <dependency>
             <groupId>${project.parent.groupId}</groupId>
-            <artifactId>easysql-hikaricp</artifactId>
+            <artifactId>easysql-beecp</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>

diff --git a/example/easysql-test/src/main/java/cc/carm/lib/easysql/testrunner/Main.java b/example/easysql-test/src/main/java/cc/carm/lib/easysql/testrunner/Main.java
@@ -2,6 +2,7 @@
 
 import cc.carm.lib.easysql.EasySQL;
 import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.testrunner.tests.DeleteTest;
 import cc.carm.lib.easysql.testrunner.tests.QueryCloseTest;
 import cc.carm.lib.easysql.testrunner.tests.QueryFunctionTest;
 import cc.carm.lib.easysql.testrunner.tests.TableCreateTest;
@@ -49,6 +50,7 @@ public static void main(String[] args) {
 //		tests.add(new SQLUpdateBatchTests());
 //		tests.add(new SQLUpdateReturnKeysTest());
 		tests.add(new QueryFunctionTest());
+		tests.add(new DeleteTest());
 
 		print("准备进行测试...");
 

diff --git a/example/easysql-test/src/main/java/cc/carm/lib/easysql/testrunner/tests/DeleteTest.java b/example/easysql-test/src/main/java/cc/carm/lib/easysql/testrunner/tests/DeleteTest.java
@@ -0,0 +1,22 @@
+package cc.carm.lib.easysql.testrunner.tests;
+
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.testrunner.EasySQLTest;
+
+import java.sql.SQLException;
+
+public class DeleteTest extends EasySQLTest {
+
+
+	@Override
+	public void onTest(SQLManager sqlManager) throws SQLException {
+
+		Integer changes = sqlManager.createDelete("test_user_table")
+				.addCondition("id", ">", 5)
+				.addNotNullCondition("username")
+				.build().execute();
+
+		System.out.println("change(s): " + changes);
+
+	}
+}
diff --git a/pom.xml b/pom.xml
@@ -5,8 +5,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <java.version>8</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
         <sonar.organization>carmjos</sonar.organization>
@@ -16,7 +17,7 @@
     <groupId>cc.carm.lib</groupId>
     <artifactId>easysql-parent</artifactId>
     <packaging>pom</packaging>
-    <version>0.3.4</version>
+    <version>0.3.5</version>
 
     <modules>
         <module>easysql-api</module>
@@ -198,8 +199,8 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.9.0</version>
                     <configuration>
-                        <source>1.8</source>
-                        <target>1.8</target>
+                        <source>${java.version}</source>
+                        <target>${java.version}</target>
                         <encoding>UTF-8</encoding>
                         <compilerArgument>-parameters</compilerArgument>
                     </configuration>

diff --git a/with-pool/easysql-beecp/pom.xml b/with-pool/easysql-beecp/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.3.4</version>
+        <version>0.3.5</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/with-pool/easysql-hikaricp/pom.xml b/with-pool/easysql-hikaricp/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.3.4</version>
+        <version>0.3.5</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -72,7 +72,7 @@
             <!--项目地址 https://github.com/brettwooldridge/HikariCP/  -->
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>5.0.1</version>
+            <version>4.0.3</version>
             <optional>true</optional>
             <scope>compile</scope>
         </dependency>