jvanzyl 01/11/14 16:56:26
Modified: src/templates/sql/base/mysql primarykey.vm table.vm
Log:
- fixing SQL generation problem where a table has no primary key.
Revision Changes Path
1.3 +2 -0
jakarta-turbine-torque/src/templates/sql/base/mysql/primarykey.vm
Index: primarykey.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/templates/sql/base/mysql/primarykey.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- primarykey.vm 2001/08/16 03:19:58 1.2
+++ primarykey.vm 2001/11/15 00:56:26 1.3
@@ -1 +1,3 @@
+#if ($table.hasPrimaryKey())
PRIMARY KEY($table.printPrimaryKey()),
+#end
1.3 +1 -1 jakarta-turbine-torque/src/templates/sql/base/mysql/table.vm
Index: table.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/base/mysql/table.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- table.vm 2001/08/16 17:39:55 1.2
+++ table.vm 2001/11/15 00:56:26 1.3
@@ -10,7 +10,7 @@
#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,$index]))$strings.chop($cols,1)#else$cols#end
+#if($strings.allEmpty([$pk,$fk,$unique,$index]))$strings.chop($cols,2)#else$cols#end
#if($strings.allEmpty([$fk,$unique,$index]) &&
$pk.length()>0)$strings.chop($pk,2)#else$pk#end
#if($strings.allEmpty([$unique,$index]) && $fk.length()
>0)$strings.chop($fk,2)#else$fk#end
#if($strings.allEmpty([$index]) &&
$unique.length()>0)$strings.chop($unique,2)#else$unique#end
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
