OPENJPA-528 Handle foreignKey column names similarly to joins in PeristenceMetaDataDefaults.

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@632486 13f79535-47bb-0310-9956-ffa450edef68

openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java

@@ -192,9 +192,9 @@ public class PersistenceMappingDefaults
             if (isRemoveHungarianNotation())
                 name = removeHungarianNotation(name);
 
+            name = name + "_" + ((Column) target).getName();
             name = dict.getValidColumnName(name, local);
-
-            col.setName(name + "_" + ((Column) target).getName());
+            col.setName(name);
         }
     }
 

openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestFKColumnNames.java

@@ -0,0 +1,114 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.openjpa.persistence.jdbc;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Persistence;
+
+import junit.framework.TestCase;
+
+import org.apache.openjpa.jdbc.meta.MappingRepository;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+
+/**
+ * Testcase that verifies the names for Foreign Key columns is as expected.
+ */
+public class TestFKColumnNames extends TestCase {
+
+    OpenJPAEntityManagerFactorySPI emf =
+            (OpenJPAEntityManagerFactorySPI) Persistence
+                    .createEntityManagerFactory("test");
+
+    /**
+     * <P>
+     * If a Foreign Key field contains a SQL reserved word, the resulting column
+     * should be named ${reservedWord}_ID, not ${reservedWord}<B>0</B>_ID.
+     * </P>
+     * <P>
+     * This test does not take into account and DB specific reserved words and
+     * can be run with any DBDictionary.
+     * </P>
+     */
+    public void testSQLKeywords() {
+        MappingRepository repos =
+                (MappingRepository) emf.getConfiguration()
+                        .getMetaDataRepositoryInstance();
+
+        assertEquals("SELECT_ID", repos.getMapping(Inner1.class, null, true)
+                .getFieldMapping("select").getColumns()[0].getName());
+
+        assertEquals("FROM_ID", repos.getMapping(Inner2.class, null, true)
+                .getFieldMapping("from").getColumns()[0].getName());
+    }
+
+    @Entity
+    public static class Inner1 {
+        @Id
+        @GeneratedValue
+        int id;
+
+        @OneToOne
+        Inner2 select;
+
+        public Inner2 getSelect() {
+            return select;
+        }
+
+        public void setSelect(Inner2 select) {
+            this.select = select;
+        }
+
+        public int getId() {
+            return id;
+        }
+
+        public void setId(int id) {
+            this.id = id;
+        }
+    }
+
+    @Entity
+    public static class Inner2 {
+        @Id
+        @GeneratedValue
+        int id;
+
+        @OneToOne
+        Inner1 from;
+
+        public Inner1 getFrom() {
+            return from;
+        }
+
+        public void setFrom(Inner1 from) {
+            this.from = from;
+        }
+
+        public int getId() {
+            return id;
+        }
+
+        public void setId(int id) {
+            this.id = id;
+        }
+    }
+}