From 1595f096905295c915ffc36932f32cffe04affdd Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Mon, 5 Aug 2013 15:53:37 +0200
Subject: [PATCH] [#2010] Implemented INSERT, UPDATE, STORE lifecycle events

---
 .../test/_/testcases/RecordListenerTests.java | 20 ++++++
 .../src/org/jooq/test/jOOQAbstractTest.java   |  5 ++
 .../org/jooq/impl/UpdatableRecordImpl.java    | 63 ++++++++++++++++---
 3 files changed, 78 insertions(+), 10 deletions(-)

diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/RecordListenerTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/RecordListenerTests.java
index 4cd8cae8e0..9c9f4871de 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/RecordListenerTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/RecordListenerTests.java
@@ -112,6 +112,26 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
     public void testRecordListenerStore() throws Exception {
         jOOQAbstractTest.reset = false;
 
+        SimpleRecordListener listener1 = new SimpleRecordListener();
+        B book1 = newBook(5);
+        book1.attach(create(listener1).configuration());
+        assertEquals(1, book1.store());
+        assertEquals(asList("storeStart", "storeEnd"), listener1.events);
+
+        SimpleRecordListener listener2 = new SimpleRecordListener();
+        B book2 = newBook(6);
+        book2.attach(create(listener2).configuration());
+        assertEquals(1, book2.insert());
+        assertEquals(asList("insertStart", "insertEnd"), listener2.events);
+
+        listener2.events.clear();
+        book2.setValue(TBook_TITLE(), "1234");
+        assertEquals(1, book2.update());
+        assertEquals(asList("updateStart", "updateEnd"), listener2.events);
+    }
+
+    @Test
+    public void testRecordListenerRefresh() throws Exception {
         B book =
         create()
             .selectFrom(TBook())
diff --git a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
index 66542d321c..b5731ff2bb 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
@@ -1508,6 +1508,11 @@ public abstract class jOOQAbstractTest<
         new RecordListenerTests(this).testRecordListenerLoad();
     }
 
+    @Test
+    public void testRecordListenerRefresh() throws Exception {
+        new RecordListenerTests(this).testRecordListenerRefresh();
+    }
+
     @Test
     public void testRecordListenerStore() throws Exception {
         new RecordListenerTests(this).testRecordListenerStore();
diff --git a/jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java b/jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java
index a3b236049e..f5ce949d7c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java
@@ -37,7 +37,10 @@ package org.jooq.impl;
 
 import static java.lang.Boolean.TRUE;
 import static org.jooq.impl.RecordDelegate.delegate;
+import static org.jooq.impl.RecordDelegate.RecordLifecycleType.INSERT;
 import static org.jooq.impl.RecordDelegate.RecordLifecycleType.REFRESH;
+import static org.jooq.impl.RecordDelegate.RecordLifecycleType.STORE;
+import static org.jooq.impl.RecordDelegate.RecordLifecycleType.UPDATE;
 
 import java.math.BigInteger;
 import java.sql.Timestamp;
@@ -111,6 +114,56 @@ public class UpdatableRecordImpl<R extends UpdatableRecord<R>> extends TableReco
 
     @Override
     public final int store() {
+        final int[] result = new int[1];
+
+        delegate(configuration(), (Record) this, STORE)
+        .operate(new RecordOperation<Record, RuntimeException>() {
+
+            @Override
+            public Record operate(Record record) throws RuntimeException {
+                result[0] = store0();
+                return record;
+            }
+        });
+
+        return result[0];
+    }
+
+    @Override
+    public final int insert() {
+        final int[] result = new int[1];
+
+        delegate(configuration(), (Record) this, INSERT)
+        .operate(new RecordOperation<Record, RuntimeException>() {
+
+            @Override
+            public Record operate(Record record) throws RuntimeException {
+                result[0] = storeInsert();
+                return record;
+            }
+        });
+
+        return result[0];
+    }
+
+    @Override
+    public final int update() {
+        final int[] result = new int[1];
+
+        delegate(configuration(), (Record) this, UPDATE)
+        .operate(new RecordOperation<Record, RuntimeException>() {
+
+            @Override
+            public Record operate(Record record) throws RuntimeException {
+                result[0] = storeUpdate(getPrimaryKey().getFieldsArray());
+                return record;
+            }
+        });
+
+        return result[0];
+    }
+
+    private final int store0() {
         TableField<R, ?>[] keys = getPrimaryKey().getFieldsArray();
         boolean executeUpdate = false;
 
@@ -140,16 +193,6 @@ public class UpdatableRecordImpl<R extends UpdatableRecord<R>> extends TableReco
         return result;
     }
 
-    @Override
-    public final int insert() {
-        return storeInsert();
-    }
-
-    @Override
-    public final int update() {
-        return storeUpdate(getPrimaryKey().getFieldsArray());
-    }
-
     private final int storeInsert() {
         DSLContext create = create();
         InsertQuery<R> insert = create.insertQuery(getTable());