From 1b344e8693ccda992b30034044c459420a4ef229 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@datageekery.com>
Date: Wed, 7 Aug 2024 14:15:48 +0200
Subject: [PATCH] [jOOQ/jOOQ#17021] Add BigQuery support for CREATE TABLE from
 a SELECT

---
 .../src/main/java/org/jooq/impl/SelectQueryImpl.java | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
index b4ad0c72c5..476e741e85 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
@@ -2455,6 +2455,9 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
         });
         ConditionProviderImpl where = new ConditionProviderImpl();
 
+        if (TRUE.equals(context.data().get(BooleanDataKey.DATA_SELECT_NO_DATA)))
+            where.addConditions(falseCondition());
+
         // [#14985] [#15755] Add skipped join segments from path joins
         tablelist = prependPathJoins(context, where, tablelist);
 
@@ -2658,14 +2661,7 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
         // ------------
         context.start(SELECT_WHERE);
 
-        if (TRUE.equals(context.data().get(BooleanDataKey.DATA_SELECT_NO_DATA)))
-            context.formatSeparator()
-                   .visit(K_WHERE)
-                   .sql(' ')
-                   .visit(falseCondition());
-        else if (!where.hasWhere() && semiAntiJoinPredicates == null && !TRUE.equals(context.data().get(BooleanDataKey.DATA_MANDATORY_WHERE_CLAUSE)))
-            ;
-        else {
+        if (where.hasWhere() || semiAntiJoinPredicates != null || TRUE.equals(context.data().get(BooleanDataKey.DATA_MANDATORY_WHERE_CLAUSE))) {
             ConditionProviderImpl actual = new ConditionProviderImpl();
 
             if (semiAntiJoinPredicates != null)