db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r995652 - in /db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates: TorqueSchemaIdMethod.java transformer/sql/SQLTransformer.java
Date Fri, 10 Sep 2010 03:12:06 GMT
Author: tfischer
Date: Fri Sep 10 03:12:06 2010
New Revision: 995652

URL: http://svn.apache.org/viewvc?rev=995652&view=rev
Log:
- TORQUE-127: remove check for "null" value of idMethod attribute of element table in transformer.

Modified:
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaIdMethod.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaIdMethod.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaIdMethod.java?rev=995652&r1=995651&r2=995652&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaIdMethod.java
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaIdMethod.java
Fri Sep 10 03:12:06 2010
@@ -36,13 +36,7 @@ public enum TorqueSchemaIdMethod
     /**
      * Primary keys are not generated automatically.
      */
-    NONE("none"),
-
-    /**
-     * The default is used.
-     * TODO: remove once the schema is changed.
-     */
-    NULL("null");
+    NONE("none");
 
     /**
      * The name of the idMethod, not null.

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java?rev=995652&r1=995651&r2=995652&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java
Fri Sep 10 03:12:06 2010
@@ -103,11 +103,7 @@ public class SQLTransformer implements S
     {
         Object idMethod = tableElement.getAttribute(
                 TorqueSchemaAttributeName.ID_METHOD.getName());
-        // TODO: in the 3.3 schema, "null" is the default value for idMethod.
-        // Therefore we must test for this explicit string.
-        // Can be removed once the dtd/schema is updated.
-        if (idMethod == null
-            || TorqueSchemaIdMethod.NULL.getName().equals(idMethod))
+        if (idMethod == null)
         {
             Object defaultIdMethod = tableElement.getParent().getAttribute(
                     TorqueSchemaAttributeName.DEFAULT_ID_METHOD.getName());



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message