Merge branch 'master' into bind-in-foreach

Author: harawata

.gitignore

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

.mvn/extensions.xml

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

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.

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
 -----

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

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=" -->
@@ -106,7 +107,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>
@@ -195,19 +196,25 @@
     <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>
+      <groupId>com.oracle.database.jdbc</groupId>
+      <artifactId>ojdbc11</artifactId>
+      <version>23.6.0.24.10</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.27.1</version>
+      <version>3.27.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -254,6 +261,12 @@
       <version>${testcontainers.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>oracle-free</artifactId>
+      <version>${testcontainers.version}</version>
+      <scope>test</scope>
+    </dependency>
     <!-- For javadoc link -->
     <dependency>
       <groupId>com.microsoft.sqlserver</groupId>
@@ -292,7 +305,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>
@@ -419,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>
 

src/main/java/org/apache/ibatis/cursor/Cursor.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.
@@ -15,16 +15,14 @@
  */
 package org.apache.ibatis.cursor;
 
-import java.io.Closeable;
-
 /**
  * Cursor contract to handle fetching items lazily using an Iterator. Cursors are a perfect fit to handle millions of
  * items queries that would not normally fit in memory. If you use collections in resultMaps then cursor SQL queries
  * must be ordered (resultOrdered="true") using the id columns of the resultMap.
  *
  * @author Guillaume Darmont / [email protected]
  */
-public interface Cursor<T> extends Closeable, Iterable<T> {
+public interface Cursor<T> extends AutoCloseable, Iterable<T> {
 
   /**
    * @return true if the cursor has started to fetch items from database.
@@ -42,4 +40,10 @@ public interface Cursor<T> extends Closeable, Iterable<T> {
    * @return -1 if the first cursor item has not been retrieved. The index of the current item retrieved.
    */
   int getCurrentIndex();
+
+  /**
+   * Closes the cursor.
+   */
+  @Override
+  void close();
 }

src/main/java/org/apache/ibatis/executor/loader/ResultLoaderMap.java

@@ -1,5 +1,5 @@
 /*
- *    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.
@@ -235,7 +235,7 @@ private Configuration getConfiguration() {
               + FACTORY_METHOD + "] is not static.");
         }
 
-        if (!factoryMethod.isAccessible()) {
+        if (!factoryMethod.canAccess(null)) {
           configurationObject = AccessController.doPrivileged((PrivilegedExceptionAction<Object>) () -> {
             try {
               factoryMethod.setAccessible(true);

src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java

@@ -247,34 +247,49 @@ public <E> Cursor<E> handleCursorResultSets(Statement stmt) throws SQLException
   }
 
   private ResultSetWrapper getFirstResultSet(Statement stmt) throws SQLException {
-    ResultSet rs = stmt.getResultSet();
-    while (rs == null) {
-      // move forward to get the first resultset in case the driver
-      // doesn't return the resultset as the first result (HSQLDB)
-      if (stmt.getMoreResults()) {
-        rs = stmt.getResultSet();
-      } else if (stmt.getUpdateCount() == -1) {
-        // no more results. Must be no resultset
-        break;
+    ResultSet rs = null;
+    SQLException e1 = null;
+
+    try {
+      rs = stmt.getResultSet();
+    } catch (SQLException e) {
+      // Oracle throws ORA-17283 for implicit cursor
+      e1 = e;
+    }
+
+    try {
+      while (rs == null) {
+        // move forward to get the first resultset in case the driver
+        // doesn't return the resultset as the first result (HSQLDB)
+        if (stmt.getMoreResults()) {
+          rs = stmt.getResultSet();
+        } else if (stmt.getUpdateCount() == -1) {
+          // no more results. Must be no resultset
+          break;
+        }
       }
+    } catch (SQLException e) {
+      throw e1 != null ? e1 : e;
     }
+
     return rs != null ? new ResultSetWrapper(rs, configuration) : null;
   }
 
   private ResultSetWrapper getNextResultSet(Statement stmt) {
     // Making this method tolerant of bad JDBC drivers
     try {
-      if (stmt.getConnection().getMetaData().supportsMultipleResultSets()) {
-        // Crazy Standard JDBC way of determining if there are more results
-        // DO NOT try to 'improve' the condition even if IDE tells you to!
-        // It's important that getUpdateCount() is called here.
-        if (!(!stmt.getMoreResults() && stmt.getUpdateCount() == -1)) {
-          ResultSet rs = stmt.getResultSet();
-          if (rs == null) {
-            return getNextResultSet(stmt);
-          } else {
-            return new ResultSetWrapper(rs, configuration);
-          }
+      // We stopped checking DatabaseMetaData#supportsMultipleResultSets()
+      // because Oracle driver (incorrectly) returns false
+
+      // Crazy Standard JDBC way of determining if there are more results
+      // DO NOT try to 'improve' the condition even if IDE tells you to!
+      // It's important that getUpdateCount() is called here.
+      if (!(!stmt.getMoreResults() && stmt.getUpdateCount() == -1)) {
+        ResultSet rs = stmt.getResultSet();
+        if (rs == null) {
+          return getNextResultSet(stmt);
+        } else {
+          return new ResultSetWrapper(rs, configuration);
         }
       }
     } catch (Exception e) {

src/main/java/org/apache/ibatis/mapping/ResultMap.java

@@ -1,5 +1,5 @@
 /*
- *    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.
@@ -116,7 +116,7 @@ public ResultMap build() {
           // #101
           Class<?> javaType = resultMapping.getJavaType();
           resultMap.hasResultMapsUsingConstructorCollection = resultMap.hasResultMapsUsingConstructorCollection
-              || (resultMapping.getNestedQueryId() == null && javaType != null
+              || (resultMapping.getNestedQueryId() == null && resultMapping.getTypeHandler() == null && javaType != null
                   && resultMap.configuration.getObjectFactory().isCollection(javaType));
 
           if (resultMapping.getProperty() != null) {