[jOOQ#1018] Add support for PostgreSQL and SQL Server non-standard UPDATE .. FROM clause

Author: lukaseder

jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2009-2013, Data Geekery GmbH (http://www.datageekery.com)
+ * Copyright (c) 2009-2014, Data Geekery GmbH (http://www.datageekery.com)
  * All rights reserved.
  *
  * This work is dual-licensed
@@ -59,6 +59,7 @@
 // ...
 import static org.jooq.impl.DSL.cast;
 import static org.jooq.impl.DSL.castNull;
+import static org.jooq.impl.DSL.concat;
 import static org.jooq.impl.DSL.count;
 import static org.jooq.impl.DSL.decode;
 import static org.jooq.impl.DSL.falseCondition;
@@ -1343,4 +1344,75 @@ public void testUpdateJoin() throws Exception {
         assertEquals("ABC", b21.getValue(TBook_TITLE()));
         assertEquals("ABC", b22.getValue(TBook_TITLE()));
     }
+
+    @Test
+    public void testUpdateFrom() throws Exception {
+        switch (dialect().family()) {
+            /* [pro] xx
+            xxxx xxxxxxx
+            xxxx xxxx
+            xxxx xxxxxxx
+            xx [/pro] */
+
+            case CUBRID:
+            case DERBY:
+            case FIREBIRD:
+            case H2:
+            case HSQLDB:
+            case MARIADB:
+            case MYSQL:
+            case SQLITE:
+                log.info("SKIPPING", "UPDATE .. FROM integration test. This syntax is not supported by " + dialect());
+                return;
+        }
+
+        jOOQAbstractTest.reset = false;
+
+        switch (dialect().family()) {
+            /* [pro] xx
+            xx xxxxxx xxx xxx xxxxxxx xxxxxxxxxxxxx xx xxxx xxxx xxxxxxx
+            xxxx xxxxxxx
+            xx [/pro] */
+
+            case POSTGRES:
+                Table<B> b1 = TBook().as("b1");
+
+                assertEquals(4,
+                create().update(b1)
+                        .set(b1.field(TBook_TITLE()), concat(TAuthor_FIRST_NAME(), inline(" "), TAuthor_LAST_NAME(), inline(": "), TBook_TITLE()))
+                        .from(TBook().join(
+                            TAuthor()).on(TBook_AUTHOR_ID().eq(TAuthor_ID())
+                                      .and(TBook_ID().lt(5))))
+                        .where(TBook_ID().eq(b1.field(TBook_ID())))
+                        .execute());
+                break;
+
+            /* [pro] xx
+            xxxx xxxxxxxxxx
+            xxxx xxxxxxx
+            xx [/pro] */
+
+            default:
+                assertEquals(4,
+                create().update(TBook())
+                        .set(TBook_TITLE(), concat(TAuthor_FIRST_NAME(), inline(" "), TAuthor_LAST_NAME(), inline(": "), TBook_TITLE()))
+                        .from(TBook().join(
+                            TAuthor()).on(TBook_AUTHOR_ID().eq(TAuthor_ID())
+                                      .and(TBook_ID().lt(5))))
+                        .execute());
+
+                break;
+        }
+
+        Result<B> result =
+        create().selectFrom(TBook())
+                .orderBy(TBook_ID())
+                .fetch();
+
+        assertEquals(BOOK_AUTHOR_IDS, result.getValues(TBook_AUTHOR_ID()));
+        assertEquals(AUTHOR_FIRST_NAMES.get(0) + " " + AUTHOR_LAST_NAMES.get(0) + ": " + BOOK_TITLES.get(0), result.get(0).getValue(TBook_TITLE()));
+        assertEquals(AUTHOR_FIRST_NAMES.get(0) + " " + AUTHOR_LAST_NAMES.get(0) + ": " + BOOK_TITLES.get(1), result.get(1).getValue(TBook_TITLE()));
+        assertEquals(AUTHOR_FIRST_NAMES.get(1) + " " + AUTHOR_LAST_NAMES.get(1) + ": " + BOOK_TITLES.get(2), result.get(2).getValue(TBook_TITLE()));
+        assertEquals(AUTHOR_FIRST_NAMES.get(1) + " " + AUTHOR_LAST_NAMES.get(1) + ": " + BOOK_TITLES.get(3), result.get(3).getValue(TBook_TITLE()));
+    }
 }

jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2009-2013, Data Geekery GmbH (http://www.datageekery.com)
+ * Copyright (c) 2009-2014, Data Geekery GmbH (http://www.datageekery.com)
  * All rights reserved.
  *
  * This work is dual-licensed
@@ -1701,6 +1701,11 @@ public void testUpdateJoin() throws Exception {
         new InsertUpdateTests(this).testUpdateJoin();
     }
 
+    @Test
+    public void testUpdateFrom() throws Exception {
+        new InsertUpdateTests(this).testUpdateFrom();
+    }
+
     @Test
     public void testInsertOnDuplicateKeyUpdate() throws Exception {
         new InsertUpdateTests(this).testInsertOnDuplicateKeyUpdate();