mpoeschl 2002/10/26 03:01:35
Modified: src/templates/sql/base/db2 tablefk.vm table.vm foreignkey.vm
Log:
TRQS33: fix foreign key generation statements for db2
Revision Changes Path
1.2 +3 -0 jakarta-turbine-torque/src/templates/sql/base/db2/tablefk.vm
Index: tablefk.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/base/db2/tablefk.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tablefk.vm 2 Aug 2001 05:08:39 -0000 1.1
+++ tablefk.vm 26 Oct 2002 10:01:35 -0000 1.2
@@ -0,0 +1,3 @@
+#set ( $fk = $generator.parse("$basepath/foreignkey.vm", "", "table", $tbl) )
+#if ($fk.length()>0)$fk#end
+
1.2 +25 -25 jakarta-turbine-torque/src/templates/sql/base/db2/table.vm
Index: table.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/base/db2/table.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- table.vm 2 Aug 2001 05:08:39 -0000 1.1
+++ table.vm 26 Oct 2002 10:01:35 -0000 1.2
@@ -1,25 +1,25 @@
-
------------------------------------------------------------------------------
--- $table.Name
------------------------------------------------------------------------------
-$generator.parse("$basepath/drop.vm", "", "table", $tbl)
-CREATE TABLE $table.Name
-(
-#set ( $cols = $generator.parse("$basepath/columns.vm", "", "table", $tbl) )
-#set ( $unique = $generator.parse("$basepath/unique.vm", "", "table", $tbl) )
-#if($strings.allEmpty([$unique]))$strings.chop($cols,2)#else$cols#end
-#if($unique.length()>0)$strings.chop($unique,2)#end
-
-);
-
-#set ( $pk = $generator.parse("$basepath/primarykey.vm", "", "table", $tbl) )
-#if($pk.length()>0)$pk#end
-
-#set ( $fk = $generator.parse("$basepath/foreignkey.vm", "", "table", $tbl) )
-#if ($fk.length()>0)$fk#end
-
-#set ( $index = $generator.parse("$basepath/index.vm", "", "table", $tbl) )
-#if($index.length() > 0)$index#end
-
-##set $sequence = $generator.parse("$basepath/sequence.vm", "", "table", $tbl)
-##if ($sequence.length()>0)$sequence#end
+
+-----------------------------------------------------------------------------
+-- $table.Name
+-----------------------------------------------------------------------------
+$generator.parse("$basepath/drop.vm", "", "table", $tbl)
+CREATE TABLE $table.Name
+(
+#set ( $cols = $generator.parse("$basepath/columns.vm", "", "table", $tbl) )
+#set ( $unique = $generator.parse("$basepath/unique.vm", "", "table", $tbl) )
+#if($strings.allEmpty([$unique]))$strings.chop($cols,2)#else$cols#end
+#if($unique.length()>0)$strings.chop($unique,2)#end
+
+);
+
+#set ( $pk = $generator.parse("$basepath/primarykey.vm", "", "table", $tbl) )
+#if($pk.length()>0)$pk#end
+
+##set ( $fk = $generator.parse("$basepath/foreignkey.vm", "", "table", $tbl) )
+##if ($fk.length()>0)$fk#end
+
+#set ( $index = $generator.parse("$basepath/index.vm", "", "table", $tbl) )
+#if($index.length() > 0)$index#end
+
+##set $sequence = $generator.parse("$basepath/sequence.vm", "", "table", $tbl)
+##if ($sequence.length()>0)$sequence#end
1.4 +10 -0 jakarta-turbine-torque/src/templates/sql/base/db2/foreignkey.vm
Index: foreignkey.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/base/db2/foreignkey.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- foreignkey.vm 26 Sep 2002 14:28:35 -0000 1.3
+++ foreignkey.vm 26 Oct 2002 10:01:35 -0000 1.4
@@ -1,6 +1,16 @@
+
+-----------------------------------------------------------------------------
+-- $table.Name: FOREIGN KEYS
+-----------------------------------------------------------------------------
#foreach ($fk in $table.ForeignKeys)
ALTER TABLE $table.Name
ADD CONSTRAINT $fk.Name FOREIGN KEY ($fk.LocalColumnNames)
REFERENCES $fk.ForeignTableName ($fk.ForeignColumnNames)
+#if ($fk.hasOnUpdate())
+ ON UPDATE $fk.OnUpdate
+#end
+#if ($fk.hasOnDelete())
+ ON DELETE $fk.OnDelete
+#end
;
#end
--
To unsubscribe, e-mail: <mailto:turbine-torque-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:turbine-torque-dev-help@;jakarta.apache.org>
