From b60d98ec7e5419eef7249a1a175debfeb34d722d Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Wed, 15 Jun 2022 09:11:47 +0200
Subject: [PATCH] [jOOQ/jOOQ#13671] Oracle doesn't support ORDER BY in UPDATE
 .. SET  correlated subquery

---
 .../main/java/org/jooq/impl/FieldMapForUpdate.java | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldMapForUpdate.java b/jOOQ/src/main/java/org/jooq/impl/FieldMapForUpdate.java
index 37640268d9..f46bef5666 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FieldMapForUpdate.java
+++ b/jOOQ/src/main/java/org/jooq/impl/FieldMapForUpdate.java
@@ -44,13 +44,9 @@ package org.jooq.impl;
 // ...
 // ...
 import static org.jooq.SQLDialect.CUBRID;
-// ...
 import static org.jooq.SQLDialect.DERBY;
 // ...
 import static org.jooq.SQLDialect.FIREBIRD;
-import static org.jooq.SQLDialect.H2;
-// ...
-import static org.jooq.SQLDialect.HSQLDB;
 import static org.jooq.SQLDialect.IGNITE;
 // ...
 // ...
@@ -72,7 +68,6 @@ import static org.jooq.SQLDialect.SQLITE;
 import static org.jooq.SQLDialect.YUGABYTEDB;
 import static org.jooq.conf.WriteIfReadonly.IGNORE;
 import static org.jooq.conf.WriteIfReadonly.THROW;
-import static org.jooq.impl.DSL.field;
 import static org.jooq.impl.DSL.name;
 import static org.jooq.impl.DSL.row;
 import static org.jooq.impl.DSL.select;
@@ -315,18 +310,13 @@ final class FieldMapForUpdate extends AbstractQueryPartMap<FieldOrRow, FieldOrRo
 
                 // Subselects or subselect emulations of row value expressions
                 else if (multiSelect != null) {
-                    Select<?> select;
-
-                    if (multiValue != null)
-                        select = select(removeReadonly(ctx, multiRow, multiValue).fields());
 
 
 
 
-                    else
-                        select = multiSelect;
 
-                    visitSubquery(ctx, select);
+
+                    visitSubquery(ctx, multiSelect);
                 }
             }
         }