From cc5306e06a367e3032ae2ec97e1fdf549f3bcfb3 Mon Sep 17 00:00:00 2001
From: Michael Yang <fuhai999@gmail.com>
Date: Sat, 5 Oct 2024 12:57:34 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A5=E9=80=82=E9=85=8D=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=20Feature?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mybatisflex/coretest/DynamicOrderByTest.java  | 5 +++--
 .../java/com/mybatisflex/coretest/PlusCompatibleTest.java  | 4 ++--
 .../test/java/com/mybatisflex/test/UpdateChainTest.java    | 7 ++++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/DynamicOrderByTest.java b/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/DynamicOrderByTest.java
index e4b1b691..a520ad06 100644
--- a/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/DynamicOrderByTest.java
+++ b/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/DynamicOrderByTest.java
@@ -17,11 +17,11 @@
 package com.mybatisflex.coretest;
 
 import com.mybatisflex.core.query.QueryWrapper;
+import com.mybatisflex.coretest.table.ArticleTableDef;
 import org.junit.Assert;
 import org.junit.Test;
 
 import static com.mybatisflex.coretest.table.AccountTableDef.ACCOUNT;
-import static com.mybatisflex.coretest.table.ArticleTableDef.ARTICLE;
 
 /**
  * @author 王帅
@@ -31,10 +31,11 @@ public class DynamicOrderByTest {
 
     @Test
     public void test01() {
+        ArticleTableDef ARTICLE = ArticleTableDef.ARTICLE.as("ar");
         QueryWrapper queryWrapper = QueryWrapper.create()
             .select(ACCOUNT.ID, ACCOUNT.USER_NAME.as("name"), ACCOUNT.AGE)
             .from(ACCOUNT.as("ac"))
-            .leftJoin(ARTICLE).as("ar").on(ARTICLE.ACCOUNT_ID.eq(ACCOUNT.ID))
+            .leftJoin(ARTICLE).on(ARTICLE.ACCOUNT_ID.eq(ACCOUNT.ID))
             .orderBy(ACCOUNT.USER_NAME, true)
             .orderBy(Account::getAge, false)
             .orderBy("name", true)
diff --git a/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/PlusCompatibleTest.java b/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/PlusCompatibleTest.java
index 1db77f88..470ec36d 100644
--- a/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/PlusCompatibleTest.java
+++ b/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/PlusCompatibleTest.java
@@ -43,9 +43,9 @@ public class PlusCompatibleTest {
             });
 
         Assert.assertEquals("SELECT * FROM `user` " +
-                "WHERE `tb_account`.`age` >= 18 " +
+                "WHERE `age` >= 18 " +
                 "OR (column2 LIKE 'value2%') " +
-                "OR (column3 = 'value3' AND `tb_account`.`sex` >= 0)"
+                "OR (column3 = 'value3' AND `sex` >= 0)"
             , queryWrapper.toSQL());
 
         System.out.println(queryWrapper.toSQL());
diff --git a/mybatis-flex-test/mybatis-flex-native-test/src/test/java/com/mybatisflex/test/UpdateChainTest.java b/mybatis-flex-test/mybatis-flex-native-test/src/test/java/com/mybatisflex/test/UpdateChainTest.java
index c7591105..e7be09c0 100644
--- a/mybatis-flex-test/mybatis-flex-native-test/src/test/java/com/mybatisflex/test/UpdateChainTest.java
+++ b/mybatis-flex-test/mybatis-flex-native-test/src/test/java/com/mybatisflex/test/UpdateChainTest.java
@@ -22,6 +22,7 @@ import com.mybatisflex.core.audit.ConsoleMessageCollector;
 import com.mybatisflex.core.datasource.DataSourceKey;
 import com.mybatisflex.core.query.QueryChain;
 import com.mybatisflex.core.update.UpdateChain;
+import com.mybatisflex.test.table.ArticleTableDef;
 import lombok.SneakyThrows;
 import org.apache.ibatis.logging.stdout.StdOutImpl;
 import org.assertj.core.api.WithAssertions;
@@ -38,7 +39,6 @@ import java.util.Collections;
 import java.util.List;
 
 import static com.mybatisflex.test.table.AccountTableDef.ACCOUNT;
-import static com.mybatisflex.test.table.ArticleTableDef.ARTICLE;
 
 public class UpdateChainTest implements WithAssertions {
 
@@ -129,15 +129,16 @@ public class UpdateChainTest implements WithAssertions {
 
     @Test
     public void testUpdateChainToSql() {
+        ArticleTableDef ARTICLE1 = ArticleTableDef.ARTICLE.as("ar");
         String sql = UpdateChain.of(Account.class)
                 .set(ACCOUNT.AGE, 18)
                 .set(Article::getAccountId, 4)
-                .leftJoin(ARTICLE).as("ar").on(ACCOUNT.ID.eq(ARTICLE.ACCOUNT_ID))
+                .leftJoin(ARTICLE1).on(ACCOUNT.ID.eq(ARTICLE1.ACCOUNT_ID))
                 .where(ACCOUNT.ID.eq(4))
                 .toSQL();
 
         String expectSQL = "UPDATE `tb_account` " +
-                "LEFT JOIN `tb_article` AS `ar` ON `tb_account`.`id` = `ar`.`account_id` " +
+                "LEFT JOIN `tb_article` AS `ar` ON `id` = `ar`.`account_id` " +
                 "SET `age` = 18 , `accountId` = 4  WHERE `id` = 4";
 
         assertThat(sql).isEqualTo(expectSQL);