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

[#3133] Code generation marks all Postgresql Fields as having a default

Browse Source 
value
This commit is contained in:
Lukas Eder 2014-03-19 10:41:42 +01:00
parent ff3f9186cd
commit dc6996d8aa
6 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)
);

2
jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/information_schema.xml
View File

@ -2,7 +2,7 @@
<configuration xmlns="http://www.jooq.org/xsd/jooq-codegen-3.0.0.xsd">
<jdbc>
<driver>org.postgresql.Driver</driver>
<url>jdbc:postgresql:postgres</url>
<url>jdbc:postgresql://localhost:5434/postgres</url>
<schema>information_schema</schema>
<user>postgres</user>
<password>test</password>

2
jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/pg_catalog.xml
View File

@ -2,7 +2,7 @@
<configuration xmlns="http://www.jooq.org/xsd/jooq-codegen-3.0.0.xsd">
<jdbc>
<driver>org.postgresql.Driver</driver>
<url>jdbc:postgresql:postgres</url>
<url>jdbc:postgresql://localhost:5434/postgres</url>
<schema>pg_catalog</schema>
<user>postgres</user>
<password>test</password>

9
jOOQ-test/src/org/jooq/test/_/testcases/MetaDataTests.java
View File

@ -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<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
super(delegate);
}
@Test
public void testMetaFieldTypes() throws Exception {
// [#3133] Check if DEFAULT information is correctly generated
assertFalse(TBook_ID().getDataType().defaulted());
assertTrue(TBook_LANGUAGE_ID().getDataType().defaulted());
}
@Test
public void testMetaModel() throws Exception {

5
jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
View File

@ -1146,6 +1146,11 @@ public abstract class jOOQAbstractTest<
new MetaDataTests(this).testMetaModel();
}
@Test
public void testMetaFieldTypes() throws Exception {
new MetaDataTests(this).testMetaFieldTypes();
}
@Test
public void testMetaData() throws Exception {
new MetaDataTests(this).testMetaData();

2
jOOQ-test/src/org/jooq/test/postgres/create.sql
View File

@ -317,7 +317,7 @@ CREATE TABLE t_book (
details_id INT,
title VARCHAR(400) NOT NULL,
published_in INTEGER NOT NULL,
language_id INTEGER NOT NULL,
language_id INTEGER NOT NULL DEFAULT 1,
content_text TEXT,
content_pdf BYTEA,
status u_book_status,