diff --git a/jOOQ/src/main/java/org/jooq/impl/AsteriskImpl.java b/jOOQ/src/main/java/org/jooq/impl/AsteriskImpl.java index 414d098cd0..40fe3bdc4d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AsteriskImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AsteriskImpl.java @@ -47,7 +47,9 @@ import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.MARIADB; import static org.jooq.SQLDialect.MYSQL; // ... +// ... import static org.jooq.impl.Keywords.K_EXCEPT; +import static org.jooq.impl.Keywords.K_EXCLUDE; import java.util.Arrays; import java.util.Set; @@ -55,6 +57,7 @@ import java.util.Set; import org.jooq.Asterisk; import org.jooq.Context; import org.jooq.Field; +import org.jooq.Keyword; import org.jooq.Name; // ... import org.jooq.QueryPart; @@ -106,6 +109,20 @@ final class AsteriskImpl extends AbstractQueryPart implements Asterisk { ctx.sql(' ').visit(K_EXCEPT).sql(" (").visit(fields).sql(')'); } + + + + + + + + + + + + + + @Override public final Asterisk except(String... fieldNames) { return except(Tools.fieldsByName(fieldNames)); diff --git a/jOOQ/src/main/java/org/jooq/impl/GroupFieldList.java b/jOOQ/src/main/java/org/jooq/impl/GroupFieldList.java index 7659d543b3..9e49c0cfad 100644 --- a/jOOQ/src/main/java/org/jooq/impl/GroupFieldList.java +++ b/jOOQ/src/main/java/org/jooq/impl/GroupFieldList.java @@ -56,6 +56,7 @@ import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; // ... // ... +// ... import static org.jooq.SQLDialect.SQLITE; // ... // ... @@ -64,7 +65,6 @@ import static org.jooq.impl.DSL.emptyGroupingSet; import java.util.Set; -import org.jooq.Condition; import org.jooq.Context; import org.jooq.Field; import org.jooq.GroupField; diff --git a/jOOQ/src/main/java/org/jooq/impl/QualifiedAsteriskImpl.java b/jOOQ/src/main/java/org/jooq/impl/QualifiedAsteriskImpl.java index 48baa3fb7b..58540f7249 100644 --- a/jOOQ/src/main/java/org/jooq/impl/QualifiedAsteriskImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/QualifiedAsteriskImpl.java @@ -40,12 +40,9 @@ package org.jooq.impl; import static org.jooq.impl.Keywords.K_EXCEPT; import java.util.Arrays; -import java.util.function.BiFunction; -import java.util.function.Predicate; import org.jooq.Context; import org.jooq.Field; -import org.jooq.Function1; import org.jooq.Name; import org.jooq.QualifiedAsterisk; import org.jooq.QueryPart;