From 21ea53dac2e5af79e065f49ae2c2c7b58236aabb Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@datageekery.com>
Date: Wed, 5 Jun 2024 15:33:01 +0200
Subject: [PATCH] [jOOQ/jOOQ#16769] Work around BigQuery ORDER BY clause
 limitation where identifiers cannot be resolved if the table and the column
 share the same name

---
 .../java/org/jooq/impl/SelectQueryImpl.java   | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
index 0d5f4e7c87..03b29884a1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
@@ -374,6 +374,8 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
 
 
 
+
+
     static final Set<SQLDialect>         SUPPORT_FULL_WITH_TIES                  = SQLDialect.supportedBy(CLICKHOUSE, H2, MARIADB, POSTGRES, TRINO);
     static final Set<SQLDialect>         EMULATE_DISTINCT_ON                     = SQLDialect.supportedBy(DERBY, FIREBIRD, HSQLDB, MARIADB, MYSQL, SQLITE, TRINO);
     static final Set<SQLDialect>         NO_SUPPORT_FOR_UPDATE_OF_FIELDS         = SQLDialect.supportedBy(MYSQL, POSTGRES, YUGABYTEDB);
@@ -3409,6 +3411,7 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
 
 
 
+    @SuppressWarnings("unchecked")
     private final void toSQLOrderBy(
         final Context<?> ctx,
         final List<Field<?>> originalFields,
@@ -3501,6 +3504,30 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
                         });
                     }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                     ctx.visit(actualOrderBy);
                 }
             }