db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g.@apache.org
Subject svn commit: r1871735 - in /db/torque/torque4/trunk/torque-templates/src: main/resources/org/apache/torque/templates/doc/html/templates/ test/java/org/apache/torque/templates/ test/resources/org/apache/torque/templates/ test/schema/
Date Wed, 18 Dec 2019 09:51:36 GMT
Author: gk
Date: Wed Dec 18 09:51:36 2019
New Revision: 1871735

URL: http://svn.apache.org/viewvc?rev=1871735&view=rev
Log:
- update schema.xml, added/updated b2 table, contactdata ..
- fix expected data models, which seem to be correct now again - compare src/test/schema.xml
as "ground truth" and TORQUE-358
- enabled again xdoc, html test in TestProcessing

Modified:
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/templates/css.vm
    db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java
    db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-datamodel.css
    db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-datamodel.xml
    db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-derby.sql
    db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-hsqldb.sql
    db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-mssql.sql
    db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-mysql.sql
    db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-oracle.sql
    db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-postgresql.sql
    db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema.html
    db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/templates/css.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/templates/css.vm?rev=1871735&r1=1871734&r2=1871735&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/templates/css.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/templates/css.vm
Wed Dec 18 09:51:36 2019
@@ -15,7 +15,7 @@
 ## specific language governing permissions and limitations
 ## under the License.
 /*
-Copyright 2001-2005 The Apache Software Foundation.
+Copyright 2001-2019 The Apache Software Foundation.
 
 Licensed under the Apache License, Version 2.0 (the "License")
 you may not use this file except in compliance with the License.

Modified: db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java?rev=1871735&r1=1871734&r2=1871735&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java
(original)
+++ db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java
Wed Dec 18 09:51:36 2019
@@ -67,10 +67,10 @@ public class TestProcessing
     public void setUp() throws Exception
     {
         final String testRoot = "target";
-        {
-            final File generatedDocDir = new File(testRoot, "generated-docs");
-            FileUtils.deleteDirectory(generatedDocDir);
-        }
+//        {
+//            final File generatedDocDir = new File(testRoot, "generated-docs");
+//            FileUtils.deleteDirectory(generatedDocDir);
+//        }
         {
             final File generatedSourcesDir = new File(testRoot, "generated-sources");
             FileUtils.deleteDirectory(generatedSourcesDir);
@@ -84,10 +84,10 @@ public class TestProcessing
             final File generatedSqlDir = new File(testRoot, "generated-sql");
             deleteFilesInDirectory(generatedSqlDir);
         }
-        {
-            final File generatedXdocsDir = new File(testRoot, "generated-xdocs");
-            deleteDirectory(generatedXdocsDir);
-        }
+//        {
+//            final File generatedXdocsDir = new File(testRoot, "generated-xdocs");
+//            deleteDirectory(generatedXdocsDir);
+//        }
     }
 
     @Test
@@ -235,7 +235,8 @@ public class TestProcessing
      *
      * @throws Exception
      */
