From 979b1f05fd00c0ce42e799f13f489470ff419c63 Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Fri, 8 May 2015 09:55:43 +0200
Subject: [PATCH] [#4218] Add LoaderSourceStep.loadArrays(Iterable<? extends
 Object[]>)

---
 .../main/java/org/jooq/LoaderSourceStep.java  |  6 ++--
 .../main/java/org/jooq/impl/LoaderImpl.java   | 30 +++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/LoaderSourceStep.java b/jOOQ/src/main/java/org/jooq/LoaderSourceStep.java
index 737a53def1..f3c9711dbf 100644
--- a/jOOQ/src/main/java/org/jooq/LoaderSourceStep.java
+++ b/jOOQ/src/main/java/org/jooq/LoaderSourceStep.java
@@ -65,17 +65,17 @@ public interface LoaderSourceStep<R extends TableRecord<R>> {
     /**
      * Load in-memory data.
      */
-    LoaderRowsStep<R> loadRows(Object[]... rows);
+    LoaderRowsStep<R> loadArrays(Object[]... arrays);
 
     /**
      * Load in-memory data.
      */
-    LoaderRowsStep<R> loadRows(Iterable<? extends Object[]> rows);
+    LoaderRowsStep<R> loadArrays(Iterable<? extends Object[]> arrays);
 
     /**
      * Load in-memory data.
      */
-    LoaderRowsStep<R> loadRows(Iterator<? extends Object[]> rows);
+    LoaderRowsStep<R> loadArrays(Iterator<? extends Object[]> arrays);
 
     /**
      * Load in-memory data.
diff --git a/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java b/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java
index a9061d23e4..7e3f53325f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java
@@ -127,10 +127,10 @@ class LoaderImpl<R extends TableRecord<R>> implements
     private static final int BULK_AFTER = 1;
     private static final int BULK_ALL   = 2;
 
-    private static final int CONTENT_CSV  = 0;
-    private static final int CONTENT_XML  = 1;
-    private static final int CONTENT_JSON = 2;
-    private static final int CONTENT_ROWS = 3;
+    private static final int CONTENT_CSV    = 0;
+    private static final int CONTENT_XML    = 1;
+    private static final int CONTENT_JSON   = 2;
+    private static final int CONTENT_ARRAYS = 3;
 
     // Configuration data
     // ------------------
@@ -147,7 +147,7 @@ class LoaderImpl<R extends TableRecord<R>> implements
     private int                          bulkAfter   = 1;
     private int                          content     = CONTENT_CSV;
     private BufferedReader               data;
-    private Iterator<? extends Object[]> rows;
+    private Iterator<? extends Object[]> arrays;
 
     // CSV configuration data
     // ----------------------
@@ -282,19 +282,19 @@ class LoaderImpl<R extends TableRecord<R>> implements
     }
 
     @Override
-    public final LoaderRowsStep<R> loadRows(Object[]... r) {
-        return loadRows(Arrays.asList(r));
+    public final LoaderRowsStep<R> loadArrays(Object[]... a) {
+        return loadArrays(Arrays.asList(a));
     }
 
     @Override
-    public final LoaderRowsStep<R> loadRows(Iterable<? extends Object[]> r) {
-        return loadRows(r.iterator());
+    public final LoaderRowsStep<R> loadArrays(Iterable<? extends Object[]> a) {
+        return loadArrays(a.iterator());
     }
 
     @Override
-    public final LoaderRowsStep<R> loadRows(Iterator<? extends Object[]> r) {
-        content = CONTENT_ROWS;
-        this.rows = r;
+    public final LoaderRowsStep<R> loadArrays(Iterator<? extends Object[]> a) {
+        content = CONTENT_ARRAYS;
+        this.arrays = a;
         return this;
     }
 
@@ -310,7 +310,7 @@ class LoaderImpl<R extends TableRecord<R>> implements
 
     @Override
     public final LoaderRowsStep<R> loadRecords(Iterator<? extends Record> records) {
-        return loadRows(new MappingIterator<Record, Object[]>(records, new MappingIterator.Function<Record, Object[]>() {
+        return loadArrays(new MappingIterator<Record, Object[]>(records, new MappingIterator.Function<Record, Object[]>() {
             @Override
             public final Object[] map(Record value) {
                 if (value == null)
@@ -566,7 +566,7 @@ class LoaderImpl<R extends TableRecord<R>> implements
         else if (content == CONTENT_JSON) {
             executeJSON();
         }
-        else if (content == CONTENT_ROWS) {
+        else if (content == CONTENT_ARRAYS) {
             executeRows();
         }
         else {
@@ -624,7 +624,7 @@ class LoaderImpl<R extends TableRecord<R>> implements
 
     private void executeRows() {
         try {
-            executeSQL(rows);
+            executeSQL(arrays);
         }
 
         // SQLExceptions originating from rollbacks or commits are always fatal