From 5cd280e9d440696878c69f2b527dac552a42363d Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Mon, 5 Feb 2018 10:47:48 +0100
Subject: [PATCH] [#6485] Added parser support for UPDATE .. FROM

---
 .../main/java/org/jooq/impl/ParserImpl.java   | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
index 7f57e3fc0f..7ffd26e323 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -352,8 +352,10 @@ import org.jooq.TruncateCascadeStep;
 import org.jooq.TruncateFinalStep;
 import org.jooq.TruncateIdentityStep;
 import org.jooq.Update;
+import org.jooq.UpdateFromStep;
 import org.jooq.UpdateReturningStep;
 import org.jooq.UpdateSetFirstStep;
+import org.jooq.UpdateWhereStep;
 import org.jooq.User;
 // ...
 import org.jooq.WindowBeforeOverStep;
@@ -1192,18 +1194,20 @@ final class ParserImpl implements Parser {
 
         // TODO Row value expression updates
         Map<Field<?>, Object> map = parseSetClauseList(ctx);
+        UpdateFromStep<?> s2 = s1.set(map);
+        UpdateWhereStep<?> s3 =
+              parseKeywordIf(ctx, "FROM")
+            ? s2.from(parseTables(ctx))
+            : s2;
 
-        // TODO support FROM
-        Condition condition = parseKeywordIf(ctx, "WHERE") ? parseCondition(ctx) : null;
+        UpdateReturningStep<?> s4 =
+              parseKeywordIf(ctx, "WHERE")
+            ? s3.where(parseCondition(ctx))
+            : s3;
 
-        UpdateReturningStep<?> s2 = condition == null
-            ? s1.set(map)
-            : s1.set(map).where(condition);
-
-        if (parseKeywordIf(ctx, "RETURNING"))
-            return s2.returning(parseSelectList(ctx));
-        else
-            return s2;
+        return parseKeywordIf(ctx, "RETURNING")
+            ? s4.returning(parseSelectList(ctx))
+            : s4;
     }
 
     private static final Map<Field<?>, Object> parseSetClauseList(ParserContext ctx) {