Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortle2010-06-02 23:40:39 +0000
committertle2010-06-02 23:40:39 +0000
commit8bf96e418fb08edca09f623bfa53b202bdcf5069 (patch)
tree42051be7c1aefb47e724d707a3debe31ccce5c44
parent990820abe670d475c3934766b9cdca08a2a58d73 (diff)
downloadwebtools.dali-8bf96e418fb08edca09f623bfa53b202bdcf5069.tar.gz
webtools.dali-8bf96e418fb08edca09f623bfa53b202bdcf5069.tar.xz
webtools.dali-8bf96e418fb08edca09f623bfa53b202bdcf5069.zip
315292 - Incorrect join column referenced column name with JOINED inheritance - Karen's patch
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaJoinColumn.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmJoinColumn.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaJoinColumn.java
index 51112d5aa5..a357dd5e90 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaJoinColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaJoinColumn.java
@@ -176,7 +176,7 @@ public class GenericJavaJoinColumn extends AbstractJavaBaseColumn<JoinColumnAnno
if (getSpecifiedReferencedColumnName() == null && this.getOwner().joinColumnsSize() > 1) {
messages.add(this.buildUnspecifiedReferencedColumnNameMultipleJoinColumnsMessage(astRoot));
}
- else if (this.getReferencedColumnName() != null) {
+ else if (this.getSpecifiedReferencedColumnName() != null) {
if (this.getReferencedColumnDbTable() != null && ! this.isReferencedColumnResolved()) {
messages.add(getOwner().buildUnresolvedReferencedColumnNameMessage(this, this.getReferencedColumnNameTextRange(astRoot)));
}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmJoinColumn.java
index 968bcfee88..c9b27ba0c0 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmJoinColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmJoinColumn.java
@@ -180,7 +180,7 @@ public class GenericOrmJoinColumn extends AbstractOrmBaseColumn<XmlJoinColumn> i
if (this.getSpecifiedReferencedColumnName() == null && this.getOwner().joinColumnsSize() > 1) {
messages.add(this.buildUnspecifiedReferencedColumnNameMultipleJoinColumnsMessage());
}
- else if (this.getReferencedColumnName() != null) {
+ else if (this.getSpecifiedReferencedColumnName() != null) {
Table refColumnDbTable = this.getReferencedColumnDbTable();
if (refColumnDbTable != null && ! this.isReferencedColumnResolved()) {
messages.add(getOwner().buildUnresolvedReferencedColumnNameMessage(this, this.getReferencedColumnNameTextRange()));

Back to the top