From 45b9d5808c9b2646df2e52bbf37855c64ec4711a Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Sat, 10 Mar 2012 09:27:50 +0000
Subject: [PATCH] Added an additional INSERT .. SET .. RETURNING test case

---
 .../org/jooq/test/_/testcases/InsertUpdateTests.java  | 11 +++++++++++
 jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java     | 10 +++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java
index ff89a7e499..86c14a71db 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java
@@ -506,6 +506,17 @@ extends BaseTest<A, B, S, B2S, BS, L, X, DATE, D, T, U, I, IPK, T658, T725, T639
         assertEquals(  ID, (int) returned.getValue(TTriggers_ID()));
         assertEquals(2*ID, (int) returned.getValue(TTriggers_COUNTER()));
 
+        // Alternative syntax
+        // ------------------
+        returned = create().insertInto(TTriggers())
+                           .set(TTriggers_COUNTER(), 0)
+                           .returning(TTriggers_ID_GENERATED())
+                           .fetchOne();
+        assertNotNull(returned);
+        assertEquals(++ID, (int) returned.getValue(TTriggers_ID_GENERATED()));
+        assertNull(returned.getValue(TTriggers_ID()));
+        assertNull(returned.getValue(TTriggers_COUNTER()));
+
         switch (getDialect()) {
             case ASE:
             case DERBY:
diff --git a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
index 7bc9f9d806..c608490390 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
@@ -992,6 +992,11 @@ public abstract class jOOQAbstractTest<
         new InsertUpdateTests(this).testInsertOnDuplicateKey();
     }
 
+    @Test
+    public void testInsertReturning() throws Exception {
+        new InsertUpdateTests(this).testInsertReturning();
+    }
+
     @Test
     public void testMerge() throws Exception {
         new InsertUpdateTests(this).testMerge();
@@ -1037,11 +1042,6 @@ public abstract class jOOQAbstractTest<
         new CRUDTests(this).testNonUpdatables();
     }
 
-    @Test
-    public void testInsertReturning() throws Exception {
-        new InsertUpdateTests(this).testInsertReturning();
-    }
-
     @Test
     public void testFormatHTML() throws Exception {
         new FormatTests(this).testFormatHTML();