dobbs 02/05/06 19:28:18
Modified: src/templates/sql/base/postgresql drop.vm foreignkey.vm
index.vm primarykey.vm unique.vm
Log:
patch from Ville Skytt� <ville.skyttaATiki.fi>
The patch below adds support for named foreign keys and unique
constraints in PostgreSQL templates as well as has some minor style
tweaks.
Revision Changes Path
1.2 +3 -3 jakarta-turbine-torque/src/templates/sql/base/postgresql/drop.vm
Index: drop.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/templates/sql/base/postgresql/drop.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- drop.vm 2 Aug 2001 05:08:40 -0000 1.1
+++ drop.vm 7 May 2002 02:28:18 -0000 1.2
@@ -1,4 +1,4 @@
-drop table $table.Name;
+DROP TABLE $table.Name;
#if ($table.IdMethod == "native")
-drop sequence $table.SequenceName;
-#end
\ No newline at end of file
+DROP SEQUENCE $table.SequenceName;
+#end
1.2 +4 -3
jakarta-turbine-torque/src/templates/sql/base/postgresql/foreignkey.vm
Index: foreignkey.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/templates/sql/base/postgresql/foreignkey.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- foreignkey.vm 2 Aug 2001 05:08:40 -0000 1.1
+++ foreignkey.vm 7 May 2002 02:28:18 -0000 1.2
@@ -6,12 +6,13 @@
##
#foreach ($fk in $table.ForeignKeys)
ALTER TABLE $table.Name
-ADD FOREIGN KEY ($fk.LocalColumnNames) REFERENCES $fk.ForeignTableName
($fk.ForeignColumnNames)
+ ADD CONSTRAINT $fk.Name FOREIGN KEY ($fk.LocalColumnNames)
+ REFERENCES $fk.ForeignTableName ($fk.ForeignColumnNames)
#if ($fk.hasOnUpdate())
-ON UPDATE $fk.OnUpdate
+ ON UPDATE $fk.OnUpdate
#end
#if ($fk.hasOnDelete())
-ON DELETE $fk.OnDelete
+ ON DELETE $fk.OnDelete
#end
;
#end
1.5 +1 -1
jakarta-turbine-torque/src/templates/sql/base/postgresql/index.vm
Index: index.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/templates/sql/base/postgresql/index.vm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.vm 22 Aug 2001 02:08:42 -0000 1.4
+++ index.vm 7 May 2002 02:28:18 -0000 1.5
@@ -1,4 +1,4 @@
#foreach ($index in $table.Indices)
-create #if($index.Unique)unique#end INDEX $index.Name on $table.Name
($index.ColumnList);
+CREATE#if($index.Unique) UNIQUE#end INDEX $index.Name ON $table.Name
($index.ColumnList);
#end
1.3 +1 -1
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- primarykey.vm 15 Nov 2001 13:23:46 -0000 1.2
+++ primarykey.vm 7 May 2002 02:28:18 -0000 1.3
@@ -1,3 +1,3 @@
#if ($table.hasPrimaryKey())
- PRIMARY KEY($table.printPrimaryKey()),
+ PRIMARY KEY ($table.printPrimaryKey()),
#end
1.2 +2 -2
jakarta-turbine-torque/src/templates/sql/base/postgresql/unique.vm
Index: unique.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/templates/sql/base/postgresql/unique.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- unique.vm 2 Aug 2001 05:08:40 -0000 1.1
+++ unique.vm 7 May 2002 02:28:18 -0000 1.2
@@ -1,3 +1,3 @@
#foreach ($unique in $table.Unices)
- UNIQUE ($unique.ColumnList),
-#end
\ No newline at end of file
+ CONSTRAINT $unique.Name UNIQUE ($unique.ColumnList),
+#end
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
