mpoeschl 2003/11/25 08:56:01
Modified: src/generator/src/java/org/apache/torque/engine/database/model
IDMethod.java
src/generator/src/templates/om MapBuilder.vm
Log:
drop support for autoincrement and sequence
Revision Changes Path
1.2 +4 -4
db-torque/src/generator/src/java/org/apache/torque/engine/database/model/IDMethod.java
Index: IDMethod.java
===================================================================
RCS file:
/home/cvs/db-torque/src/generator/src/java/org/apache/torque/engine/database/model/IDMethod.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IDMethod.java 10 Feb 2003 13:20:58 -0000 1.1
+++ IDMethod.java 25 Nov 2003 16:56:00 -0000 1.2
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,12 +72,12 @@
/**
* Key generation via auto-increment.
*/
- String AUTO_INCREMENT = "autoincrement";
+// String AUTO_INCREMENT = "autoincrement";
/**
* Key generation via sequences.
*/
- String SEQUENCE = "sequence";
+// String SEQUENCE = "sequence";
/**
* Key generation via the IDBroker table.
1.6 +1 -5 db-torque/src/generator/src/templates/om/MapBuilder.vm
Index: MapBuilder.vm
===================================================================
RCS file: /home/cvs/db-torque/src/generator/src/templates/om/MapBuilder.vm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MapBuilder.vm 23 Oct 2003 11:24:46 -0000 1.5
+++ MapBuilder.vm 25 Nov 2003 16:56:01 -0000 1.6
@@ -92,10 +92,6 @@
#if ($table.IdMethod == "native")
tMap.setPrimaryKeyMethod(TableMap.NATIVE);
-#elseif ($table.IdMethod == "autoincrement")
- tMap.setPrimaryKeyMethod(TableMap.AUTO_INCREMENT);
-#elseif ($table.IdMethod == "sequence")
- tMap.setPrimaryKeyMethod(TableMap.SEQUENCE);
#elseif ($table.IdMethod == "idbroker")
tMap.setPrimaryKeyMethod(TableMap.ID_BROKER);
#else
@@ -109,7 +105,7 @@
tMap.setPrimaryKeyMethodInfo("$imp.Value");
#elseif ($table.IdMethod == "idbroker")
tMap.setPrimaryKeyMethodInfo(tMap.getName());
-#elseif ($table.IdMethod == "sequence" || ($table.IdMethod == "native" &&
$table.Database.Platform.NativeIdMethod == "sequence"))
+#elseif ($table.IdMethod == "native" && $table.Database.Platform.NativeIdMethod ==
"sequence")
tMap.setPrimaryKeyMethodInfo("$table.SequenceName");
#elseif ($table.IdMethod == "native" && $table.Database.Platform.NativeIdMethod ==
"identity")
tMap.setPrimaryKeyMethodInfo("$table.Name");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
