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

[jOOQ/jOOQ#11325] PostgreSQL 11 compatible fix

Browse Source
This commit is contained in:
Lukas Eder 2021-01-29 18:18:00 +01:00
parent c8f290cfa3
commit 6a0b4714cd
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,7 @@ import static org.jooq.impl.DSL.replace;
import static org.jooq.impl.DSL.row;
import static org.jooq.impl.DSL.rowNumber;
import static org.jooq.impl.DSL.select;
import static org.jooq.impl.DSL.table;
import static org.jooq.impl.DSL.when;
import static org.jooq.impl.SQLDataType.BIGINT;
import static org.jooq.impl.SQLDataType.BOOLEAN;
@ -171,6 +172,7 @@ public class PostgresDatabase extends AbstractDatabase implements ResultQueryDat
private static Boolean is94;
private static Boolean is10;
private static Boolean is11;
private static Boolean is12;
private static Boolean canUseRoutines;
private static Boolean canCastToEnumType;
private static Boolean canCombineArrays;
@ -926,7 +928,9 @@ 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(oid(PG_NAMESPACE)))
.and("nameconcatoid({0}, {1}) = {2}", PG_PROC.PRONAME, oid(PG_PROC), r1.SPECIFIC_NAME)
.and(is12()
? condition("nameconcatoid({0}, {1}) = {2}", PG_PROC.PRONAME, oid(PG_PROC), r1.SPECIFIC_NAME)
: PG_PROC.PRONAME.concat("_").concat(oid(PG_PROC)).eq(r1.SPECIFIC_NAME))
.where(r1.ROUTINE_SCHEMA.in(getInputSchemata()))
.and(tableValuedFunctions()
? condition(not(PG_PROC.PRORETSET))
@ -1000,6 +1004,15 @@ public class PostgresDatabase extends AbstractDatabase implements ResultQueryDat
return is11;
}
boolean is12() {
// [#11325] nameconcatoid was added in PostgreSQL 12 only
if (is12 == null)
is12 = exists(table(select(field("nameconcatoid({0}, {1})", PG_PROC.PRONAME, oid(PG_PROC))).from(PG_PROC)));
return is12;
}
@Override
protected boolean exists0(TableField<?, ?> field) {
return exists1(field, COLUMNS, COLUMNS.TABLE_SCHEMA, COLUMNS.TABLE_NAME, COLUMNS.COLUMN_NAME);