diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/PostgresTableDefinition.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/PostgresTableDefinition.java index af02338426..5825f221a3 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/PostgresTableDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/PostgresTableDefinition.java @@ -41,6 +41,7 @@ package org.jooq.util.postgres; +import static org.jooq.tools.StringUtils.isBlank; import static org.jooq.util.postgres.information_schema.Tables.COLUMNS; import java.sql.SQLException; @@ -92,7 +93,7 @@ public class PostgresTableDefinition extends AbstractTableDefinition { record.getValue(COLUMNS.NUMERIC_PRECISION), record.getValue(COLUMNS.NUMERIC_SCALE), record.getValue(COLUMNS.IS_NULLABLE, boolean.class), - record.getValue(COLUMNS.COLUMN_DEFAULT.nvl("")) != null, + !isBlank(record.getValue(COLUMNS.COLUMN_DEFAULT.nvl(""))), record.getValue(COLUMNS.UDT_NAME) ); diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/information_schema.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/information_schema.xml index 5f30e6c33d..3009ba5240 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/information_schema.xml +++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/information_schema.xml @@ -2,7 +2,7 @@ org.postgresql.Driver - jdbc:postgresql:postgres + jdbc:postgresql://localhost:5434/postgres information_schema postgres test diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/pg_catalog.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/pg_catalog.xml index 67ea480045..56b4cbe0e3 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/pg_catalog.xml +++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/pg_catalog.xml @@ -2,7 +2,7 @@ org.postgresql.Driver - jdbc:postgresql:postgres + jdbc:postgresql://localhost:5434/postgres pg_catalog postgres test diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/MetaDataTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/MetaDataTests.java index bb8d934bdb..8da183e055 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/MetaDataTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/MetaDataTests.java @@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.H2; // ... +import static org.junit.Assert.assertFalse; import java.math.BigDecimal; import java.math.BigInteger; @@ -105,6 +106,14 @@ extends BaseTest