jvanzyl 01/05/26 19:53:15
Modified: conf/torque/templates/sql/base/postgresql foreignkey.vm
table.vm tablefk.vm
Log:
- applying patches to postgres torque templates. thanks to eric dobbs.
Following Dave Polito's lead here... moved the foreign key constraints
for postgresql into alter table statements. Two patches and one new
file are attached to prevent linewrapping.
Revision Changes Path
1.2 +5 -2
jakarta-turbine/conf/torque/templates/sql/base/postgresql/foreignkey.vm
Index: foreignkey.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine/conf/torque/templates/sql/base/postgresql/foreignkey.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- foreignkey.vm 2000/11/30 22:08:37 1.1
+++ foreignkey.vm 2001/05/27 02:53:14 1.2
@@ -1,3 +1,6 @@
#foreach ($fk in $table.ForeignKeys)
- FOREIGN KEY ($fk.LocalColumnNames) REFERENCES $fk.ForeignTableName
($fk.ForeignColumnNames),
-#end
+ALTER TABLE $table.Name
+ ADD CONSTRAINT $fk.LocalColumnNames FOREIGN KEY ($fk.LocalColumnNames)
+ REFERENCES $fk.ForeignTableName ($fk.ForeignColumnNames);
+
+#end
\ No newline at end of file
1.5 +2 -4
jakarta-turbine/conf/torque/templates/sql/base/postgresql/table.vm
Index: table.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine/conf/torque/templates/sql/base/postgresql/table.vm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- table.vm 2001/02/27 16:37:43 1.4
+++ table.vm 2001/05/27 02:53:14 1.5
@@ -7,12 +7,10 @@
(
#set ( $cols = $generator.parse("$basepath/columns.vm", "", "table",$tbl) )
#set ( $pk = $generator.parse("$basepath/primarykey.vm", "", "table", $tbl) )
-#set ( $fk = $generator.parse("$basepath/foreignkey.vm", "", "table", $tbl) )
#set ( $unique = $generator.parse("$basepath/unique.vm", "", "table", $tbl) )
#set ( $index = $generator.parse("$basepath/index.vm", "", "table", $tbl) )
-#if($strings.allEmpty([$pk,$fk,$unique]))$strings.chop($cols,1)#else$cols#end
-#if($strings.allEmpty([$fk,$unique]) &&
$pk.length()>0)$strings.chop($pk,2)#else$pk#end
-#if($strings.allEmpty([$unique]) && $fk.length()>0)$strings.chop($fk,2)#else$fk#end
+#if($strings.allEmpty([$pk,$unique]))$strings.chop($cols,1)#else$cols#end
+#if($strings.allEmpty([$unique]) && $pk.length()>0)$strings.chop($pk,2)#else$pk#end
#if($unique.length() > 0)$strings.chop($unique,2)#end
);
1.2 +7 -0
jakarta-turbine/conf/torque/templates/sql/base/postgresql/tablefk.vm
Index: tablefk.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine/conf/torque/templates/sql/base/postgresql/tablefk.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tablefk.vm 2001/04/24 23:18:36 1.1
+++ tablefk.vm 2001/05/27 02:53:14 1.2
@@ -0,0 +1,7 @@
+
+/* ---------------------------------------------------------------------- */
+/* $table.Name */
+/* ---------------------------------------------------------------------- */
+
+#set ( $fk = $generator.parse("$basepath/foreignkey.vm", "", "table", $tbl) )
+#if($fk.length() >0)$fk#end
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
