From ca9828726d333c043d4a3a97d5276f97591077c2 Mon Sep 17 00:00:00 2001
From: Michael Dick <mikedd@apache.org>
Date: Mon, 3 Mar 2008 12:54:56 +0000
Subject: [PATCH] OPENJPA-528 reverting behavior. Original fix caused problems
 with the TCK.

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@633075 13f79535-47bb-0310-9956-ffa450edef68
---
 openjpa-persistence-jdbc/pom.xml                               | 3 +++
 .../openjpa/persistence/jdbc/PersistenceMappingDefaults.java   | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/openjpa-persistence-jdbc/pom.xml b/openjpa-persistence-jdbc/pom.xml
index 53a62e2ae..3170302ec 100644
--- a/openjpa-persistence-jdbc/pom.xml
+++ b/openjpa-persistence-jdbc/pom.xml
@@ -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>
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java
index 437c02fc9..3c0af65c2 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java
@@ -192,9 +192,8 @@ public class PersistenceMappingDefaults
             if (isRemoveHungarianNotation())
                 name = removeHungarianNotation(name);
 
-            name = name + "_" + ((Column) target).getName();
             name = dict.getValidColumnName(name, local);
-            col.setName(name);
+            col.setName(name + "_" + ((Column) target).getName());
         }
     }