Merge pull request mybatis#1466 from kazuki43zoo/supports-databaseid-…

…on-annotation-mapper

Supports the statement switching feature that correspond database on the annotation driven mapper

pom.xml

@@ -215,6 +215,12 @@
       <version>10.14.2.0</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <version>1.4.197</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

src/main/java/org/apache/ibatis/annotations/Delete.java

@@ -17,6 +17,7 @@
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -39,11 +40,31 @@
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
+@Repeatable(Delete.List.class)
 public @interface Delete {
   /**
    * Returns an SQL for deleting record(s).
    *
    * @return an SQL for deleting record(s)
    */
   String[] value();
+
+  /**
+   * @return A database id that correspond this statement
+   * @since 3.5.5
+   */
+  String databaseId() default "";
+
+  /**
+   * The container annotation for {@link Delete}.
+   * @author Kazuki Shimizu
+   * @since 3.5.5
+   */
+  @Documented
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target(ElementType.METHOD)
+  @interface List {
+    Delete[] value();
+  }
+
 }

src/main/java/org/apache/ibatis/annotations/DeleteProvider.java

@@ -17,6 +17,7 @@
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -47,6 +48,7 @@
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
+@Repeatable(DeleteProvider.List.class)
 public @interface DeleteProvider {
 
   /**
@@ -91,4 +93,22 @@
    */
   String method() default "";
 
+  /**
+   * @return A database id that correspond this provider
+   * @since 3.5.5
+   */
+  String databaseId() default "";
+
+  /**
+   * The container annotation for {@link DeleteProvider}.
+   * @author Kazuki Shimizu
+   * @since 3.5.5
+   */
+  @Documented
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target(ElementType.METHOD)
+  @interface List {
+    DeleteProvider[] value();
+  }
+
 }

src/main/java/org/apache/ibatis/annotations/Insert.java

@@ -17,6 +17,7 @@
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -39,11 +40,31 @@
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
+@Repeatable(Insert.List.class)
 public @interface Insert {
   /**
    * Returns an SQL for inserting record(s).
    *
    * @return an SQL for inserting record(s)
    */
   String[] value();
+
+  /**
+   * @return A database id that correspond this statement
+   * @since 3.5.5
+   */
+  String databaseId() default "";
+
+  /**
+   * The container annotation for {@link Insert}.
+   * @author Kazuki Shimizu
+   * @since 3.5.5
+   */
+  @Documented
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target(ElementType.METHOD)
+  @interface List {
+    Insert[] value();
+  }
+
 }

src/main/java/org/apache/ibatis/annotations/InsertProvider.java

@@ -17,6 +17,7 @@
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -47,6 +48,7 @@
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
+@Repeatable(InsertProvider.List.class)
 public @interface InsertProvider {
 
   /**
@@ -91,4 +93,22 @@
    */
   String method() default "";
 
+  /**
+   * @return A database id that correspond this provider
+   * @since 3.5.5
+   */
+  String databaseId() default "";
+
+  /**
+   * The container annotation for {@link InsertProvider}.
+   * @author Kazuki Shimizu
+   * @since 3.5.5
+   */
+  @Documented
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target(ElementType.METHOD)
+  @interface List {
+    InsertProvider[] value();
+  }
+
 }

src/main/java/org/apache/ibatis/annotations/Options.java

@@ -17,6 +17,7 @@
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -43,6 +44,7 @@
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
+@Repeatable(Options.List.class)
 public @interface Options {
   /**
    * The options for the {@link Options#flushCache()}.
@@ -135,4 +137,23 @@ enum FlushCachePolicy {
    * @return result set names that separate with comma(',')
    */
   String resultSets() default "";
+
+  /**
+   * @return A database id that correspond this options
+   * @since 3.5.5
+   */
+  String databaseId() default "";
+
+  /**
+   * The container annotation for {@link Options}.
+   * @author Kazuki Shimizu
+   * @since 3.5.5
+   */
+  @Documented
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target(ElementType.METHOD)
+  @interface List {
+    Options[] value();
+  }
+
 }

src/main/java/org/apache/ibatis/annotations/Select.java

@@ -17,6 +17,7 @@
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -39,11 +40,31 @@
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
+@Repeatable(Select.List.class)
 public @interface Select {
   /**
    * Returns an SQL for retrieving record(s).
    *
    * @return an SQL for retrieving record(s)
    */
   String[] value();
+
+  /**
+   * @return A database id that correspond this statement
+   * @since 3.5.5
+   */
+  String databaseId() default "";
+
+  /**
+   * The container annotation for {@link Select}.
+   * @author Kazuki Shimizu
+   * @since 3.5.5
+   */
+  @Documented
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target(ElementType.METHOD)
+  @interface List {
+    Select[] value();
+  }
+
 }

src/main/java/org/apache/ibatis/annotations/SelectKey.java

@@ -17,6 +17,7 @@
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -42,6 +43,7 @@
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
+@Repeatable(SelectKey.List.class)
 public @interface SelectKey {
   /**
    * Returns an SQL for retrieving a key value.
@@ -90,4 +92,23 @@
    * @return the statement type
    */
   StatementType statementType() default StatementType.PREPARED;
+
+  /**
+   * @return A database id that correspond this select key
+   * @since 3.5.5
+   */
+  String databaseId() default "";
+
+  /**
+   * The container annotation for {@link SelectKey}.
+   * @author Kazuki Shimizu
+   * @since 3.5.5
+   */
+  @Documented
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target(ElementType.METHOD)
+  @interface List {
+    SelectKey[] value();
+  }
+
 }

src/main/java/org/apache/ibatis/annotations/SelectProvider.java

@@ -17,6 +17,7 @@
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -47,6 +48,7 @@
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
+@Repeatable(SelectProvider.List.class)
 public @interface SelectProvider {
 
   /**
@@ -91,4 +93,22 @@
    */
   String method() default "";
 
+  /**
+   * @return A database id that correspond this provider
+   * @since 3.5.5
+   */
+  String databaseId() default "";
+
+  /**
+   * The container annotation for {@link SelectProvider}.
+   * @author Kazuki Shimizu
+   * @since 3.5.5
+   */
+  @Documented
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target(ElementType.METHOD)
+  @interface List {
+    SelectProvider[] value();
+  }
+
 }

src/main/java/org/apache/ibatis/annotations/Update.java

@@ -17,6 +17,7 @@
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -39,11 +40,31 @@
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
+@Repeatable(Update.List.class)
 public @interface Update {
   /**
    * Returns an SQL for updating record(s).
    *
    * @return an SQL for updating record(s)
    */
   String[] value();
+
+  /**
+   * @return A database id that correspond this statement
+   * @since 3.5.5
+   */
+  String databaseId() default "";
+
+  /**
+   * The container annotation for {@link Update}.
+   * @author Kazuki Shimizu
+   * @since 3.5.5
+   */
+  @Documented
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target(ElementType.METHOD)
+  @interface List {
+    Update[] value();
+  }
+
 }