Skip to content

Commit d1238a6

Browse files
epochcoderepochcoder
committed
Merge branch 'master' into 3108-follow-up-type-handler
2 parents 640b930 + 2de2506 commit d1238a6

File tree

6 files changed

+28
-28
lines changed

6 files changed

+28
-28
lines changed

‎pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<dependency>
107107
<groupId>ognl</groupId>
108108
<artifactId>ognl</artifactId>
109-
<version>3.4.4</version>
109+
<version>3.4.5</version>
110110
<scope>compile</scope>
111111
<optional>true</optional>
112112
</dependency>
@@ -206,7 +206,7 @@
206206
</dependency>
207207
<dependency>
208208
<groupId>com.oracle.database.jdbc</groupId>
209-
<artifactId>ojdbc8</artifactId>
209+
<artifactId>ojdbc11</artifactId>
210210
<version>23.6.0.24.10</version>
211211
<scope>test</scope>
212212
</dependency>
@@ -304,7 +304,7 @@
304304
<dependency>
305305
<groupId>ch.qos.logback</groupId>
306306
<artifactId>logback-classic</artifactId>
307-
<version>1.5.15</version>
307+
<version>1.5.16</version>
308308
<scope>test</scope>
309309
</dependency>
310310
<dependency>

‎src/site/es/xdoc/configuration.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright 2009-2024 the original author or authors.
4+
Copyright 2009-2025 the original author or authors.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -220,7 +220,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
220220
true | false
221221
</td>
222222
<td>
223-
False
223+
false
224224
</td>
225225
</tr>
226226
<tr>
@@ -323,7 +323,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
323323
true | false
324324
</td>
325325
<td>
326-
False
326+
false
327327
</td>
328328
</tr>
329329
<tr>
@@ -338,7 +338,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
338338
true | false
339339
</td>
340340
<td>
341-
True
341+
true
342342
</td>
343343
</tr>
344344
<tr>
@@ -351,7 +351,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
351351
true | false
352352
</td>
353353
<td>
354-
False
354+
false
355355
</td>
356356
</tr>
357357
<tr>

‎src/site/ja/xdoc/configuration.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright 2009-2024 the original author or authors.
4+
Copyright 2009-2025 the original author or authors.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -240,7 +240,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
240240
true | false
241241
</td>
242242
<td>
243-
False
243+
false
244244
</td>
245245
</tr>
246246
<tr>
@@ -354,7 +354,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
354354
true | false
355355
</td>
356356
<td>
357-
False
357+
false
358358
</td>
359359
</tr>
360360
<tr>
@@ -369,7 +369,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
369369
true | false
370370
</td>
371371
<td>
372-
True
372+
true
373373
</td>
374374
</tr>
375375
<tr>
@@ -383,7 +383,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
383383
true | false
384384
</td>
385385
<td>
386-
False
386+
false
387387
</td>
388388
</tr>
389389
<tr>

‎src/site/ko/xdoc/configuration.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright 2009-2024 the original author or authors.
4+
Copyright 2009-2025 the original author or authors.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -214,7 +214,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
214214
true | false
215215
</td>
216216
<td>
217-
False
217+
false
218218
</td>
219219
</tr>
220220
<tr>
@@ -334,7 +334,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
334334
true | false
335335
</td>
336336
<td>
337-
False
337+
false
338338
</td>
339339
</tr>
340340
<tr>
@@ -349,7 +349,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
349349
true | false
350350
</td>
351351
<td>
352-
True
352+
true
353353
</td>
354354
</tr>
355355
<tr>
@@ -363,7 +363,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
363363
true | false
364364
</td>
365365
<td>
366-
False
366+
false
367367
</td>
368368
</tr>
369369
<tr>

