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

[#8067] Code generator doesn't generate length on VARCHAR(n) ARRAY types

Browse Source
This commit is contained in:
lukaseder 2018-11-27 13:21:49 +01:00
parent eb2ff899b2
commit e392b4eb65
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
View File

@ -5974,9 +5974,9 @@ public class JavaGenerator extends AbstractGenerator {
db,
type.getSchema(),
baseType.last(),
0,
0,
0,
type.getPrecision(),
type.getScale(),
type.getLength(),
true,
false,
null,

6
jOOQ-meta/src/main/java/org/jooq/meta/hsqldb/HSQLDBTableDefinition.java
View File

@ -80,9 +80,9 @@ public class HSQLDBTableDefinition extends AbstractTableDefinition {
COLUMNS.IDENTITY_GENERATION,
COLUMNS.IS_NULLABLE,
COLUMNS.COLUMN_DEFAULT,
COLUMNS.CHARACTER_MAXIMUM_LENGTH,
COLUMNS.NUMERIC_PRECISION,
COLUMNS.NUMERIC_SCALE,
nvl(ELEMENT_TYPES.CHARACTER_MAXIMUM_LENGTH, COLUMNS.CHARACTER_MAXIMUM_LENGTH).as(COLUMNS.CHARACTER_MAXIMUM_LENGTH),
nvl(ELEMENT_TYPES.NUMERIC_PRECISION, COLUMNS.NUMERIC_PRECISION).as(COLUMNS.NUMERIC_PRECISION),
nvl(ELEMENT_TYPES.NUMERIC_SCALE, COLUMNS.NUMERIC_SCALE).as(COLUMNS.NUMERIC_SCALE),
COLUMNS.UDT_NAME)
.from(COLUMNS)
.leftOuterJoin(ELEMENT_TYPES)

13
jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresTableDefinition.java
View File

@ -38,8 +38,12 @@
package org.jooq.meta.postgres;
import static org.jooq.impl.DSL.inline;
import static org.jooq.impl.DSL.name;
import static org.jooq.impl.DSL.nvl;
import static org.jooq.impl.DSL.when;
import static org.jooq.meta.postgres.information_schema.Tables.COLUMNS;
import static org.jooq.meta.postgres.pg_catalog.Tables.PG_ATTRIBUTE;
import static org.jooq.meta.postgres.pg_catalog.Tables.PG_CLASS;
import static org.jooq.meta.postgres.pg_catalog.Tables.PG_DESCRIPTION;
import static org.jooq.meta.postgres.pg_catalog.Tables.PG_NAMESPACE;
@ -75,7 +79,11 @@ public class PostgresTableDefinition extends AbstractTableDefinition {
COLUMNS.COLUMN_NAME,
COLUMNS.ORDINAL_POSITION,
COLUMNS.DATA_TYPE,
COLUMNS.CHARACTER_MAXIMUM_LENGTH,
// [#8067] A more robust / sophisticated decoding might be available
nvl(
COLUMNS.CHARACTER_MAXIMUM_LENGTH,
when(COLUMNS.UDT_NAME.eq(inline("_varchar")), PG_ATTRIBUTE.ATTTYPMOD.sub(inline(4)))).as(COLUMNS.CHARACTER_MAXIMUM_LENGTH),
COLUMNS.NUMERIC_PRECISION,
COLUMNS.NUMERIC_SCALE,
COLUMNS.IS_NULLABLE,
@ -89,6 +97,9 @@ public class PostgresTableDefinition extends AbstractTableDefinition {
.join(PG_CLASS)
.on(PG_CLASS.RELNAME.eq(COLUMNS.TABLE_NAME))
.and(PG_CLASS.RELNAMESPACE.eq(oid(PG_NAMESPACE)))
.join(PG_ATTRIBUTE)
.on(PG_ATTRIBUTE.ATTRELID.eq(oid(PG_CLASS)))
.and(PG_ATTRIBUTE.ATTNAME.eq(COLUMNS.COLUMN_NAME))
.leftOuterJoin(PG_DESCRIPTION)
.on(PG_DESCRIPTION.OBJOID.eq(oid(PG_CLASS)))
.and(PG_DESCRIPTION.OBJSUBID.eq(COLUMNS.ORDINAL_POSITION))