mpoeschl 01/05/16 19:13:47
Modified: conf/torque/templates/om MapBuilder.vm
src/java/org/apache/turbine/torque/engine/database/model
Table.java
Log:
the default for idMethod is 'none'
(it was set to idbroker if validating the schema is disabled
Revision Changes Path
1.20 +3 -3 jakarta-turbine/conf/torque/templates/om/MapBuilder.vm
Index: MapBuilder.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/torque/templates/om/MapBuilder.vm,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- MapBuilder.vm 2001/04/20 00:25:42 1.19
+++ MapBuilder.vm 2001/05/17 02:13:45 1.20
@@ -71,10 +71,10 @@
tMap.setPrimaryKeyMethod(TableMap.AUTOINCREMENT);
#elseif ($table.IdMethod == "sequence")
tMap.setPrimaryKeyMethod(TableMap.SEQUENCE);
-#elseif ($table.IdMethod == "none")
- tMap.setPrimaryKeyMethod(TableMap.NONE);
-#else
+#elseif ($table.IdMethod == "idbroker")
tMap.setPrimaryKeyMethod(TableMap.IDBROKERTABLE);
+#else
+ tMap.setPrimaryKeyMethod(TableMap.NONE);
#end
#if ($table.IdMethod == "idbroker")
1.15 +3 -2
jakarta-turbine/src/java/org/apache/turbine/torque/engine/database/model/Table.java
Index: Table.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/torque/engine/database/model/Table.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Table.java 2001/05/15 02:14:52 1.14
+++ Table.java 2001/05/17 02:13:46 1.15
@@ -67,7 +67,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Leon Messerschmidt</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]>Martin Poeschl</a>
- * @version $Id: Table.java,v 1.14 2001/05/15 02:14:52 mpoeschl Exp $
+ * @version $Id: Table.java,v 1.15 2001/05/17 02:13:46 mpoeschl Exp $
*/
public class Table
{
@@ -122,6 +122,7 @@
name = attrib.getValue("name");
javaName = attrib.getValue("javaName");
idMethod = attrib.getValue("idMethod");
+ System.out.println(idMethod + " - def: " + defaultIdMethod);
if ("null".equals(idMethod))
{
idMethod = defaultIdMethod;
@@ -433,7 +434,7 @@
{
if (idMethod == null)
{
- return "idbroker";
+ return "none";
}
else
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
