@Entity.Table 注解增加 catalog 和 schema 属性。

abel533 · abel533 · commit 199ba727363a · 2022-12-26T00:25:51.000+08:00
diff --git a/src/main/java/io/mybatis/provider/Entity.java b/src/main/java/io/mybatis/provider/Entity.java
@@ -55,6 +55,16 @@
      */
     String remark() default "";
 
+    /**
+     * catalog 名称，配置后，会在表名前面加上 catalog 名称，规则为：catalog.schema.tableName，支持全局 mybatis.provider.catalog 配置
+     */
+    String catalog() default "";
+
+    /**
+     * schema 名称，配置后，会在表名前面加上 schema 名称，规则为：catalog.schema.tableName，支持全局 mybatis.provider.schema 配置
+     */
+    String schema() default "";
+
     /**
      * 名称规则、样式，同时应用于表名和列名，不想用于表名时，直接指定表名 {@link #value()}即可。
      * <p>
diff --git a/src/main/java/io/mybatis/provider/EntityTable.java b/src/main/java/io/mybatis/provider/EntityTable.java
@@ -39,6 +39,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 实体表接口，记录实体和表的关系
@@ -55,6 +56,18 @@ public class EntityTable extends EntityProps<EntityTable> {
   @Getter
   @Setter
   protected           String             table;
+  /**
+   * catalog 名称，配置后，会在表名前面加上 catalog 名称，规则为：catalog.schema.tableName，支持全局 mybatis.provider.catalog 配置
+   */
+  @Getter
+  @Setter
+  protected           String             catalog;
+  /**
+   * schema 名称，配置后，会在表名前面加上 schema 名称，规则为：catalog.schema.tableName，支持全局 mybatis.provider.schema 配置
+   */
+  @Getter
+  @Setter
+  protected           String             schema;
   /**
    * 实体类和字段转表名和字段名方式
    */
