Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-11596 - @OneToOne association with @JoinTable ignores optional attribute

This commit is contained in:
Andrea Boriero 2017-03-28 12:13:20 +01:00 committed by Vlad Mihalcea
parent be0a273c7c
commit e8d7279736
3 changed files with 237 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hibernate-core/src/main/java/org/hibernate/cfg/OneToOneSecondPass.java
View File

@ -103,6 +103,7 @@ public class OneToOneSecondPass implements SecondPass {
binder.setCascade( cascadeStrategy );
binder.setAccessType( inferredData.getDefaultAccess() );
Property prop = binder.makeProperty();
prop.setOptional( optional );
if ( BinderHelper.isEmptyAnnotationValue( mappedBy ) ) {
/*
* we need to check if the columns are in the right order

122
hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneJoinTableNonOptionalTest.java Normal file
View File

@ -0,0 +1,122 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.annotations.onetoone;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.ForeignKey;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import org.hibernate.PropertyValueException;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.junit.Test;
import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
/**
* @author Andrea Boriero
*/
@TestForIssue(jiraKey = "HHH-11596")
public class OneToOneJoinTableNonOptionalTest extends BaseCoreFunctionalTestCase {
@Override
protected Class[] getAnnotatedClasses() {
return new Class[] {Show.class, ShowDescription.class};
}
@Test
public void testSavingEntitiesWithANullOneToOneAssociationValue() {
doInHibernate( this::sessionFactory, session -> {
Show show = new Show();
session.save( show );
} );
try {
doInHibernate( this::sessionFactory, session -> {
ShowDescription showDescription = new ShowDescription();
session.save( showDescription );
} );
fail();
}
catch (PropertyValueException expected) {
assertTrue( expected.getMessage().startsWith( "not-null property references a null or transient value" ) );
}
}
@Entity(name = "Show")
@Table(name = "T_SHOW")
public static class Show {
@Id
@GeneratedValue
private Integer id;
@OneToOne
@JoinTable(name = "TSHOW_SHOWDESCRIPTION",
joinColumns = @JoinColumn(name = "SHOW_ID"),
inverseJoinColumns = @JoinColumn(name = "DESCRIPTION_ID"), foreignKey = @ForeignKey(name = "FK_DESC"))
private ShowDescription description;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public ShowDescription getDescription() {
return description;
}
public void setDescription(ShowDescription description) {
this.description = description;
description.setShow( this );
}
}
@Entity(name = "ShowDescription")
@Table(name = "SHOW_DESCRIPTION")
public static class ShowDescription {
@Id
@Column(name = "ID")
@GeneratedValue
private Integer id;
@OneToOne(mappedBy = "description", cascade = CascadeType.ALL, optional = false)
private Show show;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public Show getShow() {
return show;
}
public void setShow(Show show) {
this.show = show;
}
}
}

114
hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneJoinTableOptionalTest.java Normal file
View File

@ -0,0 +1,114 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.annotations.onetoone;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.ForeignKey;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import org.hibernate.annotations.NotFound;
import org.hibernate.annotations.NotFoundAction;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.junit.Test;
import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
/**
* @author Andrea Boriero
*/
@TestForIssue(jiraKey = "HHH-11596")
public class OneToOneJoinTableOptionalTest extends BaseCoreFunctionalTestCase {
@Override
protected Class[] getAnnotatedClasses() {
return new Class[] {Show.class, ShowDescription.class};
}
@Test
public void testSavingEntitiesWithANullOneToOneAssociationValue() {
doInHibernate( this::sessionFactory, session -> {
Show show = new Show();
session.save( show );
} );
doInHibernate( this::sessionFactory, session -> {
ShowDescription showDescription = new ShowDescription();
session.save( showDescription );
} );
}
@Entity(name = "Show")
@Table(name = "T_SHOW")
public static class Show {
@Id
@GeneratedValue
private Integer id;
@OneToOne
@JoinTable(name = "TSHOW_SHOWDESCRIPTION",
joinColumns = @JoinColumn(name = "SHOW_ID"),
inverseJoinColumns = @JoinColumn(name = "DESCRIPTION_ID"), foreignKey = @ForeignKey(name = "FK_DESC"))
private ShowDescription description;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public ShowDescription getDescription() {
return description;
}
public void setDescription(ShowDescription description) {
this.description = description;
description.setShow( this );
}
}
@Entity(name = "ShowDescription")
@Table(name = "SHOW_DESCRIPTION")
public static class ShowDescription {
@Id
@Column(name = "ID")
@GeneratedValue
private Integer id;
@OneToOne(mappedBy = "description", cascade = CascadeType.ALL)
private Show show;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public Show getShow() {
return show;
}
public void setShow(Show show) {
this.show = show;
}
}
}