From 8724fc0b42a79a69fa981b2a97c8373ccb5224d9 Mon Sep 17 00:00:00 2001 From: Suomm <1474983351@qq.com> Date: Thu, 9 Nov 2023 20:58:07 +0800 Subject: [PATCH] =?UTF-8?q?test:=20=E7=AE=80=E5=8C=96=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../query/ArithmeticQueryColumnTest.java | 19 +++-- .../main/java/com/mybatisflex/test/Demo.java | 71 ------------------- .../test/ArithmeticQueryColumnTest.java | 18 ----- .../mybatis-flex-native-test/test.sql | 25 ------- 4 files changed, 15 insertions(+), 118 deletions(-) delete mode 100644 mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/Demo.java delete mode 100644 mybatis-flex-test/mybatis-flex-native-test/src/test/java/com/mybatisflex/test/ArithmeticQueryColumnTest.java delete mode 100644 mybatis-flex-test/mybatis-flex-native-test/test.sql diff --git a/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/query/ArithmeticQueryColumnTest.java b/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/query/ArithmeticQueryColumnTest.java index b86ab8cb..260b51f7 100644 --- a/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/query/ArithmeticQueryColumnTest.java +++ b/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/query/ArithmeticQueryColumnTest.java @@ -21,6 +21,8 @@ import com.mybatisflex.core.query.QueryWrapper; import org.junit.Assert; import org.junit.Test; +import static com.mybatisflex.core.query.QueryMethods.column; +import static com.mybatisflex.core.query.QueryMethods.number; import static com.mybatisflex.core.query.QueryMethods.sum; import static com.mybatisflex.coretest.table.AccountTableDef.ACCOUNT; @@ -31,10 +33,6 @@ public class ArithmeticQueryColumnTest { return dialect.forSelectByQuery(queryWrapper); } - @Test - public void testAddWithCondition(){ - - } @Test public void testAdd() { QueryWrapper query = new QueryWrapper() @@ -145,5 +143,18 @@ public class ArithmeticQueryColumnTest { Assert.assertEquals(sql, "SELECT (`id` / 100) AS `x100` FROM `tb_account`"); } + @Test + public void testComplexAdd() { + QueryWrapper queryWrapper = QueryWrapper.create() + .select(column("ABS(?)", -1).add(number(7))) + .from(ACCOUNT); + + String sql = queryWrapper.toSQL(); + + System.out.println(sql); + + Assert.assertEquals("SELECT ABS(-1) + 7 FROM `tb_account`", sql); + } + } diff --git a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/Demo.java b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/Demo.java deleted file mode 100644 index 188841a6..00000000 --- a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/Demo.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.mybatisflex.test; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; -import com.mybatisflex.core.activerecord.Model; -import com.mybatisflex.core.keygen.KeyGenerators; - -import java.math.BigDecimal; - -@Table("demo") -public class Demo extends Model { - @Id(keyType = KeyType.Generator, value = KeyGenerators.snowFlakeId) - private String id; - - public static Demo create() { - return new Demo(); - } - - private BigDecimal firstField; - private String userId; - private BigDecimal secondField; - private String foreignId; - - public String getId() { - return id; - } - - public Demo setId(String id) { - this.id = id; - return this; - } - - public BigDecimal getFirstField() { - return firstField; - } - - public Demo setFirstField(BigDecimal firstField) { - this.firstField = firstField; - return this; - } - - public String getUserId() { - return userId; - } - - public Demo setUserId(String userId) { - this.userId = userId; - return this; - - } - - public BigDecimal getSecondField() { - return secondField; - } - - public Demo setSecondField(BigDecimal secondField) { - this.secondField = secondField; - return this; - } - - public String getForeignId() { - return foreignId; - } - - public Demo setForeignId(String foreignId) { - this.foreignId = foreignId; - return this; - } -} - diff --git a/mybatis-flex-test/mybatis-flex-native-test/src/test/java/com/mybatisflex/test/ArithmeticQueryColumnTest.java b/mybatis-flex-test/mybatis-flex-native-test/src/test/java/com/mybatisflex/test/ArithmeticQueryColumnTest.java deleted file mode 100644 index 35bea91a..00000000 --- a/mybatis-flex-test/mybatis-flex-native-test/src/test/java/com/mybatisflex/test/ArithmeticQueryColumnTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.mybatisflex.test; - -import com.mybatisflex.core.query.QueryMethods; -import org.junit.Test; - -import java.math.BigDecimal; - -public class ArithmeticQueryColumnTest { - @Test - public void testAddWithCondition() { - BigDecimal bigDecimal = Demo.create() - .select(QueryMethods.sum(Demo::getFirstField) - .add(QueryMethods.sum(QueryMethods.if_(QueryMethods.column(Demo::getForeignId).eq("1"), QueryMethods.column(Demo::getSecondField), QueryMethods.number(0))))) - .where(Demo::getUserId).eq("1").objAsOpt(BigDecimal.class).orElse(BigDecimal.ZERO); - System.out.println(bigDecimal); - } - -} diff --git a/mybatis-flex-test/mybatis-flex-native-test/test.sql b/mybatis-flex-test/mybatis-flex-native-test/test.sql deleted file mode 100644 index 6639129e..00000000 --- a/mybatis-flex-test/mybatis-flex-native-test/test.sql +++ /dev/null @@ -1,25 +0,0 @@ -CREATE TABLE `demo` -( - `id` varchar(255) COLLATE utf8mb4_general_ci NOT NULL, - `first_field` decimal(10, 2) DEFAULT NULL, - `foreign_id` varchar(255) collate utf8mb4_general_ci default null, - second_field decimal(10, 2) DEFAULT NULL, - user_id varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; - - -INSERT INTO `demo` (`id`, `first_field`, `foreign_id`, second_field, user_id) -values ('1', 10.12, '1', 12.2, '1'); -INSERT INTO `demo` (`id`, `first_field`, `foreign_id`, second_field, user_id) -values ('2', 10.12, '2', 12.2, '1'); -INSERT INTO `demo` (`id`, `first_field`, `foreign_id`, second_field, user_id) -values ('3', 10.12, '3', 12.2, '1'); -INSERT INTO `demo` (`id`, `first_field`, `foreign_id`, second_field, user_id) -values ('4', 10.12, '4', 12.2, '1'); -INSERT INTO `demo` (`id`, `first_field`, `foreign_id`, second_field, user_id) -values ('5', 10.12, '5', 12.2, '1'); -INSERT INTO `demo` (`id`, `first_field`, `foreign_id`, second_field, user_id) -values ('6', 10.12, '6', NUll, '1'); -INSERT INTO `demo` (`id`, `first_field`, `foreign_id`, second_field, user_id) -values ('7', NULL, '7', 12.2, '1'); \ No newline at end of file