jmcnally 01/12/27 12:49:33
Modified: src/dtd database.dtd
src/java/org/apache/torque/engine/database/model
Database.java Table.java
Log:
changed skipHeavyIndexing to heavyIndexing and reversed the default, so that it
must be set explicitly to true or no extra indexing occurs.
Revision Changes Path
1.10 +3 -3 jakarta-turbine-torque/src/dtd/database.dtd
Index: database.dtd
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/dtd/database.dtd,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- database.dtd 2001/12/27 18:28:59 1.9
+++ database.dtd 2001/12/27 20:49:32 1.10
@@ -1,6 +1,6 @@
<!--
Torque XML database schema DTD
- $Id: database.dtd,v 1.9 2001/12/27 18:28:59 jmcnally Exp $
+ $Id: database.dtd,v 1.10 2001/12/27 20:49:32 jmcnally Exp $
-->
<!--
@@ -40,7 +40,7 @@
baseClass CDATA #IMPLIED
basePeer CDATA #IMPLIED
defaultJavaNamingMethod (nochange|underscore|javaname) "underscore"
- skipHeavyIndexing (true|false) "false"
+ heavyIndexing (true|false) "false"
>
<!ELEMENT table (column+,(foreign-key|index|unique|id-method-parameter)*)>
@@ -54,7 +54,7 @@
basePeer CDATA #IMPLIED
alias CDATA #IMPLIED
javaNamingMethod (nochange|underscore|javaname) #IMPLIED
- skipHeavyIndexing (true|false) "false"
+ heavyIndexing (true|false) #IMPLIED
description CDATA #IMPLIED
>
1.11 +12 -12
jakarta-turbine-torque/src/java/org/apache/torque/engine/database/model/Database.java
Index: Database.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/engine/database/model/Database.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Database.java 2001/12/27 18:28:59 1.10
+++ Database.java 2001/12/27 20:49:33 1.11
@@ -78,7 +78,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]>Martin Poeschl</a>
* @author <a href="mailto:[EMAIL PROTECTED]>Daniel Rall</a>
* @author <a href="mailto:byron_foster@[EMAIL PROTECTED]>Byron Foster</a>
- * @version $Id: Database.java,v 1.10 2001/12/27 18:28:59 jmcnally Exp $
+ * @version $Id: Database.java,v 1.11 2001/12/27 20:49:33 jmcnally Exp $
*/
public class Database
{
@@ -95,7 +95,7 @@
private AppData dbParent;
private Hashtable tablesByName = new Hashtable();
private Hashtable tablesByJavaName = new Hashtable();
- private boolean skipHeavyIndexing;
+ private boolean heavyIndexing;
/**
* Creates a new instance with unset attributes.
@@ -120,8 +120,8 @@
{
defaultJavaNamingMethod = NameGenerator.CONV_METHOD_UNDERSCORE;
}
- skipHeavyIndexing = "true"
- .equals(attrib.getValue("skipHeavyIndexing"));
+ heavyIndexing = "true"
+ .equals(attrib.getValue("heavyIndexing"));
}
/**
@@ -248,21 +248,21 @@
}
/**
- * Get the value of skipHeavyIndexing.
- * @return value of skipHeavyIndexing.
+ * Get the value of heavyIndexing.
+ * @return value of heavyIndexing.
*/
- public boolean isSkipHeavyIndexing()
+ public boolean isHeavyIndexing()
{
- return skipHeavyIndexing;
+ return heavyIndexing;
}
/**
- * Set the value of skipHeavyIndexing.
- * @param v Value to assign to skipHeavyIndexing.
+ * Set the value of heavyIndexing.
+ * @param v Value to assign to heavyIndexing.
*/
- public void setSkipHeavyIndexing(boolean v)
+ public void setHeavyIndexing(boolean v)
{
- this.skipHeavyIndexing = v;
+ this.heavyIndexing = v;
}
/**
1.23 +6 -5
jakarta-turbine-torque/src/java/org/apache/torque/engine/database/model/Table.java
Index: Table.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/engine/database/model/Table.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Table.java 2001/12/27 17:13:36 1.22
+++ Table.java 2001/12/27 20:49:33 1.23
@@ -75,7 +75,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]>John McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]>Daniel Rall</a>
* @author <a href="mailto:byron_foster@[EMAIL PROTECTED]>Byron Foster</a>
- * @version $Id: Table.java,v 1.22 2001/12/27 17:13:36 jmcnally Exp $
+ * @version $Id: Table.java,v 1.23 2001/12/27 20:49:33 jmcnally Exp $
*/
public class Table implements IDMethod
{
@@ -106,7 +106,7 @@
private Hashtable columnsByName;
private Hashtable columnsByJavaName;
private boolean needsTransactionInPostgres;
- private boolean skipHeavyIndexing;
+ private boolean heavyIndexing;
/**
@@ -167,8 +167,9 @@
baseClass = attrib.getValue("baseClass");
basePeer = attrib.getValue("basePeer");
alias = attrib.getValue("alias");
- skipHeavyIndexing = "true"
- .equals(attrib.getValue("skipHeavyIndexing"));
+ heavyIndexing = "true".equals(attrib.getValue("heavyIndexing"))
+ || (!"false".equals(attrib.getValue("heavyIndexing")) &&
+ getDatabase().isHeavyIndexing());
description = attrib.getValue("description");
}
@@ -184,7 +185,7 @@
{
// Heavy indexing must wait until after all columns composing
// a table's primary key have been parsed.
- if (!skipHeavyIndexing && !getDatabase().isSkipHeavyIndexing())
+ if (heavyIndexing)
{
doHeavyIndexing();
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