-    @Disabled
+//    @Disabled
+    @Test
     public void testHtmlDocTemplates() throws Exception
     {
         File generationFolder = new File("target/generated-docs");
@@ -294,7 +295,7 @@ public class TestProcessing
      *
      * @throws Exception
      */
-    @Disabled
+    @Test
     public void testXdocTemplates() throws Exception
     {
         File generationFolder = new File("target/generated-xdocs");

Modified: db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-datamodel.css
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-datamodel.css?rev=1871735&r1=1871734&r2=1871735&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-datamodel.css
(original)
+++ db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-datamodel.css
Wed Dec 18 09:51:36 2019
@@ -16,7 +16,7 @@
 ## under the License.
 ##
 /*
-Copyright 2001-2005 The Apache Software Foundation.
+Copyright 2001-2019 The Apache Software Foundation.
 
 Licensed under the Apache License, Version 2.0 (the "License")
 you may not use this file except in compliance with the License.

Modified: db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-datamodel.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-datamodel.xml?rev=1871735&r1=1871734&r2=1871735&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-datamodel.xml
(original)
+++ db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-datamodel.xml
Wed Dec 18 09:51:36 2019
@@ -41,6 +41,11 @@
           <td class="summarybackground summaryborder summarydescription"> B table</td>
         </tr>
         <tr class="summaryrow">
+          <td class="summarybackground summaryborder summarytablename"><a href="#b2"
class="link summarytablenamelink">b2</a></td>
+          <td class="summarybackground summaryborder summaryjavaname">B2</td>
+          <td class="summarybackground summaryborder summarydescription"> B2 table</td>
+        </tr>
+        <tr class="summaryrow">
           <td class="summarybackground summaryborder summarytablename"><a href="#r_ab"
class="link summarytablenamelink">r_ab</a></td>
           <td class="summarybackground summaryborder summaryjavaname">RAb</td>
           <td class="summarybackground summaryborder summarydescription"> r_ab table</td>
@@ -53,7 +58,7 @@
         <tr class="summaryrow">
           <td class="summarybackground summaryborder summarytablename"><a href="#d"
class="link summarytablenamelink">d</a></td>
           <td class="summarybackground summaryborder summaryjavaname">D</td>
-          <td class="summarybackground summaryborder summarydescription"> c table contains
fk to ar_ab, a and b</td>
+          <td class="summarybackground summaryborder summarydescription"> &nbsp;</td>
         </tr>
         <tr class="summaryrow">
           <td class="summarybackground summaryborder summarytablename"><a href="#nopk"
class="link summarytablenamelink">nopk</a></td>
@@ -63,7 +68,7 @@
         <tr class="summaryrow">
           <td class="summarybackground summaryborder summarytablename"><a href="#MULTIPK_SELF_REFTABLE"
class="link summarytablenamelink">MULTIPK_SELF_REFTABLE</a></td>
           <td class="summarybackground summaryborder summaryjavaname">MultipkSelfReftable</td>
-          <td class="summarybackground summaryborder summarydescription"> this table
has no pk</td>
+          <td class="summarybackground summaryborder summarydescription"> &nbsp;</td>
         </tr>
         <tr class="summaryrow">
           <td class="summarybackground summaryborder summarytablename"><a href="#ifc_table"
class="link summarytablenamelink">ifc_table</a></td>
@@ -83,17 +88,17 @@
         <tr class="summaryrow">
           <td class="summarybackground summaryborder summarytablename"><a href="#ext_schema"
class="link summarytablenamelink">ext_schema</a></td>
           <td class="summarybackground summaryborder summaryjavaname">ExtSchema</td>
-          <td class="summarybackground summaryborder summarydescription"> Table to
test inheritance</td>
+          <td class="summarybackground summaryborder summarydescription"> &nbsp;</td>
         </tr>
         <tr class="summaryrow">
           <td class="summarybackground summaryborder summarytablename"><a href="#extext_schema"
class="link summarytablenamelink">extext_schema</a></td>
           <td class="summarybackground summaryborder summaryjavaname">ExtextSchema</td>
-          <td class="summarybackground summaryborder summarydescription"> Table to
test inheritance</td>
+          <td class="summarybackground summaryborder summarydescription"> &nbsp;</td>
         </tr>
         <tr class="summaryrow">
           <td class="summarybackground summaryborder summarytablename"><a href="#torque.qualified_name"
class="link summarytablenamelink">torque.qualified_name</a></td>
           <td class="summarybackground summaryborder summaryjavaname">QualifiedName</td>
-          <td class="summarybackground summaryborder summarydescription"> Table to
test inheritance</td>
+          <td class="summarybackground summaryborder summarydescription"> &nbsp;</td>
         </tr>
       </table>
 
@@ -142,11 +147,24 @@
     </tr>
     <tr class="detailrow">
   
+      <td class="detailbackground detailborder detailname notnull" id="acontactdata">contactdata
+      </td>
+      <td class="detailbackground detailborder detailtype">String</td>
+      <td class="detailbackground detailborder detailsize"> 500 </td>
+      <td class="detailbackground detailborder detaildefault"> &#160;</td>
+      <td class="detailbackground detailborder detailjavaname">Contactdata</td>
+      <td class="detailbackground detailborder detailpk"><center>  &#160;
</center></td>
+      <td class="detailbackground detailborder detailfk"><center>  &#160;
</center></td>
+      <td class="detailbackground detailborder detailnotnull"><center> X </center></td>
+      <td class="detailbackground detailborder detaildescription"> &#160;</td>
+    </tr>
+    <tr class="detailrow">
+  
       <td class="detailbackground detailborder detailname notnull" id="acreated_at">created_at
       </td>
       <td class="detailbackground detailborder detailtype">java.util.Date</td>
       <td class="detailbackground detailborder detailsize detailscale"> 6 </td>
-      <td class="detailbackground detailborder detaildefault"> a_name</td>
+      <td class="detailbackground detailborder detaildefault"> CURRENT_TIMESTAMP</td>
       <td class="detailbackground detailborder detailjavaname">CreatedAt</td>
       <td class="detailbackground detailborder detailpk"><center>  &#160;
</center></td>
       <td class="detailbackground detailborder detailfk"><center>  &#160;
</center></td>
@@ -155,12 +173,25 @@
     </tr>
     <tr class="detailrow">
   
+      <td class="detailbackground detailborder detailname notnull" id="aupdated_at">updated_at
+      </td>
+      <td class="detailbackground detailborder detailtype">java.util.Date</td>
+      <td class="detailbackground detailborder detailsize detailscale"> 6 </td>
+      <td class="detailbackground detailborder detaildefault"> &#160;</td>
+      <td class="detailbackground detailborder detailjavaname">UpdatedAt</td>
+      <td class="detailbackground detailborder detailpk"><center>  &#160;
</center></td>
+      <td class="detailbackground detailborder detailfk"><center>  &#160;
</center></td>
+      <td class="detailbackground detailborder detailnotnull"><center> X </center></td>
+      <td class="detailbackground detailborder detaildescription"> &#160;</td>
+    </tr>
+    <tr class="detailrow">
+  
       <td class="detailbackground detailborder detailname" id="aenum">enum
       </td>
       <td class="detailbackground detailborder detailtype">EnumEnum</td>
       <td class="detailbackground detailborder detailsize"> 50 </td>
       <td class="detailbackground detailborder detaildefault"> x</td>
-      <td class="detailbackground detailborder detailjavaname">Enum</td>
+      <td class="detailbackground detailborder detailjavaname">EnumEnum</td>
       <td class="detailbackground detailborder detailpk"><center>  &#160;
</center></td>
       <td class="detailbackground detailborder detailfk"><center>  &#160;
</center></td>
       <td class="detailbackground detailborder detailnotnull"><center>  &#160;
</center></td>
@@ -213,6 +244,103 @@
     </tr>
   </table>
 </subsection>
+<subsection name="b2">
+  <p>
+    B2 table
+  </p>
+
+  <table class="detailtable">
+    <tr class="detailhead">
+      <th class="detailheadbackground detailborder detailheadname">Name</th>
+      <th class="detailheadbackground detailborder detailheadtype">Type</th>
+      <th class="detailheadbackground detailborder detailheadsize">Size</th>
+      <th class="detailheadbackground detailborder detailheaddefault">Default</th>
+      <th class="detailheadbackground detailborder detailheadjavaname">JavaName</th>
+      <th class="detailheadbackground detailborder detailheadpk">PK</th>
+      <th class="detailheadbackground detailborder detailheadfk">FK</th>
+      <th class="detailheadbackground detailborder detailheadnotnull">not null</th>
+      <th class="detailheadbackground detailborder detailheaddescription">Description</th>
+    </tr>
+    <tr class="detailrow">
+  
+      <td class="detailbackground detailborder detailname primarykey notnull" id="b2b2_id">b2_id
+      </td>
+      <td class="detailbackground detailborder detailtype">int</td>
+      <td class="detailbackground detailborder detailsize"> &#160;</td>
+      <td class="detailbackground detailborder detaildefault"> &#160;</td>
+      <td class="detailbackground detailborder detailjavaname">B2Id</td>
+      <td class="detailbackground detailborder detailpk"><center> X </center></td>
+      <td class="detailbackground detailborder detailfk"><center>  &#160;
</center></td>
+      <td class="detailbackground detailborder detailnotnull"><center> X </center></td>
+      <td class="detailbackground detailborder detaildescription"> &#160;</td>
+    </tr>
+    <tr class="detailrow">
+  
+      <td class="detailbackground detailborder detailname" id="b2b2_id_2">b2_id_2
+      </td>
+      <td class="detailbackground detailborder detailtype">int</td>
+      <td class="detailbackground detailborder detailsize"> &#160;</td>
+      <td class="detailbackground detailborder detaildefault"> &#160;</td>
+      <td class="detailbackground detailborder detailjavaname">B2Id2</td>
+      <td class="detailbackground detailborder detailpk"><center>  &#160;
</center></td>
+      <td class="detailbackground detailborder detailfk"><center>  &#160;
</center></td>
+      <td class="detailbackground detailborder detailnotnull"><center>  &#160;
</center></td>
+      <td class="detailbackground detailborder detaildescription"> &#160;</td>
+    </tr>
+    <tr class="detailrow">
+  
+      <td class="detailbackground detailborder detailname notnull" id="b2b2_name_1">b2_name_1
+      </td>
+      <td class="detailbackground detailborder detailtype">String</td>
+      <td class="detailbackground detailborder detailsize"> 50 </td>
+      <td class="detailbackground detailborder detaildefault"> &#160;</td>
+      <td class="detailbackground detailborder detailjavaname">B2Name1</td>
+      <td class="detailbackground detailborder detailpk"><center>  &#160;
</center></td>
+      <td class="detailbackground detailborder detailfk"><center>  &#160;
</center></td>
+      <td class="detailbackground detailborder detailnotnull"><center> X </center></td>
+      <td class="detailbackground detailborder detaildescription"> &#160;</td>
+    </tr>
+    <tr class="detailrow">
+  
+      <td class="detailbackground detailborder detailname notnull" id="b2b2_name_2">b2_name_2
+      </td>
+      <td class="detailbackground detailborder detailtype">String</td>
+      <td class="detailbackground detailborder detailsize"> 20 </td>
+      <td class="detailbackground detailborder detaildefault"> &#160;</td>
+      <td class="detailbackground detailborder detailjavaname">B2Name2</td>
+      <td class="detailbackground detailborder detailpk"><center>  &#160;
</center></td>
+      <td class="detailbackground detailborder detailfk"><center>  &#160;
</center></td>
+      <td class="detailbackground detailborder detailnotnull"><center> X </center></td>
+      <td class="detailbackground detailborder detaildescription"> &#160;</td>
+    </tr>
+    <tr class="detailrow">
+  
+      <td class="detailbackground detailborder detailname notnull" id="b2b2_name_3">b2_name_3
+      </td>
+      <td class="detailbackground detailborder detailtype">String</td>
+      <td class="detailbackground detailborder detailsize"> 10 </td>
+      <td class="detailbackground detailborder detaildefault"> &#160;</td>
+      <td class="detailbackground detailborder detailjavaname">B2Name3</td>
+      <td class="detailbackground detailborder detailpk"><center>  &#160;
</center></td>
+      <td class="detailbackground detailborder detailfk"><center>  &#160;
</center></td>
+      <td class="detailbackground detailborder detailnotnull"><center> X </center></td>
+      <td class="detailbackground detailborder detaildescription"> &#160;</td>
+    </tr>
+    <tr class="detailrow">
+  
+      <td class="detailbackground detailborder detailname notnull" id="b2b2_name_4">b2_name_4
+      </td>
+      <td class="detailbackground detailborder detailtype">String</td>
+      <td class="detailbackground detailborder detailsize"> 10 </td>
+      <td class="detailbackground detailborder detaildefault"> &#160;</td>
+      <td class="detailbackground detailborder detailjavaname">B2Name4</td>
+      <td class="detailbackground detailborder detailpk"><center>  &#160;
</center></td>
+      <td class="detailbackground detailborder detailfk"><center>  &#160;
</center></td>
+      <td class="detailbackground detailborder detailnotnull"><center> X </center></td>
+      <td class="detailbackground detailborder detaildescription"> &#160;</td>
+    </tr>
+  </table>
+</subsection>
 <subsection name="r_ab">
   <p>
     r_ab table
@@ -397,7 +525,7 @@
         <a href="#r_ab" title="Foreign key to r_ab.b_id" class="link detailforeignkeylink">(fk)</a>
       </td>
       <td class="detailbackground detailborder detailtype">int</td>
-      <td class="detailbackground detailborder detailsize"> 255 </td>
+      <td class="detailbackground detailborder detailsize"> &#160;</td>
       <td class="detailbackground detailborder detaildefault"> &#160;</td>
       <td class="detailbackground detailborder detailjavaname">BId</td>
       <td class="detailbackground detailborder detailpk"><center> X </center></td>
@@ -412,7 +540,7 @@
         <a href="#r_ab" title="Foreign key to r_ab.a_id" class="link detailforeignkeylink">(fk)</a>
       </td>
       <td class="detailbackground detailborder detailtype">int</td>
-      <td class="detailbackground detailborder detailsize"> 255 </td>
+      <td class="detailbackground detailborder detailsize"> &#160;</td>
       <td class="detailbackground detailborder detaildefault"> &#160;</td>
       <td class="detailbackground detailborder detailjavaname">AId</td>
       <td class="detailbackground detailborder detailpk"><center> X </center></td>

Modified: db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-derby.sql
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-derby.sql?rev=1871735&r1=1871734&r2=1871735&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-derby.sql
(original)
+++ db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-derby.sql
Wed Dec 18 09:51:36 2019
@@ -111,6 +111,7 @@ CREATE TABLE b
 CREATE TABLE b2
 (
     b2_id INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+    b2_id_2 INTEGER,
     b2_name_1 VARCHAR(50) NOT NULL,
     b2_name_2 VARCHAR(20) NOT NULL,
     b2_name_3 VARCHAR(10) NOT NULL,

Modified: db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-hsqldb.sql
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-hsqldb.sql?rev=1871735&r1=1871734&r2=1871735&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-hsqldb.sql
(original)
+++ db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-hsqldb.sql
Wed Dec 18 09:51:36 2019
@@ -115,6 +115,7 @@ CREATE TABLE b
 CREATE TABLE b2
 (
     b2_id INTEGER GENERATED BY DEFAULT AS IDENTITY (START WITH 1) NOT NULL,
+    b2_id_2 INTEGER,
     b2_name_1 VARCHAR(50) NOT NULL,
     b2_name_2 VARCHAR(20) NOT NULL,
     b2_name_3 VARCHAR(10) NOT NULL,

Modified: db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-mssql.sql
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-mssql.sql?rev=1871735&r1=1871734&r2=1871735&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-mssql.sql
(original)
+++ db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-mssql.sql
Wed Dec 18 09:51:36 2019
@@ -478,6 +478,7 @@ CREATE TABLE b
 CREATE TABLE b2
 (
     b2_id INT NOT NULL IDENTITY,
+    b2_id_2 INT NULL,
     b2_name_1 VARCHAR(50) NOT NULL,
     b2_name_2 VARCHAR(20) NOT NULL,
     b2_name_3 VARCHAR(10) NOT NULL,

Modified: db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-mysql.sql
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-mysql.sql?rev=1871735&r1=1871734&r2=1871735&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-mysql.sql
(original)
+++ db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-mysql.sql
Wed Dec 18 09:51:36 2019
@@ -72,6 +72,7 @@ CREATE TABLE b
 CREATE TABLE b2
 (
     b2_id INTEGER NOT NULL AUTO_INCREMENT,
+    b2_id_2 INTEGER,
     b2_name_1 VARCHAR(50) NOT NULL,
     b2_name_2 VARCHAR(20) NOT NULL,
     b2_name_3 VARCHAR(10) NOT NULL,

Modified: db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-oracle.sql
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-oracle.sql?rev=1871735&r1=1871734&r2=1871735&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-oracle.sql
(original)
+++ db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-oracle.sql
Wed Dec 18 09:51:36 2019
@@ -129,6 +129,7 @@ CREATE SEQUENCE b_SEQ INCREMENT BY 1 STA
 CREATE TABLE b2
 (
     b2_id NUMBER(10,0)(0) NOT NULL,
+    b2_id_2 NUMBER(10,0)(0),
     b2_name_1 VARCHAR2(50 CHAR) NOT NULL,
     b2_name_2 VARCHAR2(20 CHAR) NOT NULL,
     b2_name_3 VARCHAR2(10 CHAR) NOT NULL,
@@ -402,7 +403,7 @@ COMMENT ON TABLE a IS 'A table';
 COMMENT ON TABLE b IS 'B table';
 
 
-COMMENT ON TABLE b2 IS 'B table';
+COMMENT ON TABLE b2 IS 'B2 table';
 
 
 COMMENT ON TABLE r_ab IS 'r_ab table';

Modified: db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-postgresql.sql
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-postgresql.sql?rev=1871735&r1=1871734&r2=1871735&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-postgresql.sql
(original)
+++ db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-postgresql.sql
Wed Dec 18 09:51:36 2019
@@ -125,6 +125,7 @@ CREATE SEQUENCE b_SEQ INCREMENT BY 1 STA
 CREATE TABLE b2
 (
     b2_id INTEGER NOT NULL,
+    b2_id_2 INTEGER,
     b2_name_1 VARCHAR(50) NOT NULL,
     b2_name_2 VARCHAR(20) NOT NULL,
     b2_name_3 VARCHAR(10) NOT NULL,
@@ -353,7 +354,7 @@ COMMENT ON TABLE a IS 'A table';
 COMMENT ON TABLE b IS 'B table';
 
 
-COMMENT ON TABLE b2 IS 'B table';
+COMMENT ON TABLE b2 IS 'B2 table';
 
 
 COMMENT ON TABLE r_ab IS 'r_ab table';

Modified: db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema.html
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema.html?rev=1871735&r1=1871734&r2=1871735&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema.html
(original)
+++ db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema.html
Wed Dec 18 09:51:36 2019
@@ -39,6 +39,11 @@
       <td class="summarybackground summaryborder summarydescription"> B table</td>
     </tr>
     <tr class=summaryrow">
+      <td class="summarybackground summaryborder summarytablename"><a href="#b2"
class="link summarytablenamelink">b2</a></td>
+      <td class="summarybackground summaryborder summaryjavaname">B2</td>
+      <td class="summarybackground summaryborder summarydescription"> B2 table</td>
+    </tr>
+    <tr class=summaryrow">
       <td class="summarybackground summaryborder summarytablename"><a href="#r_ab"
class="link summarytablenamelink">r_ab</a></td>
       <td class="summarybackground summaryborder summaryjavaname">RAb</td>
       <td class="summarybackground summaryborder summarydescription"> r_ab table</td>
@@ -51,7 +56,7 @@
     <tr class=summaryrow">
       <td class="summarybackground summaryborder summarytablename"><a href="#d"
class="link summarytablenamelink">d</a></td>
       <td class="summarybackground summaryborder summaryjavaname">D</td>
-      <td class="summarybackground summaryborder summarydescription"> c table contains
fk to ar_ab, a and b</td>
+      <td class="summarybackground summaryborder summarydescription"> &nbsp;</td>
     </tr>
     <tr class=summaryrow">
       <td class="summarybackground summaryborder summarytablename"><a href="#nopk"
class="link summarytablenamelink">nopk</a></td>
@@ -61,7 +66,7 @@
     <tr class=summaryrow">
       <td class="summarybackground summaryborder summarytablename"><a href="#MULTIPK_SELF_REFTABLE"
class="link summarytablenamelink">MULTIPK_SELF_REFTABLE</a></td>
       <td class="summarybackground summaryborder summaryjavaname">MultipkSelfReftable</td>
-      <td class="summarybackground summaryborder summarydescription"> this table has
no pk</td>
+      <td class="summarybackground summaryborder summarydescription"> &nbsp;</td>
     </tr>
     <tr class=summaryrow">
       <td class="summarybackground summaryborder summarytablename"><a href="#ifc_table"
class="link summarytablenamelink">ifc_table</a></td>
@@ -81,17 +86,17 @@
     <tr class=summaryrow">
       <td class="summarybackground summaryborder summarytablename"><a href="#ext_schema"
class="link summarytablenamelink">ext_schema</a></td>
       <td class="summarybackground summaryborder summaryjavaname">ExtSchema</td>
-      <td class="summarybackground summaryborder summarydescription"> Table to test
inheritance</td>
+      <td class="summarybackground summaryborder summarydescription"> &nbsp;</td>
     </tr>
     <tr class=summaryrow">
       <td class="summarybackground summaryborder summarytablename"><a href="#extext_schema"
class="link summarytablenamelink">extext_schema</a></td>
       <td class="summarybackground summaryborder summaryjavaname">ExtextSchema</td>
-      <td class="summarybackground summaryborder summarydescription"> Table to test
inheritance</td>
+      <td class="summarybackground summaryborder summarydescription"> &nbsp;</td>
     </tr>
     <tr class=summaryrow">
       <td class="summarybackground summaryborder summarytablename"><a href="#torque.qualified_name"
class="link summarytablenamelink">torque.qualified_name</a></td>
       <td class="summarybackground summaryborder summaryjavaname">QualifiedName</td>
-      <td class="summarybackground summaryborder summarydescription"> Table to test
inheritance</td>
+      <td class="summarybackground summaryborder summarydescription"> &nbsp;</td>
     </tr>
   </table>
 
@@ -139,11 +144,24 @@ A table
   </tr>
   <tr class="detailrow">
   
+    <td class="detailbackground detailborder detailname notnull" id="acontactdata">contactdata
+        </td>
+    <td class="detailbackground detailborder detailtype">String</td>
+    <td class="detailbackground detailborder detailsize"> 500 </td>
+    <td class="detailbackground detailborder detaildefault"> &nbsp;</td>
+    <td class="detailbackground detailborder detailjavaname">Contactdata</td>
+    <td class="detailbackground detailborder detailpk"><center>  &nbsp; </center></td>
+    <td class="detailbackground detailborder detailfk"><center>  &nbsp; </center></td>
+    <td class="detailbackground detailborder detailnotnull"><center> X </center></td>
+    <td class="detailbackground detailborder detaildescription"> &nbsp;</td>
+  </tr>
+  <tr class="detailrow">
+  
     <td class="detailbackground detailborder detailname notnull" id="acreated_at">created_at
         </td>
     <td class="detailbackground detailborder detailtype">java.util.Date</td>
     <td class="detailbackground detailborder detailsize detailscale"> 6 </td>
-    <td class="detailbackground detailborder detaildefault"> a_name</td>
+    <td class="detailbackground detailborder detaildefault"> CURRENT_TIMESTAMP</td>
     <td class="detailbackground detailborder detailjavaname">CreatedAt</td>
     <td class="detailbackground detailborder detailpk"><center>  &nbsp; </center></td>
     <td class="detailbackground detailborder detailfk"><center>  &nbsp; </center></td>
@@ -152,12 +170,25 @@ A table
   </tr>
   <tr class="detailrow">
   
+    <td class="detailbackground detailborder detailname notnull" id="aupdated_at">updated_at
+        </td>
+    <td class="detailbackground detailborder detailtype">java.util.Date</td>
+    <td class="detailbackground detailborder detailsize detailscale"> 6 </td>
+    <td class="detailbackground detailborder detaildefault"> &nbsp;</td>
+    <td class="detailbackground detailborder detailjavaname">UpdatedAt</td>
+    <td class="detailbackground detailborder detailpk"><center>  &nbsp; </center></td>
+    <td class="detailbackground detailborder detailfk"><center>  &nbsp; </center></td>
+    <td class="detailbackground detailborder detailnotnull"><center> X </center></td>
+    <td class="detailbackground detailborder detaildescription"> &nbsp;</td>
+  </tr>
+  <tr class="detailrow">
+  
     <td class="detailbackground detailborder detailname" id="aenum">enum
         </td>
     <td class="detailbackground detailborder detailtype">EnumEnum</td>
     <td class="detailbackground detailborder detailsize"> 50 </td>
     <td class="detailbackground detailborder detaildefault"> x</td>
-    <td class="detailbackground detailborder detailjavaname">Enum</td>
+    <td class="detailbackground detailborder detailjavaname">EnumEnum</td>
     <td class="detailbackground detailborder detailpk"><center>  &nbsp; </center></td>
     <td class="detailbackground detailborder detailfk"><center>  &nbsp; </center></td>
     <td class="detailbackground detailborder detailnotnull"><center>  &nbsp;
</center></td>
@@ -207,6 +238,101 @@ B table
     <td class="detailbackground detailborder detaildescription"> &nbsp;</td>
   </tr>
 </table>
+<a name="b2"/>
+<h2>b2</h2>
+B2 table
+<p/>
+<table class="detailtable">
+  <tr class="detailhead">
+    <th class="detailheadbackground detailborder detailheadname">Name</th>
+    <th class="detailheadbackground detailborder detailheadtype">Type</th>
+    <th class="detailheadbackground detailborder detailheadsize">Size</th>
+    <th class="detailheadbackground detailborder detailheaddefault">Default</th>
+    <th class="detailheadbackground detailborder detailheadjavaname">JavaName</th>
+    <th class="detailheadbackground detailborder detailheadpk">PK</th>
+    <th class="detailheadbackground detailborder detailheadfk">FK</th>
+    <th class="detailheadbackground detailborder detailheadnotnull">not null</th>
+    <th class="detailheadbackground detailborder detailheaddescription">Description</th>
+  </tr>
+  <tr class="detailrow">
+  
+    <td class="detailbackground detailborder detailname primarykey notnull" id="b2b2_id">b2_id
+        </td>
+    <td class="detailbackground detailborder detailtype">int</td>
+    <td class="detailbackground detailborder detailsize"> &nbsp;</td>
+    <td class="detailbackground detailborder detaildefault"> &nbsp;</td>
+    <td class="detailbackground detailborder detailjavaname">B2Id</td>
+    <td class="detailbackground detailborder detailpk"><center> X </center></td>
+    <td class="detailbackground detailborder detailfk"><center>  &nbsp; </center></td>
+    <td class="detailbackground detailborder detailnotnull"><center> X </center></td>
+    <td class="detailbackground detailborder detaildescription"> &nbsp;</td>
+  </tr>
+  <tr class="detailrow">
+  
+    <td class="detailbackground detailborder detailname" id="b2b2_id_2">b2_id_2
+        </td>
+    <td class="detailbackground detailborder detailtype">int</td>
+    <td class="detailbackground detailborder detailsize"> &nbsp;</td>
+    <td class="detailbackground detailborder detaildefault"> &nbsp;</td>
+    <td class="detailbackground detailborder detailjavaname">B2Id2</td>
+    <td class="detailbackground detailborder detailpk"><center>  &nbsp; </center></td>
+    <td class="detailbackground detailborder detailfk"><center>  &nbsp; </center></td>
+    <td class="detailbackground detailborder detailnotnull"><center>  &nbsp;
</center></td>
+    <td class="detailbackground detailborder detaildescription"> &nbsp;</td>
+  </tr>
+  <tr class="detailrow">
+  
+    <td class="detailbackground detailborder detailname notnull" id="b2b2_name_1">b2_name_1
+        </td>
+    <td class="detailbackground detailborder detailtype">String</td>
+    <td class="detailbackground detailborder detailsize"> 50 </td>
+    <td class="detailbackground detailborder detaildefault"> &nbsp;</td>
+    <td class="detailbackground detailborder detailjavaname">B2Name1</td>
+    <td class="detailbackground detailborder detailpk"><center>  &nbsp; </center></td>
+    <td class="detailbackground detailborder detailfk"><center>  &nbsp; </center></td>
+    <td class="detailbackground detailborder detailnotnull"><center> X </center></td>
+    <td class="detailbackground detailborder detaildescription"> &nbsp;</td>
+  </tr>
+  <tr class="detailrow">
+  
+    <td class="detailbackground detailborder detailname notnull" id="b2b2_name_2">b2_name_2
+        </td>
+    <td class="detailbackground detailborder detailtype">String</td>
+    <td class="detailbackground detailborder detailsize"> 20 </td>
+    <td class="detailbackground detailborder detaildefault"> &nbsp;</td>
+    <td class="detailbackground detailborder detailjavaname">B2Name2</td>
+    <td class="detailbackground detailborder detailpk"><center>  &nbsp; </center></td>
+    <td class="detailbackground detailborder detailfk"><center>  &nbsp; </center></td>
+    <td class="detailbackground detailborder detailnotnull"><center> X </center></td>
+    <td class="detailbackground detailborder detaildescription"> &nbsp;</td>
+  </tr>
+  <tr class="detailrow">
+  
+    <td class="detailbackground detailborder detailname notnull" id="b2b2_name_3">b2_name_3
+        </td>
+    <td class="detailbackground detailborder detailtype">String</td>
+    <td class="detailbackground detailborder detailsize"> 10 </td>
+    <td class="detailbackground detailborder detaildefault"> &nbsp;</td>
+    <td class="detailbackground detailborder detailjavaname">B2Name3</td>
+    <td class="detailbackground detailborder detailpk"><center>  &nbsp; </center></td>
+    <td class="detailbackground detailborder detailfk"><center>  &nbsp; </center></td>
+    <td class="detailbackground detailborder detailnotnull"><center> X </center></td>
+    <td class="detailbackground detailborder detaildescription"> &nbsp;</td>
+  </tr>
+  <tr class="detailrow">
+  
+    <td class="detailbackground detailborder detailname notnull" id="b2b2_name_4">b2_name_4
+        </td>
+    <td class="detailbackground detailborder detailtype">String</td>
+    <td class="detailbackground detailborder detailsize"> 10 </td>
+    <td class="detailbackground detailborder detaildefault"> &nbsp;</td>
+    <td class="detailbackground detailborder detailjavaname">B2Name4</td>
+    <td class="detailbackground detailborder detailpk"><center>  &nbsp; </center></td>
+    <td class="detailbackground detailborder detailfk"><center>  &nbsp; </center></td>
+    <td class="detailbackground detailborder detailnotnull"><center> X </center></td>
+    <td class="detailbackground detailborder detaildescription"> &nbsp;</td>
+  </tr>
+</table>
 <a name="r_ab"/>
 <h2>r_ab</h2>
 r_ab table
@@ -386,7 +512,7 @@ c table contains fk to ar_ab, a and b
     <a href="#r_ab" title="Foreign key to r_ab.b_id" class="link detailforeignkeylink">(fk)</a>
         </td>
     <td class="detailbackground detailborder detailtype">int</td>
-    <td class="detailbackground detailborder detailsize"> 255 </td>
+    <td class="detailbackground detailborder detailsize"> &nbsp;</td>
     <td class="detailbackground detailborder detaildefault"> &nbsp;</td>
     <td class="detailbackground detailborder detailjavaname">BId</td>
     <td class="detailbackground detailborder detailpk"><center> X </center></td>
@@ -401,7 +527,7 @@ c table contains fk to ar_ab, a and b
     <a href="#r_ab" title="Foreign key to r_ab.a_id" class="link detailforeignkeylink">(fk)</a>
         </td>
     <td class="detailbackground detailborder detailtype">int</td>
-    <td class="detailbackground detailborder detailsize"> 255 </td>
+    <td class="detailbackground detailborder detailsize"> &nbsp;</td>
     <td class="detailbackground detailborder detaildefault"> &nbsp;</td>
     <td class="detailbackground detailborder detailjavaname">AId</td>
     <td class="detailbackground detailborder detailpk"><center> X </center></td>

Modified: db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml?rev=1871735&r1=1871734&r2=1871735&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml Wed Dec 18 09:51:36
2019
@@ -106,13 +106,18 @@
   <!-- B2  T A B L E                                        -->
   <!-- =================================================== -->
 
-  <table name="b2" description="B table">
+  <table name="b2" description="B2 table">
     <column
       name="b2_id"
       required="true"
       primaryKey="true"
       type="INTEGER"
     />
+     <column
+      name="b2_id_2"
+      required="false"
+      type="INTEGER"
+    />
     <column
       name="b2_name_1"
       required="true"



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message