From 03959618aca983d96500d207b92793df306d29a2 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 5 Sep 2023 10:14:29 +0200 Subject: [PATCH] [jOOQ/jOOQ#12083] [jOOQ/jOOQ#15546] SQL Server implementation --- jOOQ/src/main/java/org/jooq/impl/MetaImpl.java | 14 +++++++++++++- jOOQ/src/main/java/org/jooq/impl/MetaSQL.java | 7 +++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java index 6ebc70914b..c6357e0460 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java @@ -106,6 +106,7 @@ import org.jooq.DataType; import org.jooq.Field; import org.jooq.ForeignKey; import org.jooq.Index; +import org.jooq.InverseForeignKey; import org.jooq.Meta; import org.jooq.Name; // ... @@ -720,6 +721,10 @@ final class MetaImpl extends AbstractMeta { return null; } + final String comment(String tableName) { + return comment(tableName, null); + } + final String comment(String tableName, String columnName) { if (commentCache == null) { String sql = M_COMMENTS(family()); @@ -824,7 +829,14 @@ final class MetaImpl extends AbstractMeta { private final Result uks; MetaTable(String name, MetaSchema schema, Result columns, Result uks, String remarks, TableType tableType) { - super(name(name), schema, null, (ForeignKey) null, null, null, comment(remarks), tableOption(dsl(), schema, name, tableType)); + super( + name(name), + schema, + null, (ForeignKey) null, (InverseForeignKey) null, null, null, + comment(remarks != null ? remarks : schema.comment(name, null)), + tableOption(dsl(), schema, name, tableType), + null + ); this.schema = schema; this.uks = uks; diff --git a/jOOQ/src/main/java/org/jooq/impl/MetaSQL.java b/jOOQ/src/main/java/org/jooq/impl/MetaSQL.java index d9af15eede..748d6a6a24 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MetaSQL.java +++ b/jOOQ/src/main/java/org/jooq/impl/MetaSQL.java @@ -327,6 +327,13 @@ final class MetaSQL { + + + + + + +