mpoeschl 2002/07/02 18:07:45
Modified: src/templates/sql/base/postgresql table.vm columns.vm
src/templates/sql/load/db2400 val.vm
src/templates/sql/load/hypersonic val.vm
src/templates/sql/load/mssql val.vm
src/templates/sql/load/mysql val.vm
src/templates/sql/load/oracle val.vm
src/templates/sql/load/postgresql val.vm
src/templates/sql/load/sapdb val.vm
src/templates/sql/load/sybase val.vm
src/templates/sql/load/axion val.vm
Log:
patch by Perolo Silantico <[EMAIL PROTECTED]>
* PostgreSQL: old template is dropping sequences but never creating database
sequences
* all SQL: when using CHAR as JDBC type the values do not get enclosed in
quotes '
Revision Changes Path
1.3 +4 -0
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- table.vm 15 Nov 2001 13:23:46 -0000 1.2
+++ table.vm 3 Jul 2002 01:07:45 -0000 1.3
@@ -3,6 +3,9 @@
-- $table.Name
-----------------------------------------------------------------------------
$generator.parse("$basepath/drop.vm", "", "table", $tbl)
+#set ( $sequence = $generator.parse("$basepath/sequence.vm", "", "table", $tbl) )
+#if ($sequence.length()>0)$sequence#end
+
CREATE TABLE $table.Name
(
#set ( $cols = $generator.parse("$basepath/columns.vm", "", "table",$tbl) )
@@ -15,3 +18,4 @@
);
#if($index.length() > 0)$strings.chop($index,1)#end
+
1.3 +5 -1
jakarta-turbine-torque/src/templates/sql/base/postgresql/columns.vm
Index: columns.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/templates/sql/base/postgresql/columns.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- columns.vm 23 Feb 2002 05:48:31 -0000 1.2
+++ columns.vm 3 Jul 2002 01:07:45 -0000 1.3
@@ -9,7 +9,11 @@
#else
#set ( $size = "" )
#end
- #set ( $default = $col.DefaultSetting )
+ #if (($table.IdMethod == "native") && ($col.isPrimaryKey()))
+ #set ( $default = "DEFAULT nextval('$table.SequenceName')" )
+ #else
+ #set ( $default = $col.DefaultSetting )
+ #end
#set ( $nullString = $strings.select($col.isNotNull(),
$dbprops.get("NOTNULL"),"") )
#set ( $entry = "$col.Name $type $size $default $nullString" )
#set ( $autoIncrement = $dbprops.get("AUTOINCREMENT") )
1.3 +1 -1 jakarta-turbine-torque/src/templates/sql/load/db2400/val.vm
Index: val.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/load/db2400/val.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- val.vm 20 May 2002 22:06:48 -0000 1.2
+++ val.vm 3 Jul 2002 01:07:45 -0000 1.3
@@ -1 +1 @@
-#if($column.Column.TorqueType=="VARCHAR" ||
$column.Column.TorqueType=="LONGVARCHAR"||
$column.Column.TorqueType=="DATE")'$column.Value'#else$column.Value#end
+#if($column.Column.TorqueType=="VARCHAR" ||
$column.Column.TorqueType=="LONGVARCHAR"|| $column.Column.TorqueType=="DATE" ||
$column.Column.TorqueType=="CHAR")'$column.Value'#else$column.Value#end
1.4 +1 -1 jakarta-turbine-torque/src/templates/sql/load/hypersonic/val.vm
Index: val.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/load/hypersonic/val.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- val.vm 20 May 2002 22:06:48 -0000 1.3
+++ val.vm 3 Jul 2002 01:07:45 -0000 1.4
@@ -1 +1 @@
-#if($column.Column.TorqueType=="VARCHAR" ||
$column.Column.TorqueType=="LONGVARCHAR"||
$column.Column.TorqueType=="DATE")'$column.Value'#else$column.Value#end
+#if($column.Column.TorqueType=="VARCHAR" ||
$column.Column.TorqueType=="LONGVARCHAR"|| $column.Column.TorqueType=="DATE" ||
$column.Column.TorqueType=="CHAR")'$column.Value'#else$column.Value#end
1.4 +1 -1 jakarta-turbine-torque/src/templates/sql/load/mssql/val.vm
Index: val.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/load/mssql/val.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- val.vm 20 May 2002 22:06:48 -0000 1.3
+++ val.vm 3 Jul 2002 01:07:45 -0000 1.4
@@ -1 +1 @@
-#if($column.Column.TorqueType=="VARCHAR" ||
$column.Column.TorqueType=="LONGVARCHAR"||
$column.Column.TorqueType=="DATE")'$column.Value'#else$column.Value#end
+#if($column.Column.TorqueType=="VARCHAR" ||
$column.Column.TorqueType=="LONGVARCHAR"|| $column.Column.TorqueType=="DATE" ||
$column.Column.TorqueType=="CHAR")'$column.Value'#else$column.Value#end
1.4 +1 -1 jakarta-turbine-torque/src/templates/sql/load/mysql/val.vm
Index: val.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/load/mysql/val.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- val.vm 20 May 2002 22:06:48 -0000 1.3
+++ val.vm 3 Jul 2002 01:07:45 -0000 1.4
@@ -1 +1 @@
-#if($column.Column.TorqueType=="VARCHAR" ||
$column.Column.TorqueType=="LONGVARCHAR"||
$column.Column.TorqueType=="DATE")'$column.Value'#else$column.Value#end
+#if($column.Column.TorqueType=="VARCHAR" ||
$column.Column.TorqueType=="LONGVARCHAR"|| $column.Column.TorqueType=="DATE" ||
$column.Column.TorqueType=="CHAR")'$column.Value'#else$column.Value#end
1.4 +1 -1 jakarta-turbine-torque/src/templates/sql/load/oracle/val.vm
Index: val.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/load/oracle/val.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- val.vm 20 May 2002 22:06:48 -0000 1.3
+++ val.vm 3 Jul 2002 01:07:45 -0000 1.4
@@ -1 +1 @@
-#if($column.Column.TorqueType=="VARCHAR" ||
$column.Column.TorqueType=="LONGVARCHAR"||
$column.Column.TorqueType=="DATE")'$column.Value'#else$column.Value#end
+#if($column.Column.TorqueType=="VARCHAR" ||
$column.Column.TorqueType=="LONGVARCHAR"|| $column.Column.TorqueType=="DATE" ||
$column.Column.TorqueType=="CHAR")'$column.Value'#else$column.Value#end
1.4 +1 -1 jakarta-turbine-torque/src/templates/sql/load/postgresql/val.vm
Index: val.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/load/postgresql/val.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- val.vm 20 May 2002 22:06:48 -0000 1.3
+++ val.vm 3 Jul 2002 01:07:45 -0000 1.4
@@ -1 +1 @@
-#if($column.Column.TorqueType=="VARCHAR" ||
$column.Column.TorqueType=="LONGVARCHAR"||
$column.Column.TorqueType=="DATE")'$column.Value'#else$column.Value#end
+#if($column.Column.TorqueType=="VARCHAR" ||
$column.Column.TorqueType=="LONGVARCHAR"|| $column.Column.TorqueType=="DATE" ||
$column.Column.TorqueType=="CHAR")'$column.Value'#else$column.Value#end
1.3 +1 -1 jakarta-turbine-torque/src/templates/sql/load/sapdb/val.vm
Index: val.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/load/sapdb/val.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- val.vm 20 May 2002 22:06:48 -0000 1.2
+++ val.vm 3 Jul 2002 01:07:45 -0000 1.3
@@ -1 +1 @@
-#if($column.Column.TorqueType=="VARCHAR" ||
$column.Column.TorqueType=="LONGVARCHAR"||
$column.Column.TorqueType=="DATE")'$column.Value'#else$column.Value#end
+#if($column.Column.TorqueType=="VARCHAR" ||
$column.Column.TorqueType=="LONGVARCHAR"|| $column.Column.TorqueType=="DATE" ||
$column.Column.TorqueType=="CHAR")'$column.Value'#else$column.Value#end
1.4 +1 -1 jakarta-turbine-torque/src/templates/sql/load/sybase/val.vm
Index: val.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/load/sybase/val.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- val.vm 20 May 2002 22:06:48 -0000 1.3
+++ val.vm 3 Jul 2002 01:07:45 -0000 1.4
@@ -1 +1 @@
-#if($column.Column.TorqueType=="VARCHAR" ||
$column.Column.TorqueType=="LONGVARCHAR"||
$column.Column.TorqueType=="DATE")'$column.Value'#else$column.Value#end
+#if($column.Column.TorqueType=="VARCHAR" ||
$column.Column.TorqueType=="LONGVARCHAR"|| $column.Column.TorqueType=="DATE" ||
$column.Column.TorqueType=="CHAR")'$column.Value'#else$column.Value#end
1.2 +1 -1 jakarta-turbine-torque/src/templates/sql/load/axion/val.vm
Index: val.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/load/axion/val.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- val.vm 2 Jul 2002 16:18:08 -0000 1.1
+++ val.vm 3 Jul 2002 01:07:45 -0000 1.2
@@ -1 +1 @@
-#if($column.Column.TorqueType=="VARCHAR" ||
$column.Column.TorqueType=="LONGVARCHAR"||
$column.Column.TorqueType=="DATE")'$column.Value'#else$column.Value#end
+#if($column.Column.TorqueType=="VARCHAR" ||
$column.Column.TorqueType=="LONGVARCHAR"|| $column.Column.TorqueType=="DATE" ||
$column.Column.TorqueType=="CHAR")'$column.Value'#else$column.Value#end
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
