MBG插件增加schema配置（catalog也可以用这个），会自动在表的注解名字前面加上 schema.tablename

abel533 · abel533 · commit f118686c45f9 · 2016-09-04T12:12:25.000+08:00
diff --git a/src/main/java/tk/mybatis/mapper/generator/MapperCommentGenerator.java b/src/main/java/tk/mybatis/mapper/generator/MapperCommentGenerator.java
@@ -146,6 +146,8 @@ public void addFieldComment(Field field, IntrospectedTable introspectedTable, In
         if (!column.equals(introspectedColumn.getJavaProperty())) {
             //@Column
             field.addAnnotation("@Column(name = \"" + getDelimiterName(column) + "\")");
+        } else if (StringUtility.stringHasValue(beginningDelimiter) || StringUtility.stringHasValue(endingDelimiter)) {
+            field.addAnnotation("@Column(name = \"" + getDelimiterName(column) + "\")");
         }
         if (introspectedColumn.isIdentity()) {
             if (introspectedTable.getTableConfiguration().getGeneratedKey().getRuntimeSqlStatement().equals("JDBC")) {
diff --git a/src/main/java/tk/mybatis/mapper/generator/MapperPlugin.java b/src/main/java/tk/mybatis/mapper/generator/MapperPlugin.java
@@ -52,6 +52,8 @@ public class MapperPlugin extends PluginAdapter {
     private String beginningDelimiter = "";
     //结束的分隔符，例如mysql为`，sqlserver为]
     private String endingDelimiter = "";
+    //数据库模式
+    private String schema;
     //注释生成器
     private CommentGeneratorConfiguration commentCfg;
 
@@ -89,10 +91,14 @@ public void setProperties(Properties properties) {
             this.endingDelimiter = endingDelimiter;
         }
         commentCfg.addProperty("endingDelimiter", this.endingDelimiter);
+        String schema = this.properties.getProperty("schema");
+        if (StringUtility.stringHasValue(schema)) {
+            this.schema = schema;
+        }
     }
 
     public String getDelimiterName(String name) {
-        return beginningDelimiter + name + endingDelimiter;
+        return schema + "." + beginningDelimiter + name + endingDelimiter;
     }
 
     @Override
@@ -143,6 +149,10 @@ private void processEntityClass(TopLevelClass topLevelClass, IntrospectedTable i
             topLevelClass.addAnnotation("@Table(name = \"" + getDelimiterName(tableName) + "\")");
         } else if (!topLevelClass.getType().getShortName().equalsIgnoreCase(tableName)) {
             topLevelClass.addAnnotation("@Table(name = \"" + getDelimiterName(tableName) + "\")");
+        } else if (StringUtility.stringHasValue(schema)
+                || StringUtility.stringHasValue(beginningDelimiter)
+                || StringUtility.stringHasValue(endingDelimiter)) {
+            topLevelClass.addAnnotation("@Table(name = \"" + getDelimiterName(tableName) + "\")");
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,8 @@ public void addFieldComment(Field field, IntrospectedTable introspectedTable, In`
`146`	`146`	`if (!column.equals(introspectedColumn.getJavaProperty())) {`
`147`	`147`	`//@Column`
`148`	`148`	`field.addAnnotation("@Column(name = \"" + getDelimiterName(column) + "\")");`
	`149`	`+ } else if (StringUtility.stringHasValue(beginningDelimiter) \|\| StringUtility.stringHasValue(endingDelimiter)) {`
	`150`	`+ field.addAnnotation("@Column(name = \"" + getDelimiterName(column) + "\")");`
`149`	`151`	`}`
`150`	`152`	`if (introspectedColumn.isIdentity()) {`
`151`	`153`	`if (introspectedTable.getTableConfiguration().getGeneratedKey().getRuntimeSqlStatement().equals("JDBC")) {`