jmcnally 02/05/20 15:05:33
Modified: src/templates/sql/id-table Control.vm idtable.db2
idtable.db2400 idtable.hypersonic idtable.interbase
idtable.mssql idtable.mysql idtable.oracle
idtable.postgresql idtable.sapdb idtable.sybase
Log:
patch by Will Glass-Husain <[EMAIL PROTECTED]>
templates/sql/id-table/Control.vm.
Changes the id_table_id in the id table to start at 1000 instead of 10. Without
this, including more than 10 tables in the project schema causes the records in
the id_table to have overlapping primary keys between the project table records
and the turbine security table records.
templates/sql/id-table/idtable.* (changed for each database).
Changed the first id for each table to be 1000 instead of 100. This is useful
if you are loading in initial data with project-datasql, with primary keys for
each record being set manually (not by the id broker). Previously you were
limited to loading in less than 100 records, now you can load in up to 999.
Revision Changes Path
1.5 +1 -1 jakarta-turbine-torque/src/templates/sql/id-table/Control.vm
Index: Control.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/id-table/Control.vm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Control.vm 27 Oct 2001 19:06:16 -0000 1.4
+++ Control.vm 20 May 2002 22:05:33 -0000 1.5
@@ -2,5 +2,5 @@
#foreach ($dataModel in $dataModels)
#set ( $outFile = "${dataModel.name}-idtable-init.sql" )
$generator.parse($fname,"$outFile","tables",$dataModel.database.tables)
-#set ( $initialID = $initialID + 10 )
+#set ( $initialID = $initialID + 1000 )
#end
1.3 +1 -1 jakarta-turbine-torque/src/templates/sql/id-table/idtable.db2
Index: idtable.db2
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/id-table/idtable.db2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- idtable.db2 12 Mar 2002 17:58:20 -0000 1.2
+++ idtable.db2 20 May 2002 22:05:33 -0000 1.3
@@ -1,4 +1,4 @@
#foreach ($tbl in $tables)
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 100, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 1000, 10);
#set ( $initialID = $initialID + 1 )
#end
1.3 +1 -1 jakarta-turbine-torque/src/templates/sql/id-table/idtable.db2400
Index: idtable.db2400
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/templates/sql/id-table/idtable.db2400,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- idtable.db2400 12 Mar 2002 17:58:20 -0000 1.2
+++ idtable.db2400 20 May 2002 22:05:33 -0000 1.3
@@ -1,5 +1,5 @@
#foreach ($tbl in $tables)
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 100, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 1000, 10);
#set ( $initialID = $initialID + 1 )
#end
1.3 +1 -1
jakarta-turbine-torque/src/templates/sql/id-table/idtable.hypersonic
Index: idtable.hypersonic
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/templates/sql/id-table/idtable.hypersonic,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- idtable.hypersonic 12 Mar 2002 17:58:20 -0000 1.2
+++ idtable.hypersonic 20 May 2002 22:05:33 -0000 1.3
@@ -1,4 +1,4 @@
#foreach ($tbl in $tables)
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 100, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 1000, 10);
#set ( $initialID = $initialID + 1 )
#end
1.3 +1 -1
jakarta-turbine-torque/src/templates/sql/id-table/idtable.interbase
Index: idtable.interbase
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/templates/sql/id-table/idtable.interbase,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- idtable.interbase 12 Mar 2002 17:58:20 -0000 1.2
+++ idtable.interbase 20 May 2002 22:05:33 -0000 1.3
@@ -1,4 +1,4 @@
#foreach ($tbl in $tables)
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 100, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 1000, 10);
#set ( $initialID = $initialID + 1 )
#end
1.3 +1 -1 jakarta-turbine-torque/src/templates/sql/id-table/idtable.mssql
Index: idtable.mssql
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/id-table/idtable.mssql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- idtable.mssql 12 Mar 2002 17:58:20 -0000 1.2
+++ idtable.mssql 20 May 2002 22:05:33 -0000 1.3
@@ -1,4 +1,4 @@
#foreach ($tbl in $tables)
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 100, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 1000, 10);
#set ( $initialID = $initialID + 1 )
#end
1.3 +1 -1 jakarta-turbine-torque/src/templates/sql/id-table/idtable.mysql
Index: idtable.mysql
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/id-table/idtable.mysql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- idtable.mysql 12 Mar 2002 17:58:20 -0000 1.2
+++ idtable.mysql 20 May 2002 22:05:33 -0000 1.3
@@ -1,4 +1,4 @@
#foreach ($tbl in $tables)
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 100, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 1000, 10);
#set ( $initialID = $initialID + 1 )
#end
1.3 +1 -1 jakarta-turbine-torque/src/templates/sql/id-table/idtable.oracle
Index: idtable.oracle
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/templates/sql/id-table/idtable.oracle,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- idtable.oracle 12 Mar 2002 17:58:20 -0000 1.2
+++ idtable.oracle 20 May 2002 22:05:33 -0000 1.3
@@ -1,4 +1,4 @@
#foreach ($tbl in $tables)
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 100, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 1000, 10);
#set ( $initialID = $initialID + 1 )
#end
1.3 +1 -1
jakarta-turbine-torque/src/templates/sql/id-table/idtable.postgresql
Index: idtable.postgresql
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/templates/sql/id-table/idtable.postgresql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- idtable.postgresql 12 Mar 2002 17:58:20 -0000 1.2
+++ idtable.postgresql 20 May 2002 22:05:33 -0000 1.3
@@ -1,4 +1,4 @@
#foreach ($tbl in $tables)
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 100, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 1000, 10);
#set ( $initialID = $initialID + 1 )
#end
1.3 +1 -1 jakarta-turbine-torque/src/templates/sql/id-table/idtable.sapdb
Index: idtable.sapdb
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/id-table/idtable.sapdb,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- idtable.sapdb 12 Mar 2002 17:58:20 -0000 1.2
+++ idtable.sapdb 20 May 2002 22:05:33 -0000 1.3
@@ -1,5 +1,5 @@
#foreach ($tbl in $tables)
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 100, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES
($initialID, '$tbl.Name', 1000, 10);
#set ( $initialID = $initialID + 1 )
#end
1.3 +1 -1 jakarta-turbine-torque/src/templates/sql/id-table/idtable.sybase
Index: idtable.sybase
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/templates/sql/id-table/idtable.sybase,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- idtable.sybase 12 Mar 2002 17:58:20 -0000 1.2
+++ idtable.sybase 20 May 2002 22:05:33 -0000 1.3
@@ -1,4 +1,4 @@
#foreach ($tbl in $tables)
-insert into ID_TABLE (ID_TABLE_ID, TABLE_NAME, NEXT_ID, QUANTITY) VALUES
($initialID, '$tbl.Name', 100, 10);
+insert into ID_TABLE (ID_TABLE_ID, TABLE_NAME, NEXT_ID, QUANTITY) VALUES
($initialID, '$tbl.Name', 1000, 10);
#set ( $initialID = $initialID + 1 )
#end
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