‎src/site/markdown/configuration.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,16 +110,16 @@ These are extremely important tweaks that modify the way that MyBatis behaves at
110110
| aggressiveLazyLoading | When enabled, any method call will load all the lazy properties of the object. Otherwise, each property is loaded on demand (see also `lazyLoadTriggerMethods`). | true &#124; false | false (true in ≤3.4.1) |
111111
| ~~multipleResultSetsEnabled~~ | Deprecated. This option has no effect. | true &#124; false | true |
112112
| useColumnLabel | Uses the column label instead of the column name. Different drivers behave differently in this respect. Refer to the driver documentation, or test out both modes to determine how your driver behaves. | true &#124; false | true |
113-
| useGeneratedKeys | Allows JDBC support for generated keys. A compatible driver is required. This setting forces generated keys to be used if set to true, as some drivers deny compatibility but still work (e.g. Derby). | true &#124; false | False |
113+
| useGeneratedKeys | Allows JDBC support for generated keys. A compatible driver is required. This setting forces generated keys to be used if set to true, as some drivers deny compatibility but still work (e.g. Derby). | true &#124; false | false |
114114
| autoMappingBehavior | Specifies if and how MyBatis should automatically map columns to fields/properties. NONE disables auto-mapping. PARTIAL will only auto-map results with no nested result mappings defined inside. FULL will auto-map result mappings of any complexity (containing nested or otherwise). | NONE, PARTIAL, FULL | PARTIAL |
115115
| autoMappingUnknownColumnBehavior | Specify the behavior when detects an unknown column (or unknown property type) of automatic mapping target.<ul><li>`NONE`: Do nothing</li><li>`WARNING`: Output warning log (The log level of `'org.apache.ibatis.session.AutoMappingUnknownColumnBehavior'` must be set to `WARN`)</li><li>`FAILING`: Fail mapping (Throw `SqlSessionException`)</li></ul>Note that there could be false-positives when `autoMappingBehavior` is set to `FULL`. | NONE, WARNING, FAILING | NONE |
116116
| defaultExecutorType | Configures the default executor. SIMPLE executor does nothing special. REUSE executor reuses prepared statements. BATCH executor reuses statements and batches updates. | SIMPLE REUSE BATCH | SIMPLE |
117117
| defaultStatementTimeout | Sets the number of seconds the driver will wait for a response from the database. | Any positive integer | Not Set (null) |
118118
| defaultFetchSize | Sets the driver a hint as to control fetching size for return results. This parameter value can be override by a query setting. | Any positive integer | Not Set (null) |
119119
| defaultResultSetType | Specifies a scroll strategy when omit it per statement settings. (Since: 3.5.2) | FORWARD_ONLY &#124; SCROLL_SENSITIVE &#124; SCROLL_INSENSITIVE &#124; DEFAULT(same behavior with 'Not Set') | Not Set (null) |
120-
| safeRowBoundsEnabled | Allows using RowBounds on nested statements. If allow, set the false. | true &#124; false | False |
121-
| safeResultHandlerEnabled | Allows using ResultHandler on nested statements. If allow, set the false. | true &#124; false | True |
122-
| mapUnderscoreToCamelCase | Enables automatic mapping from classic database column names A_COLUMN to camel case classic Java property names aColumn. | true &#124; false | False |
120+
| safeRowBoundsEnabled | Allows using RowBounds on nested statements. If allow, set the false. | true &#124; false | false |
121+
| safeResultHandlerEnabled | Allows using ResultHandler on nested statements. If allow, set the false. | true &#124; false | true |
122+
| mapUnderscoreToCamelCase | Enables automatic mapping from classic database column names A_COLUMN to camel case classic Java property names aColumn. | true &#124; false | false |
123123
| localCacheScope | MyBatis uses local cache to prevent circular references and speed up repeated nested queries. By default (SESSION) all queries executed during a session are cached. If localCacheScope=STATEMENT local session will be used just for statement execution, no data will be shared between two different calls to the same SqlSession. | SESSION &#124; STATEMENT | SESSION |
124124
| jdbcTypeForNull | Specifies the JDBC type for null values when no specific JDBC type was provided for the parameter. Some drivers require specifying the column JDBC type but others work with generic values like NULL, VARCHAR or OTHER. | JdbcType enumeration. Most common are: NULL, VARCHAR and OTHER | OTHER |
125125
| lazyLoadTriggerMethods | Specifies which Object's methods trigger a lazy load | A method name list separated by commas | equals,clone,hashCode,toString |

0 commit comments

Comments
 (0)