From 632059c14578994cca2ae9f22d7bad62b951e709 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Fri, 25 Nov 2022 13:57:59 +0100
Subject: [PATCH] [jOOQ/jOOQ#14300] Expand unqualified asterisk in MySQL when
 it's not leading

---
 jOOQ/src/main/java/org/jooq/impl/AsteriskImpl.java    | 8 ++++----
 jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/AsteriskImpl.java b/jOOQ/src/main/java/org/jooq/impl/AsteriskImpl.java
index 3df1755586..7096d0e944 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AsteriskImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AsteriskImpl.java
@@ -37,22 +37,22 @@
  */
 package org.jooq.impl;
 
+// ...
 // ...
 import static org.jooq.SQLDialect.FIREBIRD;
 import static org.jooq.SQLDialect.H2;
 // ...
+import static org.jooq.SQLDialect.MARIADB;
+import static org.jooq.SQLDialect.MYSQL;
 // ...
 import static org.jooq.impl.Keywords.K_EXCEPT;
 
 import java.util.Arrays;
 import java.util.Set;
-import java.util.function.BiFunction;
-import java.util.function.Predicate;
 
 import org.jooq.Asterisk;
 import org.jooq.Context;
 import org.jooq.Field;
-import org.jooq.Function1;
 import org.jooq.Name;
 import org.jooq.QueryPart;
 // ...
@@ -66,7 +66,7 @@ import org.jooq.impl.QOM.UnmodifiableList;
 final class AsteriskImpl extends AbstractQueryPart implements Asterisk {
     static final AsteriskImpl     INSTANCE                        = new AsteriskImpl(new QueryPartList<>());
     static final Set<SQLDialect>  SUPPORT_NATIVE_EXCEPT           = SQLDialect.supportedBy(H2);
-    static final Set<SQLDialect>  NO_SUPPORT_UNQUALIFIED_COMBINED = SQLDialect.supportedBy(FIREBIRD);
+    static final Set<SQLDialect>  NO_SUPPORT_UNQUALIFIED_COMBINED = SQLDialect.supportedBy(FIREBIRD, MARIADB, MYSQL);
     final QueryPartList<Field<?>> fields;
 
     private AsteriskImpl(QueryPartList<Field<?>> fields) {
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
index 7b9cba84c1..1dcb603212 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
@@ -3766,7 +3766,7 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
             // [#7841] Each iteration must contribute new fields to the result.
             //         Otherwise, we couldn't resolve an asterisk, and must fall
             //         back to determining fields from the ResultSetMetaData
-            if (size == result.size())
+            if (resolveSupported && size == result.size())
                 return new SelectFieldList<>();
             else
                 size = result.size();