From e4ed930fd76450dde61011cabaa4e206283a6872 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Sun, 9 Dec 2012 22:33:28 +0100
Subject: [PATCH] [#1995] Record.original() values aren't updated after a
 Record.store() operation

---
 jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java | 10 ++++++++++
 jOOQ/src/main/java/org/jooq/impl/Value.java            |  8 +++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java
index 49407b12ce..67db214dcd 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java
@@ -39,6 +39,7 @@ import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertNotNull;
 import static junit.framework.Assert.assertNull;
+import static junit.framework.Assert.assertTrue;
 import static junit.framework.Assert.fail;
 import static org.jooq.SQLDialect.SQLITE;
 import static org.jooq.impl.Factory.count;
@@ -375,9 +376,18 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T725,
         assertEquals(0, book1.store());
 
         // Modify and store the original record
+        // [#1995] Check for correct changed() and original() values, too
         Integer id = book1.getValue(TBook_ID());
         book1.setValue(TBook_TITLE(), "1985");
+        assertEquals("1984", book1.original().getValue(TBook_TITLE()));
+        assertEquals("1984", book1.original(TBook_TITLE()));
+        assertTrue(book1.changed());
+        assertTrue(book1.changed(TBook_TITLE()));
         assertEquals(1, book1.store());
+        assertEquals("1985", book1.original().getValue(TBook_TITLE()));
+        assertEquals("1985", book1.original(TBook_TITLE()));
+        assertFalse(book1.changed());
+        assertFalse(book1.changed(TBook_TITLE()));
 
         // Fetch the modified record
         book1 = create().fetchOne(TBook(), TBook_ID().equal(id));
diff --git a/jOOQ/src/main/java/org/jooq/impl/Value.java b/jOOQ/src/main/java/org/jooq/impl/Value.java
index 903a6f7785..f3e10fcf96 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Value.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Value.java
@@ -46,7 +46,7 @@ class Value<T> implements Serializable {
      * Generated UID
      */
     private static final long serialVersionUID = -9065797545428164533L;
-    private final T           original;
+    private T                 original;
     private T                 value;
     private boolean           isChanged;
 
@@ -106,6 +106,12 @@ class Value<T> implements Serializable {
 
     final void setChanged(boolean isChanged) {
         this.isChanged = isChanged;
+
+        // [#1995] If a value is meant to be "unchanged", the "original" should
+        // match the supposedly "unchanged" value.
+        if (!isChanged) {
+            original = value;
+        }
     }
 
     // ------------------------------------------------------------------------