(cayenne) branch past-M2 updated: cleanup

[aadamchik]

This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a commit to branch past-M2
in repository https://gitbox.apache.org/repos/asf/cayenne.git


The following commit(s) were added to refs/heads/past-M2 by this push:
     new 91605d544 cleanup
91605d544 is described below

commit 91605d5444b6a0711bf5beeb180ba6239b9f742a
Author: Andrus Adamchik <and...@objectstyle.com>
AuthorDate: Sat Jun 13 20:30:09 2026 -0400

    cleanup
---
 .../apache/cayenne/access/jdbc/SelectAction.java   | 32 ++++++++++------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git 
a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java 
b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java
index acaaf155b..feac78c3a 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java
@@ -44,23 +44,6 @@ import java.util.List;
  */
 public class SelectAction extends BaseSQLAction {
 
-    private static void bind(DbAdapter adapter, PreparedStatement statement, 
ParameterBinding[] bindings) throws Exception {
-
-        for (ParameterBinding b : bindings) {
-
-            // null DbAttributes are a result of inferior qualifier
-            // processing (qualifier can't map parameters to DbAttributes
-            // and therefore only supports standard java types now) hence, a
-            // special moronic case here:
-            if (b.getAttribute() == null) {
-                statement.setObject(b.getStatementPosition(), b.getValue());
-            } else {
-                adapter.bindParameter(statement, b);
-            }
-        }
-
-    }
-
     protected Select<?> query;
     protected QueryMetadata queryMetadata;
 
@@ -87,9 +70,22 @@ public class SelectAction extends BaseSQLAction {
 
         logger.logQuery(translated.sql(), translated.bindings());
 
+        DbAdapter adapter = dataNode.getAdapter();
         PreparedStatement statement = 
connection.prepareStatement(translated.sql());
-        bind(dataNode.getAdapter(), statement, translated.bindings());
 
+        for (ParameterBinding b : translated.bindings()) {
+
+            // null DbAttributes are a result of inferior qualifier
+            // processing (qualifier can't map parameters to DbAttributes
+            // and therefore only supports standard java types now) hence, a
+            // special moronic case here:
+            if (b.getAttribute() == null) {
+                statement.setObject(b.getStatementPosition(), b.getValue());
+            } else {
+                adapter.bindParameter(statement, b);
+            }
+        }
+        
         int fetchSize = queryMetadata.getStatementFetchSize();
         if (fetchSize != 0) {
             statement.setFetchSize(fetchSize);