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 142b0fba37..c58e30eaa7 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 @@ -793,12 +793,7 @@ public class PostgresDatabase extends AbstractDatabase implements ResultQueryDat ? row(SEQUENCES.SEQUENCE_SCHEMA, SEQUENCES.SEQUENCE_NAME).notIn( select(COLUMNS.TABLE_SCHEMA, COLUMNS.TABLE_NAME.concat(inline("_")).concat(COLUMNS.COLUMN_NAME).concat(inline("_seq"))) .from(COLUMNS) - .where(COLUMNS.COLUMN_DEFAULT.eq( - inline("nextval('").concat(COLUMNS.TABLE_NAME.concat(inline("_")).concat(COLUMNS.COLUMN_NAME)).concat(inline("_seq'::regclass)")) - )) - .or(COLUMNS.COLUMN_DEFAULT.eq( - inline("nextval('").concat(COLUMNS.TABLE_SCHEMA.concat(inline(".")).concat(COLUMNS.TABLE_NAME).concat(inline("_")).concat(COLUMNS.COLUMN_NAME)).concat(inline("_seq'::regclass)")) - )) + .where(columnDefaultFromIdentityExpression()) ) : noCondition()) .unionAll(is10() && getIncludeSystemSequences() @@ -831,6 +826,15 @@ public class PostgresDatabase extends AbstractDatabase implements ResultQueryDat .orderBy(2, 3); } + protected Condition columnDefaultFromIdentityExpression() { + return COLUMNS.COLUMN_DEFAULT.eq( + inline("nextval('").concat(COLUMNS.TABLE_NAME.concat(inline("_")).concat(COLUMNS.COLUMN_NAME)).concat(inline("_seq'::regclass)")) + ) + .or(COLUMNS.COLUMN_DEFAULT.eq( + inline("nextval('").concat(COLUMNS.TABLE_SCHEMA.concat(inline(".")).concat(COLUMNS.TABLE_NAME).concat(inline("_")).concat(COLUMNS.COLUMN_NAME)).concat(inline("_seq'::regclass)")) + )); + } + @Override protected List getSequences0() throws SQLException { List result = new ArrayList<>();