From 4fdf22e710f9efac605288650976e0b8d25af8e2 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Wed, 12 Dec 2012 22:09:05 +0100
Subject: [PATCH] [#2000] Add Record.reset(), reset(Field<?>), reset(int),
 reset(String) to restore original values in a record

---
 .../jooq/test/_/testcases/RecordTests.java    | 26 +++++++++++++++++++
 .../src/org/jooq/test/jOOQAbstractTest.java   |  5 ++++
 jOOQ/src/main/java/org/jooq/Record.java       | 24 +++++++++++++++++
 .../java/org/jooq/impl/AbstractRecord.java    | 22 ++++++++++++++++
 jOOQ/src/main/java/org/jooq/impl/Value.java   |  5 ++++
 5 files changed, 82 insertions(+)

diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/RecordTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/RecordTests.java
index 645634f1f7..8d29fd3c0d 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/RecordTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/RecordTests.java
@@ -145,4 +145,30 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725,
         assertEquals("abc", book.original().getValue(TBook_TITLE()));
         assertEquals("abc", book.original(TBook_TITLE()));
     }
+
+    @Test
+    public void testRecordReset() throws Exception {
+        B book = create().selectFrom(TBook()).where(TBook_ID().eq(1)).fetchOne();
+
+        book.setValue(TBook_TITLE(), "abc");
+        book.reset();
+        assertFalse(book.changed());
+        assertFalse(book.changed(TBook_TITLE()));
+        assertFalse(book.changed(TBook_TITLE().getName()));
+        assertEquals("1984", book.getValue(TBook_TITLE()));
+
+        book.setValue(TBook_TITLE(), "abc");
+        book.reset(TBook_TITLE());
+        assertFalse(book.changed());
+        assertFalse(book.changed(TBook_TITLE()));
+        assertFalse(book.changed(TBook_TITLE().getName()));
+        assertEquals("1984", book.getValue(TBook_TITLE()));
+
+        book.setValue(TBook_TITLE(), "abc");
+        book.reset(TBook_TITLE().getName());
+        assertFalse(book.changed());
+        assertFalse(book.changed(TBook_TITLE()));
+        assertFalse(book.changed(TBook_TITLE().getName()));
+        assertEquals("1984", book.getValue(TBook_TITLE()));
+    }
 }
diff --git a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
index df40e43861..61b56a61d8 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
@@ -1203,6 +1203,11 @@ public abstract class jOOQAbstractTest<
         new RecordTests(this).testRecordChanged();
     }
 
+    @Test
+    public void testRecordReset() throws Exception {
+        new RecordTests(this).testRecordReset();
+    }
+
     @Test
     public void testConcurrentExecution() throws Exception {
         new ThreadSafetyTests(this).testConcurrentExecution();
diff --git a/jOOQ/src/main/java/org/jooq/Record.java b/jOOQ/src/main/java/org/jooq/Record.java
index c640ab3a35..2c39f35ac2 100644
--- a/jOOQ/src/main/java/org/jooq/Record.java
+++ b/jOOQ/src/main/java/org/jooq/Record.java
@@ -499,6 +499,30 @@ public interface Record extends FieldProvider, Attachable {
      */
     void changed(boolean changed, String fieldName);
 
+    /**
+     * Reset all values to their {@link #original()} values and all
+     * {@link #changed()} flags to <code>false</code>.
+     */
+    void reset();
+
+    /**
+     * Reset a given value to its {@link #original(Field)} value and its
+     * {@link #changed(Field)} flag to <code>false</code>.
+     */
+    void reset(Field<?> field);
+
+    /**
+     * Reset a given value to its {@link #original(int)} value and its
+     * {@link #changed(int)} flag to <code>false</code>.
+     */
+    void reset(int fieldIndex);
+
+    /**
+     * Reset a given value to its {@link #original(String)} value and its
+     * {@link #changed(String)} flag to <code>false</code>.
+     */
+    void reset(String fieldName);
+
     /**
      * Convert this record into an array.
      * <p>
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java
index 5ad90bdae4..e35b767a54 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java
@@ -422,6 +422,28 @@ abstract class AbstractRecord extends AbstractStore implements Record {
         changed(changed, getIndex(fieldName));
     }
 
+    @Override
+    public final void reset() {
+        for (Value<?> value : getValues()) {
+            value.reset();
+        }
+    }
+
+    @Override
+    public final void reset(Field<?> field) {
+        reset(getIndex(field));
+    }
+
+    @Override
+    public final void reset(int fieldIndex) {
+        getValue0(fieldIndex).reset();
+    }
+
+    @Override
+    public final void reset(String fieldName) {
+        reset(getIndex(fieldName));
+    }
+
     @Override
     public final Object[] intoArray() {
         return into(Object[].class);
diff --git a/jOOQ/src/main/java/org/jooq/impl/Value.java b/jOOQ/src/main/java/org/jooq/impl/Value.java
index f3e10fcf96..7685918280 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Value.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Value.java
@@ -114,6 +114,11 @@ class Value<T> implements Serializable {
         }
     }
 
+    final void reset() {
+        isChanged = false;
+        value = original;
+    }
+
     // ------------------------------------------------------------------------
     // XXX: Object API
     // ------------------------------------------------------------------------