[openjpa] branch master updated: OPENJPA-2855 revert PK name handling

[struberg]

This is an automated email from the ASF dual-hosted git repository.

struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git


The following commit(s) were added to refs/heads/master by this push:
     new 2a3fc73  OPENJPA-2855 revert PK name handling
2a3fc73 is described below

commit 2a3fc7386182ce7e4a6ace5b8f5a926766e53041
Author: Mark Struberg <strub...@apache.org>
AuthorDate: Thu Apr 1 21:19:59 2021 +0200

    OPENJPA-2855 revert PK name handling
    
    Seems this got broken as side effect of 
dd9bce0cc909bd96d706a9438bdc2a58111c481f
    which was for OPENJPA-2816. We need to check HerdDB again
---
 .../main/java/org/apache/openjpa/jdbc/kernel/ValueTableJDBCSeq.java  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git 
a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ValueTableJDBCSeq.java
 
b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ValueTableJDBCSeq.java
index 7b69f96..e137a8b 100644
--- 
a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ValueTableJDBCSeq.java
+++ 
b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ValueTableJDBCSeq.java
@@ -24,7 +24,6 @@ import java.sql.Types;
 
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl;
-import org.apache.openjpa.jdbc.identifier.DBIdentifier;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.meta.MappingRepository;
 import org.apache.openjpa.jdbc.schema.Column;
@@ -79,9 +78,7 @@ public class ValueTableJDBCSeq
     @Override
     protected Column addPrimaryKeyColumn(Table table) {
         DBDictionary dict = getConfiguration().getDBDictionaryInstance();
-        DBIdentifier delimitedColumnName = 
dict.fromDBName(getPrimaryKeyColumn(), DBIdentifier.DBIdentifierType.COLUMN);
-        Column pkColumn = table.addColumn(dict.getValidColumnName
-            (delimitedColumnName, table));
+        Column pkColumn = 
table.addColumn(dict.getValidColumnName(getPrimaryKeyColumnIdentifier(), 
table));
         pkColumn.setType(dict.getPreferredType(Types.VARCHAR));
         pkColumn.setJavaType(JavaTypes.STRING);
         pkColumn.setSize(dict.characterColumnSize);