You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2008/01/05 18:09:53 UTC
svn commit: r609176 - in
/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa:
conf/EntityMapDefaultsProcessor.java map/JpaPrimaryKeyJoinColumn.java
Author: aadamchik
Date: Sat Jan 5 09:09:52 2008
New Revision: 609176
URL: http://svn.apache.org/viewvc?rev=609176&view=rev
Log:
JPA: fixing processing @PrimaryKeyJoinColumn defaults
Modified:
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/conf/EntityMapDefaultsProcessor.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/map/JpaPrimaryKeyJoinColumn.java
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/conf/EntityMapDefaultsProcessor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/conf/EntityMapDefaultsProcessor.java?rev=609176&r1=609175&r2=609176&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/conf/EntityMapDefaultsProcessor.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/conf/EntityMapDefaultsProcessor.java Sat Jan 5 09:09:52 2008
@@ -386,11 +386,13 @@
if (joinColumn.getReferencedColumnName() == null) {
if (entity.getAttributes().getIds().size() == 1) {
- joinColumn.setReferencedColumnName(entity
+ JpaId id = entity
.getAttributes()
.getIds()
.iterator()
- .next()
+ .next();
+ joinColumn.setReferencedColumnName(id
+ .getColumn()
.getName());
}
}
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/map/JpaPrimaryKeyJoinColumn.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/map/JpaPrimaryKeyJoinColumn.java?rev=609176&r1=609175&r2=609176&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/map/JpaPrimaryKeyJoinColumn.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/map/JpaPrimaryKeyJoinColumn.java Sat Jan 5 09:09:52 2008
@@ -35,9 +35,18 @@
}
public JpaPrimaryKeyJoinColumn(PrimaryKeyJoinColumn annotation) {
- name = annotation.name();
- referencedColumnName = annotation.referencedColumnName();
- columnDefinition = annotation.columnDefinition();
+
+ if (!"".equals(annotation.name())) {
+ name = annotation.name();
+ }
+
+ if (!"".equals(annotation.columnDefinition())) {
+ columnDefinition = annotation.columnDefinition();
+ }
+
+ if (!"".equals(annotation.referencedColumnName())) {
+ referencedColumnName = annotation.referencedColumnName();
+ }
}
public void encodeAsXML(XMLEncoder encoder) {