Browse Source

调整睡觉💤

hubin 7 năm trước cách đây
mục cha
commit
23d54e20d3

+ 4 - 5
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/test/query/Query.java

@@ -2,17 +2,17 @@ package com.baomidou.mybatisplus.core.test.query;
 
 import com.baomidou.mybatisplus.core.test.query.clause.*;
 import com.baomidou.mybatisplus.core.test.query.predicate.*;
-import com.baomidou.mybatisplus.core.test.query.struct.Statement;
+import com.baomidou.mybatisplus.core.test.query.struct.SqlStatement;
 
 import java.util.function.Function;
 
 
 public class Query implements ISqlSegment {
 
-   private final Statement statement;
+   private final SqlStatement statement;
 
    public Query() {
-      this.statement = new Statement();
+      this.statement = new SqlStatement();
    }
 
    /**
@@ -71,8 +71,7 @@ public class Query implements ISqlSegment {
     * @return this
     */
    public Query where(String expression, Function<Condition, Condition> condition) {
-      Where where = new Where(condition
-         .apply(new Condition().apply(expression)));
+      Where where = new Where(condition.apply(new Condition().apply(expression)));
       return add(where);
    }
 

+ 1 - 1
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/test/query/QueryTest.java

@@ -18,7 +18,7 @@ public class QueryTest {
             .from("bunnies b")
             .where("b.age > 18", condition ->
                 condition.and("b.type = 'rabid'")
-                    .and("b.abc=12"))
+                    .or("b.abc=12"))
             .sqlSegment();
 
         log(sql);

+ 3 - 1
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/test/query/struct/SimpleQueue.java → mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/test/query/struct/ISqlQueue.java

@@ -1,6 +1,8 @@
 package com.baomidou.mybatisplus.core.test.query.struct;
 
 
-public interface SimpleQueue<T> {
+public interface ISqlQueue<T> {
+
    void enqueue(T element);
+
 }

+ 4 - 4
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/test/query/struct/Statement.java → mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/test/query/struct/SqlStatement.java

@@ -8,17 +8,17 @@ import java.util.Deque;
 import com.baomidou.mybatisplus.core.test.query.ISqlSegment;
 
 
-public class Statement implements SimpleQueue<ISqlSegment>, ISqlSegment {
+public class SqlStatement implements ISqlQueue<ISqlSegment>, ISqlSegment {
 
     private Deque<ISqlSegment> deque;
 
-    public Statement() {
+    public SqlStatement() {
         this.deque = new ArrayDeque<>();
     }
 
     @Override
-    public void enqueue(ISqlSegment stringable) {
-        deque.add(stringable);
+    public void enqueue(ISqlSegment sqlSegment) {
+        deque.add(sqlSegment);
     }
 
     @Override