Merge branch 'master' into gh/566-oracle-nested-cursor

Author: harawata

Diff for: .gitignore

@@ -10,6 +10,7 @@
 /release.properties
 /target
 .github/keys/
+.profiler/
 
 # These are needed if running in IDE without properties set
 /ibderby

Diff for: .mvn/extensions.xml

@@ -17,6 +17,7 @@
 
 -->
 <extensions>
+    <!-- Usage as -Dprofile -->
     <extension>
       <groupId>fr.jcgay.maven</groupId>
       <artifactId>maven-profiler</artifactId>

Diff for: CONTRIBUTING.md

@@ -12,13 +12,21 @@ Please use [the mailing list](https://groups.google.com/group/mybatis-user) inst
 - It is a good idea to discuss your changes on [the mailing list](https://groups.google.com/group/mybatis-user) to get feedback from the community.
 - If you have a patch with unit tests, send a pull request. Please see the [Contributing code](CONTRIBUTING.md#contributing-code) section.
 
-
 ## Improving documentation
 
 - Documentations are placed under [src/site](https://github.com/mybatis/mybatis-3/tree/master/src/site) directory in [the xdoc format](https://maven.apache.org/doxia/references/xdoc-format.html), so it is basically the same as creating a patch to contribute documentation changes. Please see the [Contributing code](CONTRIBUTING.md#contributing-code) section.
 
 ## Contributing code
 
+### Formatting
+
+Mybatis-core is now being auto formatted.  Given nature of some code logic with mybatis, it is more appropriate to force a formatting structure manually for snippets such as sql statements.  To do so, add following blocks around code.
+
+- ```// @formatter:off``` to start the block of unformatted code
+- ```// @formatter:on``` to end the block of unformatted code
+
+If comment sections need same behaviour such as javadocs, note that the entire block must be around entire comment as direct usage does not properly indicate that formatter treats it all as one comment block regardless.
+
 ### Copyright and License
 
 - You are the author of your contributions and will always be.

Diff for: README.md

@@ -3,6 +3,7 @@ MyBatis SQL Mapper Framework for Java
 
 [![build](https://github.com/mybatis/mybatis-3/actions/workflows/ci.yaml/badge.svg)](https://github.com/mybatis/mybatis-3/actions?query=workflow%3A%22Java+CI%22)
 [![Coverage Status](https://coveralls.io/repos/mybatis/mybatis-3/badge.svg?branch=master&service=github)](https://coveralls.io/github/mybatis/mybatis-3?branch=master)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=mybatis_mybatis-3&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=mybatis_mybatis-3)
 [![Maven central](https://maven-badges.herokuapp.com/maven-central/org.mybatis/mybatis/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.mybatis/mybatis)
 [![Sonatype Nexus (Snapshots)](https://img.shields.io/nexus/s/https/oss.sonatype.org/org.mybatis/mybatis.svg)](https://oss.sonatype.org/content/repositories/snapshots/org/mybatis/mybatis/)
 [![License](https://img.shields.io/:license-apache-brightgreen.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
@@ -25,12 +26,7 @@ Essentials
 Contributions
 -------------
 
-Mybatis-core is now being auto formatted.  Given nature of some code logic with mybatis, it is more appropriate to force a formatting structure manually for snippets such as sql statements.  To do so, add following blocks around code.
-
-- ```// @formatter:off``` to start the block of unformatted code
-- ```// @formatter:on``` to end the block of unformatted code
-
-If comment sections need same behaviour such as javadocs, note that the entire block must be around entire comment as direct usage does not properly indicate that formatter treats it all as one comment block regardless.
+See [here](CONTRIBUTING.md)
 
 Tests
 -----

Diff for: hooks/pre-commit.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+#
+#    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.
+#    You may obtain a copy of the License at
+#
+#       https://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+set -eo pipefail
+
+function format_and_sort() {
+  # Run the validate and import check commands, suppressing all output and errors
+  if ! mvn formatter:validate impsort:check > /dev/null 2>&1; then
+      # If validation failed, fix it by ensuring code is formatted correctly
+      # and that imports are sorted as some IDEs automatically change it on save
+      mvn formatter:format impsort:sort
+
+      # Fail the commit, so the author can re-select what to commit
+      echo "Formatting and/or import sorting were required. Please check and make another commit."
+      exit 1
+  fi
+
+  # If no error occurred, print a success message
+  echo "All files are properly formatted and imports are sorted."
+}
+
+format_and_sort

Diff for: pom.xml

@@ -72,12 +72,13 @@
 
     <clirr.comparisonVersion>3.4.6</clirr.comparisonVersion>
 
-    <byte-buddy.version>1.15.11</byte-buddy.version>
+    <byte-buddy.version>1.16.1</byte-buddy.version>
     <derby.version>10.17.1.0</derby.version>
     <log4j.version>2.24.3</log4j.version>
     <mockito.version>5.15.2</mockito.version>
     <mssql-jdbc.version>12.8.1.jre11</mssql-jdbc.version>
     <testcontainers.version>1.20.4</testcontainers.version>
+    <git-build-hook.version>3.5.0</git-build-hook.version>
 
     <!-- Add slow test groups here and annotate classes similar to @Tag('groupName'). -->
     <!-- Excluded groups are ran on github ci, to force here, pass -d"excludedGroups=" -->
@@ -195,13 +196,13 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.7.4</version>
+      <version>42.7.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.mysql</groupId>
       <artifactId>mysql-connector-j</artifactId>
-      <version>9.1.0</version>
+      <version>9.2.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -213,7 +214,7 @@
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.27.2</version>
+      <version>3.27.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -431,6 +432,24 @@
           </rules>
         </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>com.rudikershaw.gitbuildhook</groupId>
+        <artifactId>git-build-hook-maven-plugin</artifactId>
+        <version>${git-build-hook.version}</version>
+        <configuration>
+          <installHooks>
+            <pre-commit>hooks/pre-commit.sh</pre-commit>
+          </installHooks>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>install</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

Diff for: src/test/java/org/apache/ibatis/binding/BindingTest.java

@@ -623,7 +623,7 @@ void shouldCacheMapperMethod() throws Exception {
   void shouldGetBlogsWithAuthorsAndPosts() {
     try (SqlSession session = sqlSessionFactory.openSession()) {
       BoundBlogMapper mapper = session.getMapper(BoundBlogMapper.class);
-      List<Blog> blogs = mapper.selectBlogsWithAutorAndPosts();
+      List<Blog> blogs = mapper.selectBlogsWithAuthorAndPosts();
       assertEquals(2, blogs.size());
       assertTrue(blogs.get(0) instanceof Proxy);
       assertEquals(101, blogs.get(0).getAuthor().getId());
@@ -640,7 +640,7 @@ void shouldGetBlogsWithAuthorsAndPosts() {
   void shouldGetBlogsWithAuthorsAndPostsEagerly() {
     try (SqlSession session = sqlSessionFactory.openSession()) {
       BoundBlogMapper mapper = session.getMapper(BoundBlogMapper.class);
-      List<Blog> blogs = mapper.selectBlogsWithAutorAndPostsEagerly();
+      List<Blog> blogs = mapper.selectBlogsWithAuthorAndPostsEagerly();
       assertEquals(2, blogs.size());
       assertFalse(blogs.get(0) instanceof Factory);
       assertEquals(101, blogs.get(0).getAuthor().getId());

Diff for: src/test/java/org/apache/ibatis/binding/BoundBlogMapper.java

@@ -251,7 +251,7 @@ Blog selectBlogWithAParamNamedValue(@Param("column") String column, @Param("id")
       @Result(property = "posts", column = "id", many = @Many(select = "selectPostsById"))
   })
   // @formatter:on
-  List<Blog> selectBlogsWithAutorAndPosts();
+  List<Blog> selectBlogsWithAuthorAndPosts();
 
   // @formatter:off
   @Select({
@@ -263,6 +263,6 @@ Blog selectBlogWithAParamNamedValue(@Param("column") String column, @Param("id")
       @Result(property = "posts", column = "id", many = @Many(select = "selectPostsById", fetchType = FetchType.EAGER))
   })
   // @formatter:on
-  List<Blog> selectBlogsWithAutorAndPostsEagerly();
+  List<Blog> selectBlogsWithAuthorAndPostsEagerly();
 
 }

Diff for: src/test/java/org/apache/ibatis/executor/loader/CglibProxyTest.java

@@ -71,7 +71,7 @@ void shouldLetCallALoadedProperty() {
   }
 
   @Test
-  void shouldSerizalizeADeserlizaliedProxy() throws Exception {
+  void shouldSerializeADeserializedProxy() throws Exception {
     Object proxy = ((CglibProxyFactory) proxyFactory).createDeserializationProxy(author, new HashMap<>(),
         new DefaultObjectFactory(), new ArrayList<>(), new ArrayList<>());
     Author author2 = (Author) deserialize(serialize((Serializable) proxy));

Diff for: src/test/java/org/apache/ibatis/executor/loader/JavassistProxyTest.java

@@ -69,7 +69,7 @@ void shouldLetCallALoadedProperty() {
   }
 
   @Test
-  void shouldSerizalizeADeserlizaliedProxy() throws Exception {
+  void shouldSerializeADeserializedProxy() throws Exception {
     Object proxy = ((JavassistProxyFactory) proxyFactory).createDeserializationProxy(author, new HashMap<>(),
         new DefaultObjectFactory(), new ArrayList<>(), new ArrayList<>());
     Author author2 = (Author) deserialize(serialize((Serializable) proxy));

Diff for: src/test/java/org/apache/ibatis/executor/loader/SerializableProxyTest.java

@@ -110,7 +110,7 @@ void shouldSerializeAProxyForABeanWithoutDefaultConstructorAndUnloadedProperties
   }
 
   @Test
-  void shouldSerizaliceAFullLoadedObjectToOriginalClass() throws Exception {
+  void shouldSerializeAFullLoadedObjectToOriginalClass() throws Exception {
     Object proxy = proxyFactory.createProxy(author, new ResultLoaderMap(), new Configuration(),
         new DefaultObjectFactory(), new ArrayList<>(), new ArrayList<>());
     Object proxy2 = deserialize(serialize((Serializable) proxy));

Diff for: src/test/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandlerTest2.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 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.
@@ -93,9 +93,6 @@ void shouldNotCallNextOnClosedResultSet_SimpleResult() throws Exception {
     when(rsmd.getColumnLabel(1)).thenReturn("id");
     when(rsmd.getColumnType(1)).thenReturn(Types.INTEGER);
     when(rsmd.getColumnClassName(1)).thenReturn(Integer.class.getCanonicalName());
-    when(stmt.getConnection()).thenReturn(conn);
-    when(conn.getMetaData()).thenReturn(dbmd);
-    when(dbmd.supportsMultipleResultSets()).thenReturn(false); // for simplicity.
 
     final List<Object> results = resultSetHandler.handleResultSets(stmt);
     assertEquals(0, results.size());

Diff for: src/test/java/org/apache/ibatis/io/ExternalResourcesTest.java

@@ -91,7 +91,7 @@ void getConfiguredTemplate() {
       templateName = ExternalResources.getConfiguredTemplate(tempFile.getAbsolutePath(), "new_command.template");
       assertEquals("templates/col_new_template_migration.sql", templateName);
     } catch (Exception e) {
-      fail("Test failed with execption: " + e.getMessage());
+      fail("Test failed with exception: " + e.getMessage());
     }
   }
 

Diff for: src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java

@@ -113,7 +113,7 @@ void shouldReturnWarningIfEndOfLineTerminatorNotFound() throws Exception {
   }
 
   @Test
-  void commentAferStatementDelimiterShouldNotCauseRunnerFail() throws Exception {
+  void commentAfterStatementDelimiterShouldNotCauseRunnerFail() throws Exception {
     DataSource ds = createUnpooledDataSource(JPETSTORE_PROPERTIES);
     String resource = "org/apache/ibatis/jdbc/ScriptCommentAfterEOLTerminator.sql";
     try (Connection conn = ds.getConnection(); Reader reader = Resources.getResourceAsReader(resource)) {

Diff for: src/test/java/org/apache/ibatis/mapping/ResultMappingTest.java

@@ -41,7 +41,7 @@ void shouldThrowErrorWhenBothResultMapAndNestedSelectAreSet() {
 
   // Issue 4: column is mandatory on nested queries
   @Test
-  void shouldFailWithAMissingColumnInNetstedSelect() {
+  void shouldFailWithAMissingColumnInNestedSelect() {
     assertThrows(IllegalStateException.class,
         () -> new ResultMapping.Builder(configuration, "prop").nestedQueryId("nested query ID").build());
   }

Diff for: src/test/java/org/apache/ibatis/submitted/automapping/AutomappingTest.java

@@ -55,7 +55,7 @@ void shouldGetAUser() {
   }
 
   @Test
-  void shouldGetAUserWhithPhoneNumber() {
+  void shouldGetAUserWithPhoneNumber() {
     sqlSessionFactory.getConfiguration().setAutoMappingBehavior(AutoMappingBehavior.NONE);
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
       Mapper mapper = sqlSession.getMapper(Mapper.class);

Diff for: src/test/java/org/apache/ibatis/submitted/force_flush_on_select/ForceFlushOnSelectTest.java

@@ -118,7 +118,7 @@ void updateShouldFlushLocalCache() {
   }
 
   @Test
-  void selectShouldFlushLocalCacheIfFlushLocalCacheAtferEachStatementIsTrue() throws SQLException {
+  void selectShouldFlushLocalCacheIfFlushLocalCacheAfterEachStatementIsTrue() throws SQLException {
     sqlSessionFactory.getConfiguration().setLocalCacheScope(LocalCacheScope.STATEMENT);
     try (SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.SIMPLE)) {
       PersonMapper personMapper = sqlSession.getMapper(PersonMapper.class);

Diff for: src/test/java/org/apache/ibatis/submitted/keygen/Jdbc3KeyGeneratorTest.java

@@ -197,7 +197,7 @@ void shouldAssignKeysToNamedList() {
   }
 
   @Test
-  void shouldAssingKeysToCollection() {
+  void shouldAssignKeysToCollection() {
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
       try {
         CountryMapper mapper = sqlSession.getMapper(CountryMapper.class);
@@ -215,7 +215,7 @@ void shouldAssingKeysToCollection() {
   }
 
   @Test
-  void shouldAssingKeysToNamedCollection() {
+  void shouldAssignKeysToNamedCollection() {
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
       try {
         CountryMapper mapper = sqlSession.getMapper(CountryMapper.class);
@@ -233,7 +233,7 @@ void shouldAssingKeysToNamedCollection() {
   }
 
   @Test
-  void shouldAssingKeysToArray() {
+  void shouldAssignKeysToArray() {
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
       try {
         CountryMapper mapper = sqlSession.getMapper(CountryMapper.class);
@@ -251,7 +251,7 @@ void shouldAssingKeysToArray() {
   }
 
   @Test
-  void shouldAssingKeysToNamedArray() {
+  void shouldAssignKeysToNamedArray() {
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
       try {
         CountryMapper mapper = sqlSession.getMapper(CountryMapper.class);
@@ -597,7 +597,7 @@ void shouldAssignKeyToAParamWithTrickyName() {
   }
 
   @Test
-  void shouldAssingKeysToAMap() {
+  void shouldAssignKeysToAMap() {
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
       try {
         CountryMapper mapper = sqlSession.getMapper(CountryMapper.class);

Diff for: src/test/java/org/apache/ibatis/submitted/lazy_properties/LazyPropertiesTest.java

@@ -155,16 +155,16 @@ void verifyCustomLazyLoadTriggerMethods() {
 
   @Test
   void shouldInvokingSetterInvalidateLazyLoading_Javassist() {
-    shoulInvokingSetterInvalidateLazyLoading(new JavassistProxyFactory());
+    shouldInvokingSetterInvalidateLazyLoading(new JavassistProxyFactory());
   }
 
   @Tag("RequireIllegalAccess")
   @Test
   void shouldInvokingSetterInvalidateLazyLoading_Cglib() {
-    shoulInvokingSetterInvalidateLazyLoading(new CglibProxyFactory());
+    shouldInvokingSetterInvalidateLazyLoading(new CglibProxyFactory());
   }
 
-  private void shoulInvokingSetterInvalidateLazyLoading(ProxyFactory proxyFactory) {
+  private void shouldInvokingSetterInvalidateLazyLoading(ProxyFactory proxyFactory) {
     Configuration config = sqlSessionFactory.getConfiguration();
     config.setProxyFactory(proxyFactory);
     config.setAggressiveLazyLoading(false);

Diff for: src/test/java/org/apache/ibatis/submitted/result_handler/ResulthandlerTest.java renamed to src/test/java/org/apache/ibatis/submitted/result_handler/ResultHandlerTest.java

@@ -26,7 +26,7 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-class ResulthandlerTest {
+class ResultHandlerTest {
 
   private static SqlSessionFactory sqlSessionFactory;
 

Diff for: src/test/java/org/apache/ibatis/type/SqlTimetampTypeHandlerTest.java renamed to src/test/java/org/apache/ibatis/type/SqlTimestampTypeHandlerTest.java

@@ -25,7 +25,7 @@
 
 import org.junit.jupiter.api.Test;
 
-class SqlTimetampTypeHandlerTest extends BaseTypeHandlerTest {
+class SqlTimestampTypeHandlerTest extends BaseTypeHandlerTest {
 
   private static final TypeHandler<Timestamp> TYPE_HANDLER = new SqlTimestampTypeHandler();
   private static final Timestamp SQL_TIME = new Timestamp(new Date().getTime());