Merge pull request #34 from alberlau/fix/expose-adapter-props

Add isTable, isView and isNameEqualsI adapter props
alberlau · Apr 10, 2024 · 812be99 · 812be99
2 parents 1442fcb + b5d03e0
commit 812be99
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ Modify your pom.xml as bellow and adjust necessary parameters:
             <plugin>
                 <groupId>org.db2code</groupId>
                 <artifactId>java-pojo-generator-mojo</artifactId>
-                <version>1.3.6</version>
+                <version>1.3.7</version>
                 <configuration>
                     <jdbcUrl>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;INIT=RUNSCRIPT FROM '${project.basedir}/init.sql'</jdbcUrl>
                     <jdbcClassName>org.h2.Driver</jdbcClassName>
@@ -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
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.db2code</groupId>
         <artifactId>DB2Code</artifactId>
-        <version>1.3.6</version>
+        <version>1.3.7</version>
     </parent>
 
     <artifactId>core</artifactId>

diff --git a/java-pojo-generator-abstract-tool/pom.xml b/java-pojo-generator-abstract-tool/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.db2code</groupId>
         <artifactId>DB2Code</artifactId>
-        <version>1.3.6</version>
+        <version>1.3.7</version>
     </parent>
 
     <properties>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.db2code</groupId>
             <artifactId>java-pojo-generator</artifactId>
-            <version>1.3.6</version>
+            <version>1.3.7</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

diff --git a/java-pojo-generator-cmd/pom.xml b/java-pojo-generator-cmd/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.db2code</groupId>
         <artifactId>DB2Code</artifactId>
-        <version>1.3.6</version>
+        <version>1.3.7</version>
     </parent>
 
     <artifactId>java-pojo-generator-cmd</artifactId>
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>org.db2code</groupId>
             <artifactId>java-pojo-generator-abstract-tool</artifactId>
-            <version>1.3.6</version>
+            <version>1.3.7</version>
         </dependency>
 
         <dependency>

diff --git a/java-pojo-generator-mojo-example/pom.xml b/java-pojo-generator-mojo-example/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.db2code</groupId>
         <artifactId>DB2Code</artifactId>
-        <version>1.3.6</version>
+        <version>1.3.7</version>
     </parent>
 
     <artifactId>java-pojo-generator-mojo-example</artifactId>
@@ -66,7 +66,7 @@
             <plugin>
                 <groupId>org.db2code</groupId>
                 <artifactId>java-pojo-generator-mojo</artifactId>
-                <version>1.3.6</version>
+                <version>1.3.7</version>
                 <executions>
                     <execution>
                         <id>exportMetadata</id>

diff --git a/java-pojo-generator-mojo/pom.xml b/java-pojo-generator-mojo/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.db2code</groupId>
         <artifactId>DB2Code</artifactId>
-        <version>1.3.6</version>
+        <version>1.3.7</version>
     </parent>
 
     <properties>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.db2code</groupId>
             <artifactId>java-pojo-generator</artifactId>
-            <version>1.3.6</version>
+            <version>1.3.7</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>org.db2code</groupId>
             <artifactId>java-pojo-generator-abstract-tool</artifactId>
-            <version>1.3.6</version>
+            <version>1.3.7</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/java-pojo-generator/pom.xml b/java-pojo-generator/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.db2code</groupId>
         <artifactId>DB2Code</artifactId>
-        <version>1.3.6</version>
+        <version>1.3.7</version>
     </parent>
 
     <artifactId>java-pojo-generator</artifactId>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.db2code</groupId>
             <artifactId>core</artifactId>
-            <version>1.3.6</version>
+            <version>1.3.7</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/...-generator/src/main/java/org/db2code/generator/java/pojo/adapter/DefaultClassAdapter.java b/...-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<PropertyAdapter> getProperties() {
         return properties;
     }

diff --git a/...pojo-generator/src/main/java/org/db2code/generator/java/pojo/adapter/PropertyAdapter.java b/...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
@@ -14,7 +14,7 @@
 
     <groupId>org.db2code</groupId>
     <artifactId>DB2Code</artifactId>
-    <version>1.3.6</version>
+    <version>1.3.7</version>
     <packaging>pom</packaging>
     <name>DB2Code - code generator from database metadata</name>
     <description>Puts database metadata into intermediate objects and invokes mustache template to generate code,