Skip to content

Commit 2461bbd

Browse files
ZhangShenaoZhangShenao
committed
Merge branch 'master' of github.com:mybatis/mybatis-3 into dev
2 parents c0e65e1 + 7a318a9 commit 2461bbd

File tree

118 files changed

+3491
-1721
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+3491
-1721
lines changed

‎.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
language: java
22

33
jdk:
4-
- openjdk15
4+
# JDK15 is blocked due to maven-bundle-plugin and underlying bnd (see https://issues.apache.org/jira/browse/FELIX-6259)
5+
#- openjdk15
56
- openjdk14
67
- openjdk13
78
- openjdk11

‎pom.xml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
<dependency>
181181
<groupId>org.apache.logging.log4j</groupId>
182182
<artifactId>log4j-core</artifactId>
183-
<version>2.13.1</version>
183+
<version>2.13.3</version>
184184
<optional>true</optional>
185185
</dependency>
186186
<dependency>
@@ -215,6 +215,12 @@
215215
<version>10.14.2.0</version>
216216
<scope>test</scope>
217217
</dependency>
218+
<dependency>
219+
<groupId>com.h2database</groupId>
220+
<artifactId>h2</artifactId>
221+
<version>1.4.200</version>
222+
<scope>test</scope>
223+
</dependency>
218224
<dependency>
219225
<groupId>org.mockito</groupId>
220226
<artifactId>mockito-core</artifactId>
@@ -243,7 +249,7 @@
243249
<dependency>
244250
<groupId>mysql</groupId>
245251
<artifactId>mysql-connector-java</artifactId>
246-
<version>8.0.19</version>
252+
<version>8.0.20</version>
247253
<scope>test</scope>
248254
</dependency>
249255
<dependency>
@@ -261,19 +267,19 @@
261267
<dependency>
262268
<groupId>org.testcontainers</groupId>
263269
<artifactId>junit-jupiter</artifactId>
264-
<version>1.13.0</version>
270+
<version>1.14.2</version>
265271
<scope>test</scope>
266272
</dependency>
267273
<dependency>
268274
<groupId>org.testcontainers</groupId>
269275
<artifactId>postgresql</artifactId>
270-
<version>1.13.0</version>
276+
<version>1.14.2</version>
271277
<scope>test</scope>
272278
</dependency>
273279
<dependency>
274280
<groupId>org.testcontainers</groupId>
275281
<artifactId>mysql</artifactId>
276-
<version>1.13.0</version>
282+
<version>1.14.2</version>
277283
<scope>test</scope>
278284
</dependency>
279285
</dependencies>

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import java.lang.annotation.Documented;
1919
import java.lang.annotation.ElementType;
20+
import java.lang.annotation.Repeatable;
2021
import java.lang.annotation.Retention;
2122
import java.lang.annotation.RetentionPolicy;
2223
import java.lang.annotation.Target;
@@ -39,11 +40,31 @@
3940
@Documented
4041
@Retention(RetentionPolicy.RUNTIME)
4142
@Target(ElementType.METHOD)
43+
@Repeatable(Delete.List.class)
4244
public @interface Delete {
4345
/**
4446
* Returns an SQL for deleting record(s).
4547
*
4648
* @return an SQL for deleting record(s)
4749
*/
4850
String[] value();
51+
52+
/**
53+
* @return A database id that correspond this statement
54+
* @since 3.5.5
55+
*/
56+
String databaseId() default "";
57+
58+
/**
59+
* The container annotation for {@link Delete}.
60+
* @author Kazuki Shimizu
61+
* @since 3.5.5
62+
*/
63+
@Documented
64+
@Retention(RetentionPolicy.RUNTIME)
65+
@Target(ElementType.METHOD)
66+
@interface List {
67+
Delete[] value();
68+
}
69+
4970
}

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import java.lang.annotation.Documented;
1919
import java.lang.annotation.ElementType;
20+
import java.lang.annotation.Repeatable;
2021
import java.lang.annotation.Retention;
2122
import java.lang.annotation.RetentionPolicy;
2223
import java.lang.annotation.Target;
@@ -47,6 +48,7 @@
4748
@Documented
4849
@Retention(RetentionPolicy.RUNTIME)
4950
@Target(ElementType.METHOD)
51+
@Repeatable(DeleteProvider.List.class)
5052
public @interface DeleteProvider {
5153

5254
/**
@@ -91,4 +93,22 @@
9193
*/
9294
String method() default "";
9395

96+
/**
97+
* @return A database id that correspond this provider
98+
* @since 3.5.5
99+
*/
100+
String databaseId() default "";
101+
102+
/**
103+
* The container annotation for {@link DeleteProvider}.
104+
* @author Kazuki Shimizu
105+
* @since 3.5.5
106+
*/
107+
@Documented
108+
@Retention(RetentionPolicy.RUNTIME)
109+
@Target(ElementType.METHOD)
110+
@interface List {
111+
DeleteProvider[] value();
112+
}
113+
94114
}

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import java.lang.annotation.Documented;
1919
import java.lang.annotation.ElementType;
20+
import java.lang.annotation.Repeatable;
2021
import java.lang.annotation.Retention;
2122
import java.lang.annotation.RetentionPolicy;
2223
import java.lang.annotation.Target;
@@ -39,11 +40,31 @@
3940
@Documented
4041
@Retention(RetentionPolicy.RUNTIME)
4142
@Target(ElementType.METHOD)
43+
@Repeatable(Insert.List.class)
4244
public @interface Insert {
4345
/**
4446
* Returns an SQL for inserting record(s).
4547
*
4648
* @return an SQL for inserting record(s)
4749
*/
4850
String[] value();
51+
52+
/**
53+
* @return A database id that correspond this statement
54+
* @since 3.5.5
55+
*/
56+
String databaseId() default "";
57+
58+
/**
59+
* The container annotation for {@link Insert}.
60+
* @author Kazuki Shimizu
61+
* @since 3.5.5
62+
*/
63+
@Documented
64+
@Retention(RetentionPolicy.RUNTIME)
65+
@Target(ElementType.METHOD)
66+
@interface List {
67+
Insert[] value();
68+
}
69+
4970
}

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import java.lang.annotation.Documented;
1919
import java.lang.annotation.ElementType;
20+
import java.lang.annotation.Repeatable;
2021
import java.lang.annotation.Retention;
2122
import java.lang.annotation.RetentionPolicy;
2223
import java.lang.annotation.Target;
@@ -47,6 +48,7 @@
4748
@Documented
4849
@Retention(RetentionPolicy.RUNTIME)
4950
@Target(ElementType.METHOD)
51+
@Repeatable(InsertProvider.List.class)
5052
public @interface InsertProvider {
5153

5254
/**
@@ -91,4 +93,22 @@
9193
*/
9294
String method() default "";
9395

96+
/**
97+
* @return A database id that correspond this provider
98+
* @since 3.5.5
99+
*/
100+
String databaseId() default "";
101+
102+
/**
103+
* The container annotation for {@link InsertProvider}.
104+
* @author Kazuki Shimizu
105+
* @since 3.5.5
106+
*/
107+
@Documented
108+
@Retention(RetentionPolicy.RUNTIME)
109+
@Target(ElementType.METHOD)
110+
@interface List {
111+
InsertProvider[] value();
112+
}
113+
94114
}

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import java.lang.annotation.Documented;
1919
import java.lang.annotation.ElementType;
20+
import java.lang.annotation.Repeatable;
2021
import java.lang.annotation.Retention;
2122
import java.lang.annotation.RetentionPolicy;
2223
import java.lang.annotation.Target;
@@ -43,6 +44,7 @@
4344
@Documented
4445
@Retention(RetentionPolicy.RUNTIME)
4546
@Target(ElementType.METHOD)
47+
@Repeatable(Options.List.class)
4648
public @interface Options {
4749
/**
4850
* The options for the {@link Options#flushCache()}.
@@ -135,4 +137,23 @@ enum FlushCachePolicy {
135137
* @return result set names that separate with comma(',')
136138
*/
137139
String resultSets() default "";
140+
141+
/**
142+
* @return A database id that correspond this options
143+
* @since 3.5.5
144+
*/
145+
String databaseId() default "";
146+
147+
/**
148+
* The container annotation for {@link Options}.
149+
* @author Kazuki Shimizu
150+
* @since 3.5.5
151+
*/
152+
@Documented
153+
@Retention(RetentionPolicy.RUNTIME)
154+
@Target(ElementType.METHOD)
155+
@interface List {
156+
Options[] value();
157+
}
158+
138159
}

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import java.lang.annotation.Documented;
1919
import java.lang.annotation.ElementType;
20+
import java.lang.annotation.Repeatable;
2021
import java.lang.annotation.Retention;
2122
import java.lang.annotation.RetentionPolicy;
2223
import java.lang.annotation.Target;
@@ -39,11 +40,31 @@
3940
@Documented
4041
@Retention(RetentionPolicy.RUNTIME)
4142
@Target(ElementType.METHOD)
43+
@Repeatable(Select.List.class)
4244
public @interface Select {
4345
/**
4446
* Returns an SQL for retrieving record(s).
4547
*
4648
* @return an SQL for retrieving record(s)
4749
*/
4850
String[] value();
51+
52+
/**
53+
* @return A database id that correspond this statement
54+
* @since 3.5.5
55+
*/
56+
String databaseId() default "";
57+
58+
/**
59+
* The container annotation for {@link Select}.
60+
* @author Kazuki Shimizu
61+
* @since 3.5.5
62+
*/
63+
@Documented
64+
@Retention(RetentionPolicy.RUNTIME)
65+
@Target(ElementType.METHOD)
66+
@interface List {
67+
Select[] value();
68+
}
69+
4970
}

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import java.lang.annotation.Documented;
1919
import java.lang.annotation.ElementType;
20+
import java.lang.annotation.Repeatable;
2021
import java.lang.annotation.Retention;
2122
import java.lang.annotation.RetentionPolicy;
2223
import java.lang.annotation.Target;
@@ -42,6 +43,7 @@
4243
@Documented
4344
@Retention(RetentionPolicy.RUNTIME)
4445
@Target(ElementType.METHOD)
46+
@Repeatable(SelectKey.List.class)
4547
public @interface SelectKey {
4648
/**
4749
* Returns an SQL for retrieving a key value.
@@ -90,4 +92,23 @@
9092
* @return the statement type
9193
*/
9294
StatementType statementType() default StatementType.PREPARED;
95+
96+
/**
97+
* @return A database id that correspond this select key
98+
* @since 3.5.5
99+
*/
100+
String databaseId() default "";
101+
102+
/**
103+
* The container annotation for {@link SelectKey}.
104+
* @author Kazuki Shimizu
105+
* @since 3.5.5
106+
*/
107+
@Documented
108+
@Retention(RetentionPolicy.RUNTIME)
109+
@Target(ElementType.METHOD)
110+
@interface List {
111+
SelectKey[] value();
112+
}
113+
93114
}

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import java.lang.annotation.Documented;
1919
import java.lang.annotation.ElementType;
20+
import java.lang.annotation.Repeatable;
2021
import java.lang.annotation.Retention;
2122
import java.lang.annotation.RetentionPolicy;
2223
import java.lang.annotation.Target;
@@ -47,6 +48,7 @@
4748
@Documented
4849
@Retention(RetentionPolicy.RUNTIME)
4950
@Target(ElementType.METHOD)
51+
@Repeatable(SelectProvider.List.class)
5052
public @interface SelectProvider {
5153

5254
/**
@@ -91,4 +93,22 @@
9193
*/
9294
String method() default "";
9395

96+
/**
97+
* @return A database id that correspond this provider
98+
* @since 3.5.5
99+
*/
100+
String databaseId() default "";
101+
102+
/**
103+
* The container annotation for {@link SelectProvider}.
104+
* @author Kazuki Shimizu
105+
* @since 3.5.5
106+
*/
107+
@Documented
108+
@Retention(RetentionPolicy.RUNTIME)
109+
@Target(ElementType.METHOD)
110+
@interface List {
111+
SelectProvider[] value();
112+
}
113+
94114
}

0 commit comments

Comments
 (0)