Skip to content

Commit

Permalink
Merge branch 'master' into 3108-follow-up-type-handler
Browse files Browse the repository at this point in the history
  • Loading branch information
@epochcoder
epochcoder committed Jan 7, 2025
2 parents 640b930 + 2de2506 commit d1238a6
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 28 deletions.
6 changes: 3 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
<dependency>
<groupId>ognl</groupId>
<artifactId>ognl</artifactId>
<version>3.4.4</version>
<version>3.4.5</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
Expand Down Expand Up @@ -206,7 +206,7 @@
</dependency>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
<artifactId>ojdbc11</artifactId>
<version>23.6.0.24.10</version>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -304,7 +304,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.5.15</version>
<version>1.5.16</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
10 changes: 5 additions & 5 deletions src/site/es/xdoc/configuration.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2009-2024 the original author or authors.
Copyright 2009-2025 the original author or authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -220,7 +220,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
true | false
</td>
<td>
False
false
</td>
</tr>
<tr>
Expand Down Expand Up @@ -323,7 +323,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
true | false
</td>
<td>
False
false
</td>
</tr>
<tr>
Expand All @@ -338,7 +338,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
true | false
</td>
<td>
True
true
</td>
</tr>
<tr>
Expand All @@ -351,7 +351,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
true | false
</td>
<td>
False
false
</td>
</tr>
<tr>
Expand Down
10 changes: 5 additions & 5 deletions src/site/ja/xdoc/configuration.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2009-2024 the original author or authors.
Copyright 2009-2025 the original author or authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -240,7 +240,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
true | false
</td>
<td>
False
false
</td>
</tr>
<tr>
Expand Down Expand Up @@ -354,7 +354,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
true | false
</td>
<td>
False
false
</td>
</tr>
<tr>
Expand All @@ -369,7 +369,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
true | false
</td>
<td>
True
true
</td>
</tr>
<tr>
Expand All @@ -383,7 +383,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
true | false
</td>
<td>
False
false
</td>
</tr>
<tr>
Expand Down
10 changes: 5 additions & 5 deletions src/site/ko/xdoc/configuration.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2009-2024 the original author or authors.
Copyright 2009-2025 the original author or authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -214,7 +214,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
true | false
</td>
<td>
False
false
</td>
</tr>
<tr>
Expand Down Expand Up @@ -334,7 +334,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
true | false
</td>
<td>
False
false
</td>
</tr>
<tr>
Expand All @@ -349,7 +349,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
true | false
</td>
<td>
True
true
</td>
</tr>
<tr>
Expand All @@ -363,7 +363,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
true | false
</td>
<td>
False
false
</td>
</tr>
<tr>
Expand Down
8 changes: 4 additions & 4 deletions src/site/markdown/configuration.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,16 +110,16 @@ These are extremely important tweaks that modify the way that MyBatis behaves at
| 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) |
| ~~multipleResultSetsEnabled~~ | Deprecated. This option has no effect. | true &#124; false | true |
| 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 |
| 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 |
| 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 |
| 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 |
| 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 |
| 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 |
| defaultStatementTimeout | Sets the number of seconds the driver will wait for a response from the database. | Any positive integer | Not Set (null) |
| 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) |
| 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) |
| safeRowBoundsEnabled | Allows using RowBounds on nested statements. If allow, set the false. | true &#124; false | False |
| safeResultHandlerEnabled | Allows using ResultHandler on nested statements. If allow, set the false. | true &#124; false | True |
| mapUnderscoreToCamelCase | Enables automatic mapping from classic database column names A_COLUMN to camel case classic Java property names aColumn. | true &#124; false | False |
| safeRowBoundsEnabled | Allows using RowBounds on nested statements. If allow, set the false. | true &#124; false | false |
| safeResultHandlerEnabled | Allows using ResultHandler on nested statements. If allow, set the false. | true &#124; false | true |
| mapUnderscoreToCamelCase | Enables automatic mapping from classic database column names A_COLUMN to camel case classic Java property names aColumn. | true &#124; false | false |
| 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 |
| 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 |
| lazyLoadTriggerMethods | Specifies which Object's methods trigger a lazy load | A method name list separated by commas | equals,clone,hashCode,toString |
Expand Down
Loading

0 comments on commit d1238a6

Please sign in to comment.