Merge pull request aaberg#252 from bharrisau/add-batch-method

aaberg · web-flow · commit f314a99ec1f7 · 2016-10-29T15:59:01.000+02:00
Add batch method to return any generated keys
diff --git a/core/src/main/java/org/sql2o/Query.java b/core/src/main/java/org/sql2o/Query.java
@@ -800,7 +800,7 @@ public boolean isExplicitExecuteBatchRequired(){
      * Adds a set of parameters to this <code>Query</code>
      * object's batch of commands. <br/>
      *
-     * If maxBatchRecords is more than 0, executeBatch is called upon adding that manny
+     * If maxBatchRecords is more than 0, executeBatch is called upon adding that many
      * commands to the batch. <br/>
      *
      * The current number of batched commands is accessible via the <code>getCurrentBatchRecords()</code>
@@ -821,6 +821,26 @@ public Query addToBatch(){
         return this;
     }
 
+    /**
+     * Adds a set of parameters to this <code>Query</code>
+     * object's batch of commands and returns any generated keys. <br/>
+     *
+     * If maxBatchRecords is more than 0, executeBatch is called upon adding that many
+     * commands to the batch. This method will return any generated keys if <code>fetchGeneratedKeys</code> is set. <br/>
+     *
+     * The current number of batched commands is accessible via the <code>getCurrentBatchRecords()</code>
+     * method.
+     */
+    public <A> List<A> addToBatchGetKeys(Class<A> klass){
+        this.addToBatch();
+
+        if (this.currentBatchRecords == 0) {
+            return this.connection.getKeys(klass);
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
     public Connection executeBatch() throws Sql2oException {
         long start = System.currentTimeMillis();
         try {
