From 1ea36328fffd33177498523511f1612f6e59dfbe Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Sun, 10 Mar 2024 15:09:34 +0800
Subject: [PATCH] =?UTF-8?q?fixup!=20revert:=20=E6=92=A4=E9=94=80=E4=BA=89?=
 =?UTF-8?q?=E8=AE=AE=E6=9B=B4=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatisflex/core/query/QueryTable.java    |  1 -
 .../com/mybatisflex/core/table/TableDef.java  | 18 ++-------------
 .../mybatisflex/coretest/TableDefTest.java    | 23 -------------------
 .../processor/builder/ContentBuilder.java     | 13 -----------
 4 files changed, 2 insertions(+), 53 deletions(-)
 delete mode 100644 mybatis-flex-core/src/test/java/com/mybatisflex/coretest/TableDefTest.java

diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryTable.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryTable.java
index 19ce188b..997ff216 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryTable.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryTable.java
@@ -41,7 +41,6 @@ public class QueryTable implements CloneSupport<QueryTable> {
         this.tableDefHashCode = tableDef.hashCode();
         this.schema = tableDef.getSchema();
         this.name = tableDef.getTableName();
-        this.alias = tableDef.getAlias();
     }
 
     public QueryTable(String name) {
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableDef.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableDef.java
index 17c5fbce..07bd1fc4 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableDef.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableDef.java
@@ -24,24 +24,16 @@ import java.io.Serializable;
  */
 public class TableDef implements Serializable {
 
-    private final String schema;
-
+    private String schema;
     private final String tableName;
 
-    private final String alias;
-
     public TableDef(String schema, String tableName) {
-        this(schema, tableName, null);
-    }
-
-    public TableDef(String schema, String tableName, String alias) {
         this.schema = schema;
         this.tableName = tableName;
-        this.alias = alias;
     }
 
     public TableDef(String tableName) {
-        this(null,tableName, null);
+        this.tableName = tableName;
     }
 
     public String getTableName() {
@@ -52,15 +44,9 @@ public class TableDef implements Serializable {
         return schema;
     }
 
-    public String getAlias() {
-        return alias;
-    }
-
-
     public QueryTable as(String alias) {
         return new QueryTable(schema, tableName, alias);
     }
 
 
-
 }
diff --git a/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/TableDefTest.java b/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/TableDefTest.java
deleted file mode 100644
index 94c4d100..00000000
--- a/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/TableDefTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.mybatisflex.coretest;
-
-import com.mybatisflex.core.query.QueryWrapper;
-import com.mybatisflex.coretest.table.AccountTableDef;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class TableDefTest {
-
-    @Test
-    public void testTableDefAlias() {
-        AccountTableDef account1 = AccountTableDef.ACCOUNT;
-        AccountTableDef account2 = AccountTableDef.ACCOUNT.withAlias("a2");
-        String sql = new QueryWrapper().select(account1.AGE, account2.ID)
-            .from(account1)
-            .join(account2).on(account1.ID.eq(account2.ID))
-            .toSQL();
-        System.out.println(sql);
-        String expected = "SELECT `tb_account`.`age`, `a2`.`id` FROM `tb_account` " +
-            "JOIN `tb_account` AS `a2` ON `tb_account`.`id` = `a2`.`id`";
-        Assert.assertEquals(expected, sql);
-    }
-}
diff --git a/mybatis-flex-processor/src/main/java/com/mybatisflex/processor/builder/ContentBuilder.java b/mybatis-flex-processor/src/main/java/com/mybatisflex/processor/builder/ContentBuilder.java
index 3a19fcf4..ee056724 100644
--- a/mybatis-flex-processor/src/main/java/com/mybatisflex/processor/builder/ContentBuilder.java
+++ b/mybatis-flex-processor/src/main/java/com/mybatisflex/processor/builder/ContentBuilder.java
@@ -136,19 +136,6 @@ public class ContentBuilder {
             : StrUtil.firstCharToLowerCase(tableInfo.getEntitySimpleName());
         content.append("    public ").append(tableDefClassName).append("() {\n")
             .append("        super").append("(\"").append(schema).append("\", \"").append(tableName).append("\");\n")
-            .append("    }\n\n");
-
-        content.append("    public ").append(tableDefClassName).append("(String alias) {\n")
-            .append("        super").append("(\"").append(schema).append("\", \"").append(tableName).append("\",alias);\n")
-            .append("    }\n");
-
-        //alias方法
-        content.append("\n    /**\n")
-            .append("     * 创建带别名的tableDef\n")
-            .append("     */\n");
-        content.append("    public ").append(tableDefClassName).append(" withAlias").append("(String alias) {\n")
-            .append("        ").append(tableDefClassName).append(" cloned = new ").append(tableDefClassName).append("(").append("alias").append(");\n")
-            .append("        return cloned;\n")
             .append("    }\n\n}\n");
         return content.toString();
     }