You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openjpa.apache.org by pc...@apache.org on 2008/03/03 20:39:02 UTC

svn commit: r633245 - /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java

Author: pcl
Date: Mon Mar  3 11:38:47 2008
New Revision: 633245

URL: http://svn.apache.org/viewvc?rev=633245&view=rev
Log:
OPENJPA-430. Reverting mapping defaults change; I'm not convinced that the code is correct, but internal Kodo tests fail with the new behavior. Changing for now; more investigation to follow.

Modified:
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java?rev=633245&r1=633244&r2=633245&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java Mon Mar  3 11:38:47 2008
@@ -549,9 +549,7 @@
             String name = col.getName();
             if (_removeHungarianNotation)
                 name = removeHungarianNotation(name);
-            if (_defMissing) // this is not an 'else if' intentionally
-                name = dict.getValidColumnName(name, table);
-            col.setName(name);
+            col.setName(dict.getValidColumnName(name, table));
         }
     }