From 7abab49c9507dfe037ac19a81ce546fca16f1fa2 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Wed, 18 Feb 2015 14:27:37 +0100
Subject: [PATCH] [#2905] Add support for named parameters in
 BatchBindStep.bind()

---
 .../main/java/org/jooq/impl/BatchSingle.java  | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java b/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java
index 9dfb20bd35..bd790ce393 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java
@@ -89,7 +89,11 @@ class BatchSingle implements BatchBindStep {
         this.nameToIndexMapping = new LinkedHashMap<String, List<Integer>>();
 
         int i = 0;
-        for (Entry<String, Param<?>> entry : new DefaultDSLContext(configuration).extractParams0(query, false).entrySet()) {
+
+        ParamCollector collector = new ParamCollector(configuration, false);
+        collector.visit(query);
+
+        for (Entry<String, Param<?>> entry : collector.resultList) {
             List<Integer> list = nameToIndexMapping.get(entry.getKey());
 
             if (list == null) {
@@ -169,11 +173,14 @@ class BatchSingle implements BatchBindStep {
 
         // [#1371] fetch bind variables to restore them again, later
         // [#3940] Don't include inlined bind variables
-        DataType<?>[] paramTypes = dataTypes(
-            new DefaultDSLContext(configuration)
-                .extractParams0(query, false)
-                .values()
-                .toArray(new Field[0]));
+        // [#4062] Make sure we collect also repeated named parameters
+        ParamCollector collector = new ParamCollector(configuration, false);
+        collector.visit(query);
+        List<Param<?>> params = new ArrayList<Param<?>>();
+        for (Entry<String, Param<?>> entry : collector.resultList)
+            params.add(entry.getValue());
+
+        DataType<?>[] paramTypes = dataTypes(params.toArray(new Field[0]));
 
         try {
             listener.renderStart(ctx);
@@ -192,11 +199,10 @@ class BatchSingle implements BatchBindStep {
                 //                 list to preserve type information
                 // [#3547]         The original query may have no Params specified - e.g. when it was constructed with
                 //                 plain SQL. In that case, infer the bind value type directly from the bind value
-                List<Field<?>> params = (paramTypes.length > 0)
-                    ? fields(bindValues, paramTypes)
-                    : fields(bindValues);
-
-                visitAll(new DefaultBindContext(configuration, ctx.statement()), params);
+                visitAll(new DefaultBindContext(configuration, ctx.statement()),
+                    (paramTypes.length > 0)
+                        ? fields(bindValues, paramTypes)
+                        : fields(bindValues));
 
                 listener.bindEnd(ctx);
                 ctx.statement().addBatch();