From 9e9cdf5c8f6b31b6b06876b4ccb3d8fb872294ab Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Sun, 2 Dec 2012 12:57:40 +0100
Subject: [PATCH] [#1987] Allow for reading data from Iterables, arrays, Maps
 through Record.from() - Added support for loading from arrays

---
 .../src/org/jooq/test/_/testcases/FetchTests.java   |  3 +++
 jOOQ/src/main/java/org/jooq/Record.java             | 13 +++++++++----
 .../src/main/java/org/jooq/impl/AbstractRecord.java |  5 +++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java
index d09e1c4969..cc39247c50 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java
@@ -331,8 +331,11 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725,
             Object[] array = bookJ.intoArray();
 
             B book2 = create().newRecord(TBook());
+            B book3 = create().newRecord(TBook());
             book2.fromArray(array);
+            book3.from(array);
             assertEquals(bookJ, book2);
+            assertEquals(bookJ, book3);
 
             for (int i = 0; i < TBook().getFields().size(); i++) {
                 assertEquals(books.getValue(j, i), booksArray[j][i]);
diff --git a/jOOQ/src/main/java/org/jooq/Record.java b/jOOQ/src/main/java/org/jooq/Record.java
index e283da6a4b..b48acbe055 100644
--- a/jOOQ/src/main/java/org/jooq/Record.java
+++ b/jOOQ/src/main/java/org/jooq/Record.java
@@ -656,10 +656,15 @@ public interface Record extends FieldProvider, Attachable {
 
     /**
      * Load data into this record from a source. The mapping algorithm is this:
-     * <h3>If <code>source</code> is a {@link Map}</h3> Loading of data is
-     * delegated to {@link #fromMap(Map)} <h3>If any JPA {@link Column}
-     * annotations are found on the {@link Class} of the provided
-     * <code>source</code>, only those are used. Matching candidates are:</h3>
+     * <h3>If <code>source</code> is an <code>array</code></h3>
+     * <p>
+     * Loading of data is delegated to {@link #fromArray(Object...)}
+     * <h3>If <code>source</code> is a {@link Map}</h3>
+     * <p>
+     * Loading of data is delegated to {@link #fromMap(Map)}
+     * <h3>If any JPA {@link Column} annotations are found on the {@link Class}
+     * of the provided <code>source</code>, only those are used. Matching
+     * candidates are:</h3>
      * <ul>
      * <li>Public no-argument instance methods annotated with
      * <code>Column</code></li>
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java
index 03e0e248f8..09a3e41a79 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java
@@ -724,6 +724,11 @@ abstract class AbstractRecord extends AbstractStore implements Record {
             fromMap((Map<String, ?>) source);
         }
 
+        // Arrays are loaded through index mapping
+        else if (source instanceof Object[]) {
+            fromArray((Object[]) source);
+        }
+
         // All other types are expected to be POJOs
         else {
             Class<?> type = source.getClass();