diff --git a/README.md b/README.md index c0dd15e..d64d06a 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Modify your pom.xml as bellow and adjust necessary parameters: org.db2code java-pojo-generator-mojo - 1.3.6 + 1.3.7 jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;INIT=RUNSCRIPT FROM '${project.basedir}/init.sql' org.h2.Driver @@ -206,23 +206,28 @@ For example TABLE_SCHEM in metadata result set is available as tableSchem attrib #### For CLASS_PER_TABLE strategy - package - className +- isTable +- isView - properties + - isInTable + - isInView + - isNameEqualsId - rawColumn - Data grabbed from ResultSetMetadata.getColumns Consult JDBC javadoc: https://docs.oracle.com/javase/8/docs/api/java/sql/DatabaseMetaData.html#getColumns-java.lang.String-java.lang.String-java.lang.String-java.lang.String- - - tableCat, tableSchem, tableName - - String columnName - - Integer dataType - - String typeName - - Integer columnSize - - Integer decimalDigits - - Integer numPrecRadix - - Integer nullable - - String remarks - - String columnDef - - Integer sqlDataType - - Integer sqlDatetimeSub - - Integer charOctetLength - - Integer ordinalPosition - - String isNullable + - tableCat, tableSchem, tableName + - String columnName + - Integer dataType + - String typeName + - Integer columnSize + - Integer decimalDigits + - Integer numPrecRadix + - Integer nullable + - String remarks + - String columnDef + - Integer sqlDataType + - Integer sqlDatetimeSub + - Integer charOctetLength + - Integer ordinalPosition + - String isNullable - propertyType as resolved using typeMapFile configuration - propertyName - methodName @@ -305,7 +310,7 @@ For example TABLE_SCHEM in metadata result set is available as tableSchem attrib - parameters in case of procedure - singleParameterReturn , parameter in case of procedure - inputParameters in case of procedure -- + #### For SINGLE_FILE strategy - targetPackage - classes - see above all CLASS_PER_TABLE object is exposed diff --git a/core/pom.xml b/core/pom.xml index 6c43ef1..6b664d7 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -6,7 +6,7 @@ org.db2code DB2Code - 1.3.6 + 1.3.7 core diff --git a/java-pojo-generator-abstract-tool/pom.xml b/java-pojo-generator-abstract-tool/pom.xml index d89e1da..2c18421 100644 --- a/java-pojo-generator-abstract-tool/pom.xml +++ b/java-pojo-generator-abstract-tool/pom.xml @@ -6,7 +6,7 @@ org.db2code DB2Code - 1.3.6 + 1.3.7 @@ -22,7 +22,7 @@ org.db2code java-pojo-generator - 1.3.6 + 1.3.7 org.projectlombok diff --git a/java-pojo-generator-cmd/pom.xml b/java-pojo-generator-cmd/pom.xml index 398960b..5442bcc 100644 --- a/java-pojo-generator-cmd/pom.xml +++ b/java-pojo-generator-cmd/pom.xml @@ -6,7 +6,7 @@ org.db2code DB2Code - 1.3.6 + 1.3.7 java-pojo-generator-cmd @@ -21,7 +21,7 @@ org.db2code java-pojo-generator-abstract-tool - 1.3.6 + 1.3.7 diff --git a/java-pojo-generator-mojo-example/pom.xml b/java-pojo-generator-mojo-example/pom.xml index 16ef9e4..92aa1e7 100644 --- a/java-pojo-generator-mojo-example/pom.xml +++ b/java-pojo-generator-mojo-example/pom.xml @@ -6,7 +6,7 @@ org.db2code DB2Code - 1.3.6 + 1.3.7 java-pojo-generator-mojo-example @@ -66,7 +66,7 @@ org.db2code java-pojo-generator-mojo - 1.3.6 + 1.3.7 exportMetadata diff --git a/java-pojo-generator-mojo/pom.xml b/java-pojo-generator-mojo/pom.xml index 83fa6d1..12b83a4 100644 --- a/java-pojo-generator-mojo/pom.xml +++ b/java-pojo-generator-mojo/pom.xml @@ -6,7 +6,7 @@ org.db2code DB2Code - 1.3.6 + 1.3.7 @@ -22,7 +22,7 @@ org.db2code java-pojo-generator - 1.3.6 + 1.3.7 org.apache.maven @@ -48,7 +48,7 @@ org.db2code java-pojo-generator-abstract-tool - 1.3.6 + 1.3.7 compile diff --git a/java-pojo-generator/pom.xml b/java-pojo-generator/pom.xml index 7b57780..925072a 100644 --- a/java-pojo-generator/pom.xml +++ b/java-pojo-generator/pom.xml @@ -6,7 +6,7 @@ org.db2code DB2Code - 1.3.6 + 1.3.7 java-pojo-generator @@ -37,7 +37,7 @@ org.db2code core - 1.3.6 + 1.3.7 compile diff --git a/java-pojo-generator/src/main/java/org/db2code/generator/java/pojo/adapter/DefaultClassAdapter.java b/java-pojo-generator/src/main/java/org/db2code/generator/java/pojo/adapter/DefaultClassAdapter.java index c9a2a40..b862e75 100644 --- a/java-pojo-generator/src/main/java/org/db2code/generator/java/pojo/adapter/DefaultClassAdapter.java +++ b/java-pojo-generator/src/main/java/org/db2code/generator/java/pojo/adapter/DefaultClassAdapter.java @@ -70,6 +70,14 @@ public String getPackage() { return targetPackage; } + public Boolean getIsView() { + return rawTable.getTableType().equalsIgnoreCase("VIEW"); + } + + public Boolean getIsTable() { + return rawTable.getTableType().equalsIgnoreCase("TABLE"); + } + public Collection getProperties() { return properties; } diff --git a/java-pojo-generator/src/main/java/org/db2code/generator/java/pojo/adapter/PropertyAdapter.java b/java-pojo-generator/src/main/java/org/db2code/generator/java/pojo/adapter/PropertyAdapter.java index 0679d92..425e42c 100644 --- a/java-pojo-generator/src/main/java/org/db2code/generator/java/pojo/adapter/PropertyAdapter.java +++ b/java-pojo-generator/src/main/java/org/db2code/generator/java/pojo/adapter/PropertyAdapter.java @@ -79,6 +79,18 @@ public boolean getIsId() { return primaryKeyColumns.contains(rawColumn.getColumnName()); } + public boolean getIsNameEqualsId() { + return rawColumn.getColumnName().equalsIgnoreCase("ID"); + } + + public Boolean getIsInView() { + return rawTable.getTableType().equalsIgnoreCase("VIEW"); + } + + public Boolean getIsInTable() { + return rawTable.getTableType().equalsIgnoreCase("TABLE"); + } + public Boolean getIsNullable() { return "YES".equals(rawColumn.getIsNullable()) ? Boolean.TRUE diff --git a/pom.xml b/pom.xml index abbb0da..485aa44 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.db2code DB2Code - 1.3.6 + 1.3.7 pom DB2Code - code generator from database metadata Puts database metadata into intermediate objects and invokes mustache template to generate code,