diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresDatabase.java index fb9e312349..85bcf7ad16 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresDatabase.java @@ -996,9 +996,7 @@ public class PostgresDatabase extends AbstractDatabase implements ResultQueryDat // [#3375] Exclude table-valued functions as they're already generated as tables .join(PG_NAMESPACE).on(PG_NAMESPACE.NSPNAME.eq(r1.SPECIFIC_SCHEMA)) .join(PG_PROC).on(PG_PROC.PRONAMESPACE.eq(PG_NAMESPACE.OID)) - .and(is12() - ? condition("nameconcatoid({0}, {1}) = {2}", PG_PROC.PRONAME, PG_PROC.OID, r1.SPECIFIC_NAME) - : PG_PROC.PRONAME.concat("_").concat(PG_PROC.OID).eq(r1.SPECIFIC_NAME)) + .and(nameconcatoid(r1)) .where(r1.ROUTINE_SCHEMA.in(getInputSchemata())) .and(tableValuedFunctions() ? condition(not(PG_PROC.PRORETSET)) @@ -1013,6 +1011,12 @@ public class PostgresDatabase extends AbstractDatabase implements ResultQueryDat .collect(mapping(r -> new PostgresRoutineDefinition(this, r), Collectors.toList())); } + protected Condition nameconcatoid(Routines r1) { + return is12() + ? condition("nameconcatoid({0}, {1}) = {2}", PG_PROC.PRONAME, PG_PROC.OID, r1.SPECIFIC_NAME) + : PG_PROC.PRONAME.concat("_").concat(PG_PROC.OID).eq(r1.SPECIFIC_NAME); + } + @Override protected List getPackages0() throws SQLException { List result = new ArrayList<>();