[hibernate-commits] Hibernate SVN: r14248 - in annotations/branches/v3_2_1_GA_CP/src: test/org/hibernate/test/annotations/onetoone and 1 other directory.
Author: anthonyHib
Date: 2007-12-18 04:53:54 -0500 (Tue, 18 Dec 2007)
New Revision: 14248
Modified:
annotations/branches/v3_2_1_GA_CP/src/java/org/hibernate/cfg/AnnotationBinder.java
annotations/branches/v3_2_1_GA_CP/src/java/org/hibernate/cfg/AnnotationConfiguration.java
annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/onetoone/Party.java
annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/onetoone/PartyAffiliate.java
Log:
ANN-556 fix
Modified:
annotations/branches/v3_2_1_GA_CP/src/java/org/hibernate/cfg/AnnotationBinder.java
===================================================================
---
annotations/branches/v3_2_1_GA_CP/src/java/org/hibernate/cfg/AnnotationBinder.java 2007-12-17
13:12:58 UTC (rev 14247)
+++
annotations/branches/v3_2_1_GA_CP/src/java/org/hibernate/cfg/AnnotationBinder.java 2007-12-18
09:53:54 UTC (rev 14248)
@@ -1902,7 +1902,7 @@
}
else {
mappings.addSecondPass(
- secondPass
+ secondPass, BinderHelper.isDefault( mappedBy )
);
}
}
Modified:
annotations/branches/v3_2_1_GA_CP/src/java/org/hibernate/cfg/AnnotationConfiguration.java
===================================================================
---
annotations/branches/v3_2_1_GA_CP/src/java/org/hibernate/cfg/AnnotationConfiguration.java 2007-12-17
13:12:58 UTC (rev 14247)
+++
annotations/branches/v3_2_1_GA_CP/src/java/org/hibernate/cfg/AnnotationConfiguration.java 2007-12-18
09:53:54 UTC (rev 14248)
@@ -293,6 +293,17 @@
iter.remove();
}
}
+ //process OneToManySecondPass in order: first
+ iter = secondPasses.iterator();
+ while ( iter.hasNext() ) {
+ SecondPass sp = (SecondPass) iter.next();
+
+ if ( sp instanceof CreateKeySecondPass ) {
+ sp.doSecondPass( classes );
+ iter.remove();
+ }
+ }
+
super.secondPassCompile();
inSecondPass = false;
Iterator tables = (Iterator<Map.Entry<Table, List<String[]>>>)
tableUniqueConstraints.entrySet().iterator();
Modified:
annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/onetoone/Party.java
===================================================================
---
annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/onetoone/Party.java 2007-12-17
13:12:58 UTC (rev 14247)
+++
annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/onetoone/Party.java 2007-12-18
09:53:54 UTC (rev 14248)
@@ -4,6 +4,7 @@
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.OneToOne;
+import javax.persistence.PrimaryKeyJoinColumn;
/**
* @author Emmanuel Bernard
@@ -13,6 +14,7 @@
@Id
String partyId;
- @OneToOne(mappedBy = "party")
+ @OneToOne
+ @PrimaryKeyJoinColumn
PartyAffiliate partyAffiliate;
}
Modified:
annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/onetoone/PartyAffiliate.java
===================================================================
---
annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/onetoone/PartyAffiliate.java 2007-12-17
13:12:58 UTC (rev 14247)
+++
annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/onetoone/PartyAffiliate.java 2007-12-18
09:53:54 UTC (rev 14248)
@@ -4,7 +4,6 @@
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.OneToOne;
-import javax.persistence.PrimaryKeyJoinColumn;
/**
* @author Emmanuel Bernard
@@ -14,8 +13,7 @@
@Id
String partyId;
- @OneToOne
- @PrimaryKeyJoinColumn
+ @OneToOne(mappedBy="partyAffiliate")
Party party;
String affiliateName;