openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mik...@apache.org
Subject svn commit: r633075 - in /openjpa/trunk/openjpa-persistence-jdbc: pom.xml src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java
Date Mon, 03 Mar 2008 12:54:57 GMT
Author: mikedd
Date: Mon Mar  3 04:54:56 2008
New Revision: 633075

URL: http://svn.apache.org/viewvc?rev=633075&view=rev
Log:
OPENJPA-528 reverting behavior. Original fix caused problems with the TCK. 

Modified:
    openjpa/trunk/openjpa-persistence-jdbc/pom.xml
    openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java

Modified: openjpa/trunk/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/pom.xml?rev=633075&r1=633074&r2=633075&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/pom.xml Mon Mar  3 04:54:56 2008
@@ -480,6 +480,9 @@
                         <exclude>org/apache/openjpa/persistence/meta/TestSequenceAssigned.java</exclude>
                         <exclude>org/apache/openjpa/persistence/meta/TestValueStrategies.java</exclude>
                         <exclude>org/apache/openjpa/persistence/meta/TestXMLPersistenceMetaDataSerializer.java</exclude>
+                  
+                        <!--  Exclude until root cause of TCK problem is found. -->
+                        <exclude>org/apache/openjpa/persistence/jdbc/TestFKColumnNames.java</exclude>
                     </excludes>
                     <systemProperties>
                         <property>

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java?rev=633075&r1=633074&r2=633075&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java
(original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java
Mon Mar  3 04:54:56 2008
@@ -192,9 +192,8 @@
             if (isRemoveHungarianNotation())
                 name = removeHungarianNotation(name);
 
-            name = name + "_" + ((Column) target).getName();
             name = dict.getValidColumnName(name, local);
-            col.setName(name);
+            col.setName(name + "_" + ((Column) target).getName());
         }
     }
 



Mime
View raw message