Sfoglia il codice sorgente

Merge remote-tracking branch 'origin/3.0' into 3.0

hubin 7 anni fa
parent
commit
8943ce6ad6

+ 1 - 1
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/entity/PgTestData.java

@@ -21,7 +21,7 @@ import java.time.LocalDateTime;
 @TableName(value = "tb_only_pg_test_data")
 public class PgTestData extends BaseEntity {
 
-    @TableField(value = "age", el = "age, jdbcType=integer")
+    @TableField(value = "age", el = "dataAge, jdbcType=INTEGER")
     private Integer dataAge;
     @TableField(value = "c_datetime", fill = FieldFill.INSERT)
     private LocalDateTime createDatetime;

+ 2 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/MysqlTestDataMapperTest.java

@@ -278,9 +278,9 @@ public class MysqlTestDataMapperTest {
     @Test
     public void testExists() {
         println(mapper.selectList(new QueryWrapper<TestData>()
-            .exists("select * from test_data")//ok
+            .exists("select * from tb_test_data")//ok
             .or()
-            .notExists("select * from test_data")//ok
+            .notExists("select * from tb_test_data")//ok
         ));
         /* exists 连着用是可行的 */
     }

+ 3 - 3
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/postgres/PostgresTestDataMapperTest.java

@@ -233,7 +233,7 @@ public class PostgresTestDataMapperTest {
             .nested(i -> i.eq(TestData::getId, 1L))
             .or(i -> i.between(TestData::getTestDouble, 1L, 2L))
             .or(i -> i.eq(TestData::getTestInt, 1)
-                .or().eq(TestData::getTestDate, 1)
+                .or().eq(TestData::getTestDate, LocalDate.now())
             )
             .eq(TestData::getTestBoolean, true)
             .eq(TestData::getTestDate, LocalDate.of(2008, 8, 8))
@@ -278,9 +278,9 @@ public class PostgresTestDataMapperTest {
     @Test
     public void testExists() {
         println(mapper.selectList(new QueryWrapper<TestData>()
-            .exists("select * from test_data")//ok
+            .exists("select * from tb_test_data")//ok
             .or()
-            .notExists("select * from test_data")//ok
+            .notExists("select * from tb_test_data")//ok
         ));
         /* exists 连着用是可行的 */
     }