Add the catalogName property (#72)

Author: nakamura-to

README.md

@@ -150,6 +150,7 @@ domaCodeGen {
 | password | JDBC password | | |
 | dataSource | database data source | | inferred by the url |
 | codeGenDialect | database dialect | | inferred by the url |
+| catalogName | database catalog name | | |
 | schemaName | database schema name | | |
 | tableNamePattern | database table pattern (Regex) | | ".*" |
 | ignoredTableNamePattern | database ignored table pattern (Regex) | | ".*\$.*" |

codegen-test/build.gradle

@@ -13,6 +13,7 @@ buildscript {
     dependencies {
         classpath "org.seasar.doma:codegen"
         classpath "com.h2database:h2:$h2Version"
+        classpath 'mysql:mysql-connector-java:8.0.17'
     }
 }
 

codegen-test/docker-compose.yml

@@ -0,0 +1,19 @@
+# Use root/example as user/password credentials
+version: '3.1'
+
+services:
+
+  db:
+    image: mysql
+    command: --default-authentication-plugin=mysql_native_password
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: example
+    ports:
+      - 3306:3306
+
+  adminer:
+    image: adminer
+    restart: always
+    ports:
+      - 8080:8080

codegen/src/main/java/org/seasar/doma/gradle/codegen/CodeGenPlugin.java

@@ -140,6 +140,7 @@ private void connectProperties(CodeGenDbMetaTask task, CodeGenConfig extension)
     task.getGlobalFactory().set(extension.getGlobalFactory());
     task.getDataSource().set(extension.getDataSource());
     task.getDialect().set(extension.getCodeGenDialect());
+    task.getCatalogName().set(extension.getCatalogName());
     task.getSchemaName().set(extension.getSchemaName());
     task.getTableTypes().set(extension.getTableTypes());
     task.getTableNamePattern().set(extension.getTableNamePattern());

codegen/src/main/java/org/seasar/doma/gradle/codegen/GlobalFactory.java

@@ -37,12 +37,19 @@ public DataSource createDataSource(Driver driver, String user, String password,
   public TableMetaReader createTableMetaReader(
       CodeGenDialect dialect,
       DataSource dataSource,
+      String catalogName,
       String schemaName,
       String tableNamePattern,
       String ignoredTableNamePattern,
       List<String> tableTypes) {
     return new TableMetaReader(
-        dialect, dataSource, schemaName, tableNamePattern, ignoredTableNamePattern, tableTypes);
+        dialect,
+        dataSource,
+        catalogName,
+        schemaName,
+        tableNamePattern,
+        ignoredTableNamePattern,
+        tableTypes);
   }
 
   public ResultSetMetaReader createResultSetMetaReader(

codegen/src/main/java/org/seasar/doma/gradle/codegen/extension/CodeGenConfig.java

@@ -43,6 +43,8 @@ public class CodeGenConfig {
 
   private final Property<String> url;
 
+  private final Property<String> catalogName;
+
   private final Property<String> schemaName;
 
   private final Property<String> tableNamePattern;
@@ -91,6 +93,7 @@ public CodeGenConfig(String name, Project project) {
     url = objects.property(String.class);
     user = objects.property(String.class);
     password = objects.property(String.class);
+    catalogName = objects.property(String.class);
     schemaName = objects.property(String.class);
     tableNamePattern = objects.property(String.class);
     ignoredTableNamePattern = objects.property(String.class);
@@ -288,6 +291,14 @@ public void setUrl(String url) {
     this.url.set(url);
   }
 
+  public Property<String> getCatalogName() {
+    return catalogName;
+  }
+
+  public void setCatalogName(String catalogName) {
+    this.catalogName.set(catalogName);
+  }
+
   public Property<String> getSchemaName() {
     return schemaName;
   }

codegen/src/main/java/org/seasar/doma/gradle/codegen/meta/TableMetaReader.java

@@ -23,6 +23,8 @@ public class TableMetaReader {
 
   protected final DataSource dataSource;
 
+  protected final String catalogName;
+
   protected final String schemaName;
 
   protected final Pattern tableNamePattern;
@@ -34,6 +36,7 @@ public class TableMetaReader {
   public TableMetaReader(
       CodeGenDialect dialect,
       DataSource dataSource,
+      String catalogName,
       String schemaName,
       String tableNamePattern,
       String ignoredTableNamePattern,
@@ -55,6 +58,7 @@ public TableMetaReader(
     }
     this.dialect = dialect;
     this.dataSource = dataSource;
+    this.catalogName = catalogName;
     this.schemaName = schemaName;
     this.tableNamePattern = Pattern.compile(tableNamePattern, Pattern.CASE_INSENSITIVE);
     this.ignoredTableNamePattern =
@@ -67,7 +71,10 @@ public List<TableMeta> read() {
     try {
       DatabaseMetaData metaData = con.getMetaData();
       List<TableMeta> tableMetas =
-          getTableMetas(metaData, schemaName != null ? schemaName : getDefaultSchemaName(metaData));
+          getTableMetas(
+              metaData,
+              catalogName,
+              schemaName != null ? schemaName : getDefaultSchemaName(metaData));
       for (TableMeta tableMeta : tableMetas) {
         Set<String> primaryKeySet = getPrimaryKeys(metaData, tableMeta);
         handleColumnMeta(metaData, tableMeta, primaryKeySet);
@@ -102,12 +109,15 @@ protected String getDefaultSchemaName(DatabaseMetaData metaData) throws SQLExcep
     return dialect.getDefaultSchemaName(userName);
   }
 
-  protected List<TableMeta> getTableMetas(DatabaseMetaData metaData, String schemaName)
-      throws SQLException {
+  protected List<TableMeta> getTableMetas(
+      DatabaseMetaData metaData, String catalogName, String schemaName) throws SQLException {
     List<TableMeta> results = new ArrayList<TableMeta>();
     ResultSet rs =
         metaData.getTables(
-            null, schemaName, null, this.tableTypes.toArray(new String[this.tableTypes.size()]));
+            catalogName,
+            schemaName,
+            null,
+            this.tableTypes.toArray(new String[this.tableTypes.size()]));
     try {
       while (rs.next()) {
         TableMeta tableMeta = new TableMeta();

codegen/src/main/java/org/seasar/doma/gradle/codegen/task/CodeGenDbMetaTask.java

@@ -29,6 +29,8 @@ public class CodeGenDbMetaTask extends DefaultTask {
   private final Property<CodeGenDialect> dialect =
       getProject().getObjects().property(CodeGenDialect.class);
 
+  private final Property<String> catalogName = getProject().getObjects().property(String.class);
+
   private final Property<String> schemaName = getProject().getObjects().property(String.class);
 
   private final Property<String> tableNamePattern =
@@ -60,6 +62,11 @@ public Property<CodeGenDialect> getDialect() {
     return dialect;
   }
 
+  @Internal
+  public Property<String> getCatalogName() {
+    return catalogName;
+  }
+
   @Internal
   public Property<String> getSchemaName() {
     return schemaName;
@@ -95,6 +102,7 @@ private TableMetaReader createTableMetaReader() {
         .createTableMetaReader(
             dialect.get(),
             dataSource.get(),
+            catalogName.getOrNull(),
             schemaName.getOrNull(),
             tableNamePattern.get(),
             ignoredTableNamePattern.get(),