mpoeschl 01/11/15 05:23:46
Modified: src/templates/sql/base/postgresql primarykey.vm table.vm
Log:
- fixing SQL generation problem where a table has no primary key
Revision Changes Path
1.2 +2 -0
jakarta-turbine-torque/src/templates/sql/base/postgresql/primarykey.vm
Index: primarykey.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/templates/sql/base/postgresql/primarykey.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- primarykey.vm 2001/08/02 05:08:40 1.1
+++ primarykey.vm 2001/11/15 13:23:46 1.2
@@ -1 +1,3 @@
+#if ($table.hasPrimaryKey())
PRIMARY KEY($table.printPrimaryKey()),
+#end
1.2 +1 -1
jakarta-turbine-torque/src/templates/sql/base/postgresql/table.vm
Index: table.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/templates/sql/base/postgresql/table.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- table.vm 2001/08/02 05:08:40 1.1
+++ table.vm 2001/11/15 13:23:46 1.2
@@ -9,7 +9,7 @@
#set ( $pk = $generator.parse("$basepath/primarykey.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,$unique]))$strings.chop($cols,1)#else$cols#end
+#if($strings.allEmpty([$pk,$unique]))$strings.chop($cols,2)#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
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