@@ -77,45 +90,45 @@ public class EntityTable extends EntityProps<EntityTable> {
    */
   @Getter
   @Setter
-  protected boolean            ready;
+  protected           boolean            ready;
   /**
    * 使用指定的 &lt;resultMap&gt;
    */
   @Getter
   @Setter
-  protected String             resultMap;
+  protected           String             resultMap;
   /**
    * 自动根据字段生成 &lt;resultMap&gt;
    */
   @Getter
   @Setter
-  protected boolean            autoResultMap;
+  protected           boolean            autoResultMap;
   /**
    * 已初始化自动ResultMap
    */
-  protected List<ResultMap>    resultMaps;
+  protected           List<ResultMap>    resultMaps;
   /**
    * 排除指定父类的所有字段
    */
   @Getter
   @Setter
-  protected Class<?>[]         excludeSuperClasses;
+  protected           Class<?>[]         excludeSuperClasses;
   /**
    * 排除指定类型的字段
    */
   @Getter
   @Setter
-  protected Class<?>[]         excludeFieldTypes;
+  protected           Class<?>[]         excludeFieldTypes;
   /**
    * 排除指定字段名的字段
    */
   @Getter
   @Setter
-  protected String[]           excludeFields;
+  protected           String[]           excludeFields;
   /**
    * 已经初始化的配置
    */
-  protected Set<Configuration> initConfiguration = new HashSet<>();
+  protected           Set<Configuration> initConfiguration = new HashSet<>();
   //<editor-fold desc="基础方法，必须实现的方法">
 
   protected EntityTable(Class<?> entityClass) {
@@ -130,7 +143,9 @@ public static EntityTable of(Class<?> entityClass) {
    * 获取 SQL 语句中使用的表名
    */
   public String tableName() {
-    return table();
+    return Stream.of(catalog(), schema(), table())
+        .filter(s -> s != null && !s.isEmpty())
+        .collect(Collectors.joining("."));
   }
 
   /**
@@ -564,16 +579,16 @@ public boolean equals(Object o) {
     if (this == o) return true;
     if (!(o instanceof EntityTable)) return false;
     EntityTable entity = (EntityTable) o;
-    return table().equals(entity.table());
+    return tableName().equals(entity.tableName());
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(table());
+    return Objects.hash(tableName());
   }
 
   @Override
   public String toString() {
-    return table();
+    return tableName();
   }
 }
diff --git a/src/main/java/io/mybatis/provider/defaults/DefaultEntityTableFactory.java b/src/main/java/io/mybatis/provider/defaults/DefaultEntityTableFactory.java
@@ -16,6 +16,7 @@
 
 package io.mybatis.provider.defaults;
 
+import io.mybatis.config.ConfigHelper;
 import io.mybatis.provider.Entity;
 import io.mybatis.provider.EntityTable;
 import io.mybatis.provider.EntityTableFactory;
@@ -34,6 +35,8 @@ public EntityTable createEntityTable(Class<?> entityClass, Chain chain) {
       Entity.Table table = entityClass.getAnnotation(Entity.Table.class);
       EntityTable entityTable = EntityTable.of(entityClass)
           .table(table.value().isEmpty() ? Style.getStyle(table.style()).tableName(entityClass) : table.value())
+          .catalog(table.catalog().isEmpty() ? ConfigHelper.getStr("mybatis.provider.catalog") : table.catalog())
+          .schema(table.schema().isEmpty() ? ConfigHelper.getStr("mybatis.provider.schema") : table.schema())
           .style(table.style())
           .resultMap(table.resultMap())
           .autoResultMap(table.autoResultMap())
diff --git a/src/test/java/io/mybatis/provider/EntityInfoMapperTest.java b/src/test/java/io/mybatis/provider/EntityInfoMapperTest.java
@@ -28,7 +28,7 @@ public void test() {
     Assert.assertEquals(User.class, userMapper.entityClass());
 
     EntityTable entityTable = userMapper.entityTable();
-    Assert.assertEquals("sys_user", entityTable.table());
+    Assert.assertEquals("public.sys_user", entityTable.tableName());
   }
 
   interface UserMapper extends EntityInfoMapper<User> {
diff --git a/src/test/java/io/mybatis/provider/mapper/BaseProvider.java b/src/test/java/io/mybatis/provider/mapper/BaseProvider.java
@@ -28,19 +28,19 @@ public class BaseProvider {
 
   public static String getById(ProviderContext providerContext) {
     return SqlScript.caching(providerContext, entity ->
-        "SELECT " + entity.baseColumnAsPropertyList() + " FROM " + entity.table() +
+        "SELECT " + entity.baseColumnAsPropertyList() + " FROM " + entity.tableName() +
             " WHERE " + entity.idColumns().stream().map(EntityColumn::columnEqualsProperty).collect(Collectors.joining(" AND ")));
   }
 
   public static String deleteById(ProviderContext providerContext) {
     return SqlScript.caching(providerContext, entity ->
-        "DELETE FROM " + entity.table() +
+        "DELETE FROM " + entity.tableName() +
             " WHERE " + entity.idColumns().stream().map(EntityColumn::columnEqualsProperty).collect(Collectors.joining(" AND ")));
   }
 
   public static String insertSelective(ProviderContext providerContext) {
     return SqlScript.caching(providerContext, (entity, util) ->
-        "INSERT INTO " + entity.table()
+        "INSERT INTO " + entity.tableName()
             + util.trimSuffixOverrides("(", ")", ",", () ->
             entity.insertColumns().stream().map(column ->
                 util.ifTest(column.notNullTest(), () -> column.column() + ",")
diff --git a/src/test/java/io/mybatis/provider/model/UserExclude.java b/src/test/java/io/mybatis/provider/model/UserExclude.java
@@ -19,6 +19,8 @@
 import io.mybatis.provider.Entity;
 
 @Entity.Table(value = "user",
+    catalog = "catalog",
+    schema = "schema",
     excludeSuperClasses = Role.class,
     excludeFieldTypes = User1.class,
     excludeFields = "age")
diff --git a/src/test/java/io/mybatis/provider/test/UserExcludeTest.java b/src/test/java/io/mybatis/provider/test/UserExcludeTest.java
@@ -41,6 +41,9 @@ public void testEntityTable() {
     Assert.assertEquals(2, entityTable.whereColumns().size());
 
     Assert.assertEquals("user", entityTable.table());
+    Assert.assertEquals("catalog", entityTable.catalog());
+    Assert.assertEquals("schema", entityTable.schema());
+    Assert.assertEquals("catalog.schema.user", entityTable.tableName());
     Assert.assertEquals("ID,name", entityTable.baseColumnList());
     Assert.assertEquals("ID AS id,name AS username", entityTable.baseColumnAsPropertyList());
 
diff --git a/src/test/java/io/mybatis/provider/test/UserMapperTest.java b/src/test/java/io/mybatis/provider/test/UserMapperTest.java
@@ -44,7 +44,7 @@ public void testEntityTable() {
     Assert.assertEquals(4, entityTable.updateColumns().size());
     Assert.assertEquals(4, entityTable.whereColumns().size());
 
-    Assert.assertEquals("user", entityTable.table());
+    Assert.assertEquals("public.user", entityTable.tableName());
     Assert.assertEquals("ID,name,SEX,ADDRESS", entityTable.baseColumnList());
     Assert.assertEquals("ID,name,SEX,ADDRESS", entityTable.baseColumnAsPropertyList());
     //Entity.Table(value = "user", autoResultMap = true)
diff --git a/src/test/java/io/mybatis/provider/test/UserMoreTest.java b/src/test/java/io/mybatis/provider/test/UserMoreTest.java
@@ -45,7 +45,7 @@ public void testEntityTable() {
     Assert.assertEquals(6, entityTable.updateColumns().size());
     Assert.assertEquals(8, entityTable.whereColumns().size());
 
-    Assert.assertEquals("sys_user", entityTable.table());
+    Assert.assertEquals("public.sys_user", entityTable.tableName());
     Assert.assertEquals("id,name,is_admin,seq,points,when_created,info", entityTable.baseColumnList());
     Assert.assertEquals("id,name,is_admin,seq,points,when_created,info", entityTable.baseColumnAsPropertyList());
     Assert.assertEquals("seq DESC,name ASC", entityTable.orderByColumnList().get());
diff --git a/src/test/resources/mybatis-provider.properties b/src/test/resources/mybatis-provider.properties
@@ -18,3 +18,4 @@ email=abel533@gmail.com
 mybatis.provider.style=upper_underscore
 mybatis.provider.cacheSql.initSize=16
 mybatis.provider.cacheSql.useOnce=true
+mybatis.provider.schema=public

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public void test() {`
`28`	`28`	`Assert.assertEquals(User.class, userMapper.entityClass());`
`29`	`29`
`30`	`30`	`EntityTable entityTable = userMapper.entityTable();`
`31`		`- Assert.assertEquals("sys_user", entityTable.table());`
	`31`	`+ Assert.assertEquals("public.sys_user", entityTable.tableName());`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`interface UserMapper extends EntityInfoMapper<User> {`