| commit | 8bf96e418fb08edca09f623bfa53b202bdcf5069 | [log] [tgz] |
|---|---|---|
| author | tle <tle> | Wed Jun 02 23:40:39 2010 +0000 |
| committer | tle <tle> | Wed Jun 02 23:40:39 2010 +0000 |
| tree | 42051be7c1aefb47e724d707a3debe31ccce5c44 | |
| parent | 990820abe670d475c3934766b9cdca08a2a58d73 [diff] |
315292 - Incorrect join column referenced column name with JOINED inheritance - Karen's patch
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 51112d5..a357dd5 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 @@ 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 968bcfe..c9b27ba 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 @@ 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()));