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/01/23 20:51:48 UTC

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

Author: pcl
Date: Wed Jan 23 11:51:45 2008
New Revision: 614640

URL: http://svn.apache.org/viewvc?rev=614640&view=rev
Log:
OPENJPA-430. Fixed bug that passed all column name checks through to the DBDictionary for potential renaming even when _defMissing is enabled.

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=614640&r1=614639&r2=614640&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 Wed Jan 23 11:51:45 2008
@@ -549,7 +549,9 @@
             String name = col.getName();
             if (_removeHungarianNotation)
                 name = removeHungarianNotation(name);
-            col.setName(dict.getValidColumnName(name, table));
+            if (_defMissing) // this is not an 'else if' intentionally
+                name = dict.getValidColumnName(name, table);
+            col.setName(name);
         }
     }