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 f9e27c8783..e77cc0a5c3 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 @@ -849,6 +849,7 @@ public class PostgresDatabase extends AbstractDatabase implements ResultQueryDat "domain_id", "base_id", "typbasetype", + "conname", "src" ) .as( @@ -856,6 +857,7 @@ public class PostgresDatabase extends AbstractDatabase implements ResultQueryDat d.OID, d.OID, d.TYPBASETYPE, + c.CONNAME, when(c.OID.isNotNull(), array(constraintDef)) ) .from(d) @@ -868,6 +870,7 @@ public class PostgresDatabase extends AbstractDatabase implements ResultQueryDat field(name("domains", "domain_id"), Long.class), d.OID, d.TYPBASETYPE, + c.CONNAME, decode() .when(c.CONBIN.isNull(), src) .otherwise(arrayAppend(src, constraintDef)) @@ -903,7 +906,7 @@ public class PostgresDatabase extends AbstractDatabase implements ResultQueryDat .on(field(name("domains", "base_id")).eq(b.OID)) .where(d.TYPTYPE.eq("d")) .and(d.pgNamespace().NSPNAME.in(getInputSchemata())) - .orderBy(d.pgNamespace().NSPNAME, d.TYPNAME) + .orderBy(d.pgNamespace().NSPNAME, d.TYPNAME, field(name("domains", "conname"))) ) { String schemaName = record.get(d.pgNamespace().NSPNAME);