mpoeschl 2002/11/19 11:12:46
Modified: src/templates/sql/base/postgresql columns.vm
xdocs changes.xml
src/rttest test-schema.xml
Log:
TRQS77: Incosistent generation errors
Revision Changes Path
1.4 +13 -13
jakarta-turbine-torque/src/templates/sql/base/postgresql/columns.vm
Index: columns.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/templates/sql/base/postgresql/columns.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- columns.vm 3 Jul 2002 01:07:45 -0000 1.3
+++ columns.vm 19 Nov 2002 19:12:46 -0000 1.4
@@ -22,22 +22,22 @@
## the following works if you want to inline your foreign keys
## if you turn it on, be sure to comment out foreignkey.vm
#if (false)
-#if ($col.isForeignKey())
-#set ($fk = $col.ForeignKey)
-#set ($entry = "$entry REFERENCES $fk.ForeignTableName ($fk.ForeignColumnNames)")
-#if ($fk.hasOnUpdate())
-#set ($entry = "$entry ON UPDATE $fk.OnUpdate ")
-#end
-#if ($fk.hasOnDelete())
-#set ($entry = "$entry ON DELETE $fk.OnDelete ")
-#end
-#end
+ #if ($col.isForeignKey())
+ #set ($fk = $col.ForeignKey)
+ #set ($entry = "$entry REFERENCES $fk.ForeignTableName
($fk.ForeignColumnNames)")
+ #if ($fk.hasOnUpdate())
+ #set ($entry = "$entry ON UPDATE $fk.OnUpdate ")
+ #end
+ #if ($fk.hasOnDelete())
+ #set ($entry = "$entry ON DELETE $fk.OnDelete ")
+ #end
+ #end
#end
-#set ( $entry = $strings.collapseSpaces("$entry,") )
- $strings.sub($entry," ,",",")
## add a nice comment
#if ($col.isForeignKey())
-#set ($fk = $col.ForeignKey)
+ #set ($fk = $col.ForeignKey)
-- REFERENCES $fk.ForeignTableName ($fk.ForeignColumnNames)
#end
+#set ( $entry = $strings.collapseSpaces("$entry,") )
+ $strings.sub($entry," ,",",")
#end
1.52 +3 -0 jakarta-turbine-torque/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/xdocs/changes.xml,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- changes.xml 19 Nov 2002 15:15:18 -0000 1.51
+++ changes.xml 19 Nov 2002 19:12:46 -0000 1.52
@@ -61,6 +61,9 @@
TRQS75: Object.vm generates files which will not compile.
</li>
<li>
+ TRQS77: postgres - Incosistent generation errors
+ </li>
+ <li>
When generating an XML schema from a SQL Schema, the output xml
contains a javaname attribute (notice the lowercase "n" in javaname)
</li>
1.5 +26 -0 jakarta-turbine-torque/src/rttest/test-schema.xml
Index: test-schema.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/rttest/test-schema.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- test-schema.xml 19 Nov 2002 17:36:40 -0000 1.4
+++ test-schema.xml 19 Nov 2002 19:12:46 -0000 1.5
@@ -28,6 +28,32 @@
<column name="col_b" type="BOOLEANINT" javaType="object" />
</table>
+ <!-- TRQS77 -->
+ <table name="course">
+ <column name="id" required="true" primaryKey="true" type="INTEGER" />
+ <column name="col_a" type="CHAR" size="5" />
+ </table>
+
+ <table name="course_number" description="Number for a course">
+ <column name="course_id" required="true" type="INTEGER"/>
+ <column name="number" required="true" type="INTEGER"/>
+
+ <foreign-key foreignTable="course"
+ onDelete="cascade" onUpdate="cascade">
+ <reference local="course_id" foreign="id"/>
+ </foreign-key>
+ </table>
+
+ <table name="course_number1" description="Number for a course">
+ <column name="number" required="true" type="INTEGER"/>
+ <column name="course_id" required="true" type="INTEGER"/>
+
+ <foreign-key foreignTable="course"
+ onDelete="cascade" onUpdate="cascade">
+ <reference local="course_id" foreign="id"/>
+ </foreign-key>
+ </table>
+
</database>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
