diff --git a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java index eb7adc1e1c..e716160a3e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java @@ -81,7 +81,8 @@ package org.jooq.impl; import static java.util.Arrays.asList; -import static java.util.Collections.unmodifiableList; +import static java.util.Collections.emptyList; +import static java.util.Collections.singletonList; // ... import static org.jooq.SQLDialect.MARIADB; import static org.jooq.SQLDialect.MYSQL; @@ -493,7 +494,8 @@ final class MetaImpl implements Meta, Serializable { @Override public final List> getKeys() { - return unmodifiableList(asList(getPrimaryKey())); + UniqueKey pk = getPrimaryKey(); + return pk == null ? emptyList() : singletonList(pk); } @Override