diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfo.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfo.java index 05a04b39..18d351be 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfo.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfo.java @@ -150,7 +150,17 @@ public class TableInfo { } public void setTableName(String tableName) { - this.tableName = tableName; + int indexOf = tableName.indexOf("."); + if (indexOf > 0) { + if (StringUtil.isBlank(schema)) { + this.schema = tableName.substring(0, indexOf); + this.tableName = tableName.substring(indexOf + 1); + } else { + this.tableName = tableName; + } + } else { + this.tableName = tableName; + } } public Class getEntityClass() { diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfoFactory.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfoFactory.java index de78dc77..f205ea42 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfoFactory.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfoFactory.java @@ -134,8 +134,8 @@ public class TableInfoFactory { //初始化表名 Table table = entityClass.getAnnotation(Table.class); if (table != null) { - tableInfo.setTableName(table.value()); tableInfo.setSchema(table.schema()); + tableInfo.setTableName(table.value()); tableInfo.setCamelToUnderline(table.camelToUnderline()); if (table.onInsert().length > 0) { diff --git a/mybatis-flex-processor/src/main/java/com/mybatisflex/processor/MybatisFlexProcessor.java b/mybatis-flex-processor/src/main/java/com/mybatisflex/processor/MybatisFlexProcessor.java index 9a6e39bc..a737c093 100644 --- a/mybatis-flex-processor/src/main/java/com/mybatisflex/processor/MybatisFlexProcessor.java +++ b/mybatis-flex-processor/src/main/java/com/mybatisflex/processor/MybatisFlexProcessor.java @@ -180,8 +180,8 @@ public class MybatisFlexProcessor extends AbstractProcessor { TableInfo tableInfo = new TableInfo(); tableInfo.setEntityName(entityClass); tableInfo.setEntitySimpleName(entityClassName); - tableInfo.setTableName(table.value()); tableInfo.setSchema(table.schema()); + tableInfo.setTableName(table.value()); tableInfo.setEntityComment(elementUtils.getDocComment(entityClassElement)); // 生成 TableDef 文件 diff --git a/mybatis-flex-processor/src/main/java/com/mybatisflex/processor/entity/TableInfo.java b/mybatis-flex-processor/src/main/java/com/mybatisflex/processor/entity/TableInfo.java index b3796e9f..389835b5 100644 --- a/mybatis-flex-processor/src/main/java/com/mybatisflex/processor/entity/TableInfo.java +++ b/mybatis-flex-processor/src/main/java/com/mybatisflex/processor/entity/TableInfo.java @@ -78,7 +78,17 @@ public class TableInfo { } public void setTableName(String tableName) { - this.tableName = tableName; + int indexOf = tableName.indexOf("."); + if (indexOf > 0) { + if (schema == null || schema.trim().length() == 0) { + this.schema = tableName.substring(0, indexOf); + this.tableName = tableName.substring(indexOf + 1); + } else { + this.tableName = tableName; + } + } else { + this.tableName = tableName; + } } public String getSchema() {