dlr 01/08/22 13:07:01
Modified: src/java/org/apache/torque/engine/database/model Index.java
Log:
Changed ctor which takes a List to also take a table so that Table
and Database-level attributes can be read.
Revision Changes Path
1.15 +11 -6
jakarta-turbine-torque/src/java/org/apache/torque/engine/database/model/Index.java
Index: Index.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/engine/database/model/Index.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -u -r1.14 -r1.15
--- Index.java 2001/08/22 00:45:30 1.14
+++ Index.java 2001/08/22 20:07:01 1.15
@@ -67,7 +67,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]>Daniel Rall</a>
- * @version $Id: Index.java,v 1.14 2001/08/22 00:45:30 dlr Exp $
+ * @version $Id: Index.java,v 1.15 2001/08/22 20:07:01 dlr Exp $
*/
public class Index
{
@@ -90,25 +90,30 @@
* Creates a new instance for the list of columns composing an
* index. Otherwise performs as {@link #Index()}.
*
+ * @param table The table this index is associated with.
* @param indexColumns The list of {@link
* org.apache.torque.engine.database.model.Column} objects which
* make up this index. Cannot be empty.
* @exception TorqueException Error generating name.
* @see #Index()
*/
- public Index(List indexColumns)
+ protected Index(Table table, List indexColumns)
throws TorqueException
{
this();
+ setTable(table);
if (indexColumns.size() > 0)
{
this.indexColumns = indexColumns;
- List inputs = getColumnNames();
+ List inputs = new ArrayList(4);
+ inputs.add(table.getDatabase());
+ inputs.add(table.getName());
inputs.add("I");
- inputs.add(0, getTable().getDatabase().getAppData());
- indexName = NameFactory.generateName(NameFactory.GLOBAL_GENERATOR,
- inputs);
+ // ASSUMPTION: This Index not yet added to the list.
+ inputs.add(new Integer(table.getIndices().length + 1));
+ indexName = NameFactory.generateName
+ (NameFactory.CONSTRAINT_GENERATOR, inputs);
if (DEBUG)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
