You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by dl...@apache.org on 2001/08/22 22:14:15 UTC
cvs commit: jakarta-turbine-torque/src/templates/sql/base/sybase drop.vm foreignkey.vm
dlr 01/08/22 13:14:15
Modified: src/templates/sql/base/db2 foreignkey.vm
src/templates/sql/base/mssql drop.vm foreignkey.vm
src/templates/sql/base/oracle foreignkey.vm
src/templates/sql/base/sapdb foreignkey.vm
src/templates/sql/base/sybase drop.vm foreignkey.vm
Log:
Better named constraints.
Revision Changes Path
1.2 +1 -1 jakarta-turbine-torque/src/templates/sql/base/db2/foreignkey.vm
Index: foreignkey.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/base/db2/foreignkey.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- foreignkey.vm 2001/08/02 05:08:39 1.1
+++ foreignkey.vm 2001/08/22 20:14:15 1.2
@@ -1,6 +1,6 @@
#foreach ($fk in $table.ForeignKeys)
ALTER TABLE $table.Name
- ADD CONSTRAINT ${table.Name}_FK_${velocityCount} FOREIGN KEY ($fk.LocalColumnNames)
+ ADD CONSTRAINT $fk.Name FOREIGN KEY ($fk.LocalColumnNames)
REFERENCES $fk.ForeignTableName ($fk.ForeignColumnNames)
USING INDEX;
1.2 +2 -2 jakarta-turbine-torque/src/templates/sql/base/mssql/drop.vm
Index: drop.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/base/mssql/drop.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- drop.vm 2001/08/02 05:08:40 1.1
+++ drop.vm 2001/08/22 20:14:15 1.2
@@ -1,6 +1,6 @@
#foreach ($fk in $table.ForeignKeys)
-IF EXISTS (SELECT 1 FROM sysobjects WHERE type ='RI' AND name='${table.Name}_FK_${velocityCount}')
- ALTER TABLE $table.Name DROP CONSTRAINT ${table.Name}_FK_${velocityCount};
+IF EXISTS (SELECT 1 FROM sysobjects WHERE type ='RI' AND name='$fk.Name')
+ ALTER TABLE $table.Name DROP CONSTRAINT $fk.Name;
#end
IF EXISTS (SELECT 1 FROM sysobjects WHERE type = 'U' AND name = '$table.Name')
BEGIN
1.2 +1 -1 jakarta-turbine-torque/src/templates/sql/base/mssql/foreignkey.vm
Index: foreignkey.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/base/mssql/foreignkey.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- foreignkey.vm 2001/08/02 05:08:40 1.1
+++ foreignkey.vm 2001/08/22 20:14:15 1.2
@@ -1,7 +1,7 @@
#foreach ($fk in $table.ForeignKeys)
BEGIN
ALTER TABLE $table.Name
- ADD CONSTRAINT ${table.Name}_FK_${velocityCount} FOREIGN KEY ($fk.LocalColumnNames)
+ ADD CONSTRAINT $fk.Name FOREIGN KEY ($fk.LocalColumnNames)
REFERENCES $fk.ForeignTableName ($fk.ForeignColumnNames)
END
;
1.2 +1 -1 jakarta-turbine-torque/src/templates/sql/base/oracle/foreignkey.vm
Index: foreignkey.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/base/oracle/foreignkey.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- foreignkey.vm 2001/08/02 05:08:40 1.1
+++ foreignkey.vm 2001/08/22 20:14:15 1.2
@@ -1,6 +1,6 @@
#foreach ($fk in $table.ForeignKeys)
ALTER TABLE $table.Name
- ADD CONSTRAINT ${table.Name}_FK_${velocityCount} FOREIGN KEY ($fk.LocalColumnNames)
+ ADD CONSTRAINT $fk.Name FOREIGN KEY ($fk.LocalColumnNames)
REFERENCES $fk.ForeignTableName ($fk.ForeignColumnNames)
;
1.2 +1 -1 jakarta-turbine-torque/src/templates/sql/base/sapdb/foreignkey.vm
Index: foreignkey.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/base/sapdb/foreignkey.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- foreignkey.vm 2001/08/02 05:08:40 1.1
+++ foreignkey.vm 2001/08/22 20:14:15 1.2
@@ -1,6 +1,6 @@
#foreach ($fk in $table.ForeignKeys)
ALTER TABLE $table.Name
- ADD CONSTRAINT ${table.Name}_FK_${velocityCount} FOREIGN KEY ($fk.LocalColumnNames)
+ ADD CONSTRAINT $fk.Name FOREIGN KEY ($fk.LocalColumnNames)
REFERENCES $fk.ForeignTableName ($fk.ForeignColumnNames)
;
1.2 +2 -2 jakarta-turbine-torque/src/templates/sql/base/sybase/drop.vm
Index: drop.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/base/sybase/drop.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- drop.vm 2001/08/02 05:08:40 1.1
+++ drop.vm 2001/08/22 20:14:15 1.2
@@ -1,6 +1,6 @@
#foreach ($fk in $table.ForeignKeys)
-IF EXISTS (SELECT 1 FROM sysobjects WHERE type ='RI' AND name='${table.Name}_FK_${velocityCount}')
- ALTER TABLE $table.Name DROP CONSTRAINT ${table.Name}_FK_${velocityCount};
+IF EXISTS (SELECT 1 FROM sysobjects WHERE type ='RI' AND name='$fk.Name')
+ ALTER TABLE $table.Name DROP CONSTRAINT $fk.Name;
#end
IF EXISTS (SELECT 1 FROM sysobjects WHERE type = 'U' AND name = '$table.Name')
BEGIN
1.2 +1 -1 jakarta-turbine-torque/src/templates/sql/base/sybase/foreignkey.vm
Index: foreignkey.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/base/sybase/foreignkey.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- foreignkey.vm 2001/08/02 05:08:40 1.1
+++ foreignkey.vm 2001/08/22 20:14:15 1.2
@@ -1,7 +1,7 @@
#foreach ($fk in $table.ForeignKeys)
BEGIN
ALTER TABLE $table.Name
- ADD CONSTRAINT ${table.Name}_FK_${velocityCount} FOREIGN KEY ($fk.LocalColumnNames)
+ ADD CONSTRAINT $fk.Name FOREIGN KEY ($fk.LocalColumnNames)
REFERENCES $fk.ForeignTableName ($fk.ForeignColumnNames)
END
;
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org