Author: tfischer
Date: Sat Nov 18 03:36:33 2006
New Revision: 476489
URL: http://svn.apache.org/viewvc?view=rev&rev=476489
Log:
Fixed problem in sql generation of interbase/firebird: extraneous comma appears
if no pk exists in the table.
Modified:
db/torque/templates/trunk/src/templates/sql/base/interbase/table.vm
Modified: db/torque/templates/trunk/src/templates/sql/base/interbase/table.vm
URL:
http://svn.apache.org/viewvc/db/torque/templates/trunk/src/templates/sql/base/interbase/table.vm?view=diff&rev=476489&r1=476488&r2=476489
==============================================================================
--- db/torque/templates/trunk/src/templates/sql/base/interbase/table.vm
(original)
+++ db/torque/templates/trunk/src/templates/sql/base/interbase/table.vm Sat Nov
18 03:36:33 2006
@@ -23,12 +23,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,$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($strings.allEmpty([$unique,$index]) && $fk.length()
>0)$strings.chop($fk,2)#else$fk#end
#if($unique.length()>0)$strings.chop($unique,2)#else$unique#end
);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
