jdbi in clause doesn't work if there is any post named param fix #401

Author: jknack

coverage-report/src/test/java/org/jooby/issues/Issue401.java

@@ -0,0 +1,75 @@
+package org.jooby.issues;
+
+import org.jooby.jdbi.Jdbi;
+import org.jooby.test.ServerFeature;
+import org.junit.Test;
+import org.skife.jdbi.v2.Handle;
+import org.skife.jdbi.v2.util.StringColumnMapper;
+
+import com.typesafe.config.ConfigFactory;
+import com.typesafe.config.ConfigValueFactory;
+
+public class Issue401 extends ServerFeature {
+
+  {
+    use(ConfigFactory.empty().withValue("db", ConfigValueFactory.fromAnyRef("mem")));
+
+    use(new Jdbi());
+
+    onStart(registry -> {
+      try (Handle h = registry.require(Handle.class)) {
+        h.execute("create table members (id int primary key, name varchar(100))");
+
+        h.execute("insert into members (id, name) values (?, ?)", 1, "a");
+        h.execute("insert into members (id, name) values (?, ?)", 2, "b");
+        h.execute("insert into members (id, name) values (?, ?)", 3, "c");
+        h.execute("insert into members (id, name) values (?, ?)", 4, "d");
+        h.execute("insert into members (id, name) values (?, ?)", 5, "e");
+        h.execute("insert into members (id, name) values (?, ?)", 6, "f");
+        h.execute("insert into members (id, name) values (?, ?)", 7, "g");
+        h.execute("insert into members (id, name) values (?, ?)", 8, "h");
+        h.execute("insert into members (id, name) values (?, ?)", 9, "i");
+      }
+    });
+
+    get("/401/pos", req -> {
+      try (Handle h = req.require(Handle.class)) {
+        return h
+            .createQuery("select name from members where id in (?) order by name limit ? offset ?")
+            .bind(0, req.param("id").toList(Integer.class))
+            .bind(1, 5)
+            .bind(2, 0)
+            .map(StringColumnMapper.INSTANCE)
+            .list();
+      }
+    });
+
+    get("/401/named", req -> {
+      try (Handle h = req.require(Handle.class)) {
+        return h.createQuery(
+            "select name from members where id in (:id) order by name limit :limit offset :offset")
+            .bind("id", req.param("id").toList(Integer.class))
+            .bind("offset", 0)
+            .bind("limit", 5)
+            .map(StringColumnMapper.INSTANCE)
+            .list();
+      }
+    });
+
+  }
+
+  @Test
+  public void posParamShouldWork() throws Exception {
+    request()
+        .get("/401/pos?id=1&id=2&id=3&id=4&id=5&id=6&id=7")
+        .expect("[a, b, c, d, e]");
+  }
+
+  @Test
+  public void namedParamShouldWork() throws Exception {
+    request()
+        .get("/401/named?id=1&id=2&id=3&id=4&id=5&id=6&id=7")
+        .expect("[a, b, c, d, e]");
+  }
+
+}

jooby-jdbi/src/main/java/org/jooby/jdbi/Jdbi.java

@@ -20,6 +20,7 @@
 
 import static java.util.Objects.requireNonNull;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.function.BiConsumer;
 
@@ -28,13 +29,14 @@
 import org.jooby.Env;
 import org.jooby.jdbc.Jdbc;
 import org.skife.jdbi.v2.DBI;
-import org.skife.jdbi.v2.DBI2;
 import org.skife.jdbi.v2.ExpandedStmtRewriter;
 import org.skife.jdbi.v2.Handle;
 import org.skife.jdbi.v2.IterableArgumentFactory;
 import org.skife.jdbi.v2.OptionalArgumentFactory;
 import org.skife.jdbi.v2.OptionalContainerFactory;
 import org.skife.jdbi.v2.logging.SLF4JLog;
+import org.skife.jdbi.v2.tweak.ArgumentFactory;
+import org.skife.jdbi.v2.tweak.ConnectionFactory;
 
 import com.google.common.collect.Lists;
 import com.google.inject.Binder;
@@ -136,6 +138,25 @@
  */
 public class Jdbi extends Jdbc {
 
+  public static final String ARG_FACTORIES = "__argumentFactories_";
+
+  static class DBI2 extends DBI {
+
+    private List<ArgumentFactory<?>> factories = new ArrayList<ArgumentFactory<?>>();
+
+    public DBI2(final ConnectionFactory connectionFactory) {
+      super(connectionFactory);
+      define(ARG_FACTORIES, factories);
+    }
+
+    @Override
+    public void registerArgumentFactory(final ArgumentFactory<?> argumentFactory) {
+      factories.add(argumentFactory);
+      super.registerArgumentFactory(argumentFactory);
+    }
+
+  }
+
   private BiConsumer<DBI, Config> configurer;
 
   private List<Class<?>> sqlObjects;

jooby-jdbi/src/main/java/org/skife/jdbi/v2/DBI2.java

@@ -156,14 +156,16 @@ public void bind(final Binding params, final PreparedStatement statement) throws
       if (stmt.positionalOnly) {
         // no named params, is easy
         boolean finished = false;
-        int i = 0;
+        int i = 0, p = 0;
         while (!finished) {
-          final Argument a = params.forPosition(i);
+          final Argument a = params.forPosition(p);
           if (a != null) {
             try {
+              this.context.setAttribute("position", null);
               a.apply(i + 1, statement, this.context);
               Integer pos = (Integer) this.context.getAttribute("position");
               i += Optional.ofNullable(pos).orElse(1);
+              p += 1;
               this.context.setAttribute("position", null);
             } catch (SQLException e) {
               throw new UnableToExecuteStatementException(
@@ -198,13 +200,15 @@ public void bind(final Binding params, final PreparedStatement statement) throws
           }
 
           try {
+            this.context.setAttribute("position", null);
             a.apply(i + 1, statement, this.context);
+            Integer pos = (Integer) this.context.getAttribute("position");
+            i += Optional.ofNullable(pos).orElse(1);
           } catch (SQLException e) {
             throw new UnableToCreateStatementException(String.format(
                 "Exception while binding '%s'",
                 named_param), e, context);
           }
-          i++;
         }
       }
     }

jooby-jdbi/src/main/java/org/skife/jdbi/v2/ExpandedStmtRewriter.java

@@ -23,6 +23,7 @@
 import java.sql.SQLException;
 import java.util.List;
 
+import org.jooby.jdbi.Jdbi;
 import org.skife.jdbi.v2.tweak.Argument;
 import org.skife.jdbi.v2.tweak.ArgumentFactory;
 
@@ -47,7 +48,7 @@ public IterableArgument(final Object value, final StatementContext ctx) {
       this.values = (Iterable<?>) value;
     }
     this.foreman = new Foreman();
-    List<ArgumentFactory> factories = (List<ArgumentFactory>) ctx.getAttribute(DBI2.ARG_FACTORIES);
+    List<ArgumentFactory> factories = (List<ArgumentFactory>) ctx.getAttribute(Jdbi.ARG_FACTORIES);
     factories.forEach(foreman::register);
   }
 
@@ -60,7 +61,7 @@ public void apply(final int position, final PreparedStatement stmt,
       i+=1;
     }
 
-    ctx.setAttribute("position", i);
+    ctx.setAttribute("position", i - 1);
 
   }