github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#10821] Code generation fails in PostgreSQL when grants for enum types are missing

Browse Source
This commit is contained in:
Lukas Eder 2020-11-05 14:40:55 +01:00
parent 564af3e86a
commit 27bb9dee59
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresDatabase.java
View File

@ -1067,21 +1067,26 @@ public class PostgresDatabase extends AbstractDatabase implements ResultQueryDat
}
private List<String> enumLabels(String nspname, String typname) {
Field<Object> cast = field("{0}::{1}", PG_ENUM.ENUMLABEL, name(nspname, typname));
// [#10821] Avoid the cast if pg_enum.enumsortorder is available (PG 9.1+)
Field<?> orderBy =
exists(PG_ENUM.ENUMSORTORDER)
? PG_ENUM.ENUMSORTORDER
: field("{0}::{1}", PG_ENUM.ENUMLABEL, name(nspname, typname));
if (canCastToEnumType == null) {
// [#2917] Older versions of PostgreSQL don't support the above cast
try {
canCastToEnumType = true;
return enumLabels(nspname, typname, cast);
return enumLabels(nspname, typname, orderBy);
}
catch (DataAccessException e) {
canCastToEnumType = false;
}
}
return canCastToEnumType ? enumLabels(nspname, typname, cast) : enumLabels(nspname, typname, PG_ENUM.ENUMLABEL);
return canCastToEnumType ? enumLabels(nspname, typname, orderBy) : enumLabels(nspname, typname, PG_ENUM.ENUMLABEL);
}
private List<String> enumLabels(String nspname, String typname, Field<?> orderBy) {