From 9889889087a47a31ed7cb8a1fb8336a2784819c0 Mon Sep 17 00:00:00 2001 From: Suomm <1474983351@qq.com> Date: Wed, 9 Aug 2023 13:07:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fixed=200f9dbc1=20from=20https://gitee.com/?= =?UTF-8?q?Suomm/mybatis-flex/pulls/261=20test:=20=E6=B5=8B=E8=AF=95=20Mod?= =?UTF-8?q?el=20toSql()=20=E6=96=B9=E6=B3=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatisflex/test/mapper/ActiveRecordTest.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-test/src/test/java/com/mybatisflex/test/mapper/ActiveRecordTest.java b/mybatis-flex-test/mybatis-flex-spring-boot-test/src/test/java/com/mybatisflex/test/mapper/ActiveRecordTest.java index 3d06030c..99eede8d 100644 --- a/mybatis-flex-test/mybatis-flex-spring-boot-test/src/test/java/com/mybatisflex/test/mapper/ActiveRecordTest.java +++ b/mybatis-flex-test/mybatis-flex-spring-boot-test/src/test/java/com/mybatisflex/test/mapper/ActiveRecordTest.java @@ -156,4 +156,18 @@ class ActiveRecordTest { .forEach(System.out::println); } + @Test + void testToSql() { + String sql = User.create() + .as("u") + .select(USER.ALL_COLUMNS, ROLE.ALL_COLUMNS) + .leftJoin(USER_ROLE).as("ur").on(USER_ROLE.USER_ID.eq(USER.USER_ID)) + .leftJoin(ROLE).as("r").on(USER_ROLE.ROLE_ID.eq(ROLE.ROLE_ID)) + .where(USER.USER_ID.eq(2)) + .toQueryWrapper() + .toSQL(); + + System.out.println(sql); + } + } From 35bc85aa58000dcba50f2ff4a1c29507e4f82d17 Mon Sep 17 00:00:00 2001 From: Suomm <1474983351@qq.com> Date: Wed, 9 Aug 2023 13:07:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fixed=2053f6bcd=20from=20https://gitee.com/?= =?UTF-8?q?Suomm/mybatis-flex/pulls/261=20feat:=20=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20SQL=20FROM=20=E8=AF=AD=E5=8F=A5=EF=BC=8C?= =?UTF-8?q?=E6=8F=90=E4=BE=9B=20as()=20=E6=96=B9=E6=B3=95=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E8=A1=A8=E5=88=AB=E5=90=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/activerecord/query/QueryModel.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/QueryModel.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/QueryModel.java index ceb382f6..ac4372b2 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/QueryModel.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/QueryModel.java @@ -44,11 +44,20 @@ public abstract class QueryModel> { protected QueryWrapper queryWrapper() { if (queryWrapper == null) { - queryWrapper = QueryWrapper.create(); + TableInfo tableInfo = TableInfoFactory.ofEntityClass(getClass()); + QueryTable queryTable = new QueryTable(); + queryTable.setSchema(tableInfo.getSchema()); + queryTable.setName(tableInfo.getTableName()); + queryWrapper = QueryWrapper.create().from(queryTable); } return queryWrapper; } + public T as(String alias) { + queryWrapper().as(alias); + return (T) this; + } + public T select() { return (T) this; }