spring-r2dbc can't correctly fill multiple named parameters with list

[Dieken]

https://github.com/spring-projects/spring-framework/blob/v7.0.0-M3/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java#L528

if (parameter.getValue() instanceof Collection collection) {
				Iterator<Object> iterator = collection.iterator();
				Iterator<BindMarker> markers = bindMarkers.iterator();
				while (iterator.hasNext()) {
					Object valueToBind = iterator.next();
					if (valueToBind instanceof Object[] objects) {
						for (Object object : objects) {
							bind(target, markers, object);
						}
					}
					else {
						bind(target, markers, valueToBind);
					}
				}
			}

For example, for SELECT ... WHERE fund_codeA in (:fundCodes) OR fund_codeB in (:fundCodes), fundCodes references a List, then the code above only fill the first occurrence of :fundCodes.

parameter = ["00001"]
markers = [?, ?]    // two occurrence

// iterate on parameter won't fill second "?"
// SELECT .... WHERE fund_codeA in (?)   OR fund_codeB in (?)

[Dieken]

Possible fix below, sorry my network speed to download gradle and dependencies is too slow, I haven't tested it.

$ git diff -w

diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java

index f6696e8d9c..91ae7b35a4 100644
--- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java
+++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java
@@ -529,6 +529,7 @@ abstract class NamedParameterUtils {
                        if (parameter.getValue() instanceof Collection collection) {
                                Iterator<Object> iterator = collection.iterator();
                                Iterator<BindMarker> markers = bindMarkers.iterator();
+                               do {
                                        while (iterator.hasNext()) {
                                                Object valueToBind = iterator.next();
                                                if (valueToBind instanceof Object[] objects) {
@@ -540,6 +541,13 @@ abstract class NamedParameterUtils {
                                                        bind(target, markers, valueToBind);
                                                }
                                        }
+
+                                       if (markers.hasNext()) {
+                                               iterator = collection.iterator();
+                                       } else {
+                                               break;
+                                       }
+                               } while (true);
                        }
                        else {
                                for (BindMarker bindMarker : bindMarkers) {

[sbrannen]

Hi @Dieken,

Congratulations on submitting your first issue for the Spring Framework! 👍

Before I noticed that you had submitted PR #34769, I put together some tests in an attempt to reproduce the behavior you described, and I pushed those in commit 018d3c9.

Those tests pass.

For example, the executeSelectWithReusedNamedParameterList() test method results in the following being logged at TRACE level when running H2DatabaseClientIntegrationTests.

Expanded SQL [SELECT * FROM legoset WHERE version IN ($1, $2, $3, $4) OR manual IN ($1, $2, $3, $4)]

That is expanded from the following SQL.

SELECT * FROM legoset WHERE version IN (:numbers) OR manual IN (:numbers)

Thus, I was not able to reproduce your claim.

If you would like us to investigate this further (or to consider your PR), please provide tests that fail before the proposed change and then pass after the proposed change.

Thanks,

Sam