Reversing patch for 193668. Want to communicate this change before it goes into the build.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaPlatform.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaPlatform.java
index 02516f5..25d4cf0 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaPlatform.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaPlatform.java
@@ -146,17 +146,4 @@
* @return
*/
// IGeneratorRepository generatorRepository(IPersistentType persistentType);
-
- /**
- * If an SQL identifier is derived from a Java identifier by following a
- * default rule, a JPA implementation may perform some conversion, e.g.
- * convert the case of the identifier. This method allows to implement
- * such a conversion in a platform-dependent way.
- *
- * @param javaIdentifier the Java identifier to be converted
- *
- * @return the converted SQL identifier
- */
- String convertJavaIdentifierToDatabaseIdentifier(String javaIdentifier);
-
}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/BaseJpaPlatform.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/BaseJpaPlatform.java
index 4ce391d..83e7046 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/BaseJpaPlatform.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/BaseJpaPlatform.java
@@ -212,10 +212,6 @@
context.refreshDefaults(new NullProgressMonitor());
context.addToMessages(messages);
}
-
- public String convertJavaIdentifierToDatabaseIdentifier(String javaIdentifier) {
- return javaIdentifier;
- }
// public IGeneratorRepository generatorRepository(IPersistentType persistentType) {
// return ((BaseJpaProjectContext) context).generatorRepository(persistentType);
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JavaAttributeContext.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JavaAttributeContext.java
index e791fc7..3c003d8 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JavaAttributeContext.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JavaAttributeContext.java
@@ -76,7 +76,7 @@
protected Object getDefault(String key, DefaultsContext defaultsContext) {
if (key.equals(BaseJpaPlatform.DEFAULT_COLUMN_NAME_KEY)) {
- return getPlatform().convertJavaIdentifierToDatabaseIdentifier(getMapping().getPersistentAttribute().getName());
+ return getMapping().getPersistentAttribute().getName();
}
return defaultsContext.getDefault(key);
}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JavaEntityContext.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JavaEntityContext.java
index 4bfa971..a909883 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JavaEntityContext.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JavaEntityContext.java
@@ -155,11 +155,11 @@
if (getEntity().rootEntity().getInheritanceStrategy().isSingleTable()) {
IEntity rootEntity = getEntity().rootEntity();
if (rootEntity == getEntity()) {
- return getPlatform().convertJavaIdentifierToDatabaseIdentifier(rootEntity.getName());
+ return rootEntity.getName();
}
return rootEntity.getTable().getName();
}
- return getPlatform().convertJavaIdentifierToDatabaseIdentifier(getEntity().getName());
+ return getEntity().getName();
}
return defaultsContext.getDefault(key);
}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JavaPersistentAttributeContext.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JavaPersistentAttributeContext.java
index 4afa522..b63e561 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JavaPersistentAttributeContext.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JavaPersistentAttributeContext.java
@@ -93,7 +93,7 @@
protected Object getDefault(String key, DefaultsContext defaultsContext) {
if (key.equals(BaseJpaPlatform.DEFAULT_COLUMN_NAME_KEY)) {
- return getPlatform().convertJavaIdentifierToDatabaseIdentifier(getPersistentAttribute().getName());
+ return getPersistentAttribute().getName();
}
return defaultsContext.getDefault(key);
}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JoinColumnContext.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JoinColumnContext.java
index f8bb1ab..648f412 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JoinColumnContext.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JoinColumnContext.java
@@ -44,7 +44,6 @@
if (prefix == null) {
return null;
}
- prefix = getPlatform().convertJavaIdentifierToDatabaseIdentifier(prefix);
// TODO not sure which of these is correct...
// (the spec implies that the referenced column is always the
// primary key column of the target entity)
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/XmlEntityContext.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/XmlEntityContext.java
index 5cc3ef7..8dc7613 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/XmlEntityContext.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/XmlEntityContext.java
@@ -349,11 +349,11 @@
if (getEntity().rootEntity().getInheritanceStrategy().isSingleTable()) {
IEntity rootEntity = getEntity().rootEntity();
if (rootEntity == getEntity()) {
- return getPlatform().convertJavaIdentifierToDatabaseIdentifier(rootEntity.getName());
+ return rootEntity.getName();
}
return rootEntity.getTable().getName();
}
- return getPlatform().convertJavaIdentifierToDatabaseIdentifier(getEntity().getName());
+ return getEntity().getName();
}
return super.getDefault(key, defaultsContext);
}
