mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-11 06:30:28 +00:00
#1294 - NPE when delete cascade from bean with SoftDelete to imported OneToOne without SoftDelete
This commit is contained in:
1 parent
68a470a086
commit
c8e199177c
5 files changed
+185
-8
No files matched your search
@@ -0,0 +1,71 @@
|
||||
package org.tests.model.softdelete;
|
||||
|
||||
import io.ebean.annotation.SoftDelete;
|
||||
|
||||
import javax.persistence.CascadeType;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Id;
|
||||
import javax.persistence.OneToOne;
|
||||
import javax.persistence.Version;
|
||||
|
||||
@Entity
|
||||
public class ESoftDelOneA {
|
||||
|
||||
@Id
|
||||
long id;
|
||||
|
||||
String name;
|
||||
|
||||
@OneToOne(cascade = CascadeType.ALL)
|
||||
ESoftDelOneB oneb;
|
||||
|
||||
@SoftDelete
|
||||
boolean deleted;
|
||||
|
||||
@Version
|
||||
long version;
|
||||
|
||||
public ESoftDelOneA(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public ESoftDelOneB getOneb() {
|
||||
return oneb;
|
||||
}
|
||||
|
||||
public void setOneb(ESoftDelOneB oneb) {
|
||||
this.oneb = oneb;
|
||||
}
|
||||
|
||||
public boolean isDeleted() {
|
||||
return deleted;
|
||||
}
|
||||
|
||||
public void setDeleted(boolean deleted) {
|
||||
this.deleted = deleted;
|
||||
}
|
||||
|
||||
public long getVersion() {
|
||||
return version;
|
||||
}
|
||||
|
||||
public void setVersion(long version) {
|
||||
this.version = version;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
package org.tests.model.softdelete;
|
||||
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Id;
|
||||
import javax.persistence.OneToOne;
|
||||
import javax.persistence.Version;
|
||||
|
||||
@Entity
|
||||
public class ESoftDelOneB {
|
||||
|
||||
@Id
|
||||
long id;
|
||||
|
||||
String name;
|
||||
|
||||
@OneToOne(mappedBy = "oneb")
|
||||
ESoftDelOneA onea;
|
||||
|
||||
@Version
|
||||
long version;
|
||||
|
||||
public ESoftDelOneB(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public ESoftDelOneA getOnea() {
|
||||
return onea;
|
||||
}
|
||||
|
||||
public void setOnea(ESoftDelOneA onea) {
|
||||
this.onea = onea;
|
||||
}
|
||||
|
||||
public long getVersion() {
|
||||
return version;
|
||||
}
|
||||
|
||||
public void setVersion(long version) {
|
||||
this.version = version;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
package org.tests.softdelete;
|
||||
|
||||
import io.ebean.BaseTestCase;
|
||||
import io.ebean.Ebean;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import org.junit.Test;
|
||||
import org.tests.model.softdelete.ESoftDelOneA;
|
||||
import org.tests.model.softdelete.ESoftDelOneB;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
public class TestSoftDeleteOtoCascade extends BaseTestCase {
|
||||
|
||||
@Test
|
||||
public void test() {
|
||||
|
||||
ESoftDelOneA a = new ESoftDelOneA("a1");
|
||||
ESoftDelOneB b = new ESoftDelOneB("b1");
|
||||
|
||||
a.setOneb(b);
|
||||
b.setOnea(a);
|
||||
|
||||
Ebean.save(a);
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
|
||||
// delete doesn't cascade to ESoftDelOneB as this is a
|
||||
// soft delete and ESoftDelOneB doesn't have soft delete flag
|
||||
Ebean.delete(a);
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
assertThat(sql).hasSize(1);
|
||||
assertThat(sql.get(0)).contains("update esoft_del_one_a set deleted=?, version=? where id=? and version=?");
|
||||
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user