From bb164a0763e5c5c868cf2e04e3f0be5c698b17df Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 20 Sep 2018 21:32:48 +1200 Subject: [PATCH] OneToOne inserts with idType=SEQUENCE will fail #1480 --- src/test/java/org/tests/model/onetoone/OtoBChild.java | 4 ++-- .../tests/model/onetoone/TestOneToOneImportedPkNative.java | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/test/java/org/tests/model/onetoone/OtoBChild.java b/src/test/java/org/tests/model/onetoone/OtoBChild.java index 56c1b58a5..a91fce44b 100644 --- a/src/test/java/org/tests/model/onetoone/OtoBChild.java +++ b/src/test/java/org/tests/model/onetoone/OtoBChild.java @@ -3,8 +3,8 @@ package org.tests.model.onetoone; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; -import javax.persistence.JoinColumn; import javax.persistence.OneToOne; +import javax.persistence.PrimaryKeyJoinColumn; @Entity public class OtoBChild { @@ -16,7 +16,7 @@ public class OtoBChild { String child; @OneToOne - @JoinColumn(name = "master_id", referencedColumnName = "id") + @PrimaryKeyJoinColumn OtoBMaster master; public Long getId() { diff --git a/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java b/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java index 1ee9e17e9..3cb7e3319 100644 --- a/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java +++ b/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java @@ -46,8 +46,8 @@ public class TestOneToOneImportedPkNative extends BaseTestCase { List lazyLoadSql = LoggedSqlCollector.stop(); assertThat(lazyLoadSql).hasSize(2); - assertThat(lazyLoadSql.get(0)).contains("select t0.id, t0.name, t1.master_id from oto_bmaster t0 left join oto_bchild t1"); - assertThat(lazyLoadSql.get(1)).contains("select t0.master_id, t0.child, t0.master_id from oto_bchild t0 where t0.master_id"); + assertThat(lazyLoadSql.get(0)).contains("select t0.id, t0.name, t0.id from oto_bmaster t0 where t0.id = ?"); + assertThat(lazyLoadSql.get(1)).contains("select t0.master_id, t0.child, t0.master_id from oto_bchild t0 where t0.master_id = ?"); } @Test @@ -64,12 +64,10 @@ public class TestOneToOneImportedPkNative extends BaseTestCase { assertThat(m.getId()).isEqualTo(one.getId()); assertThat(m.getName()).isEqualTo(one.getName()); - assertThat(m.getChild()).isNull(); OtoBMaster m2 = server.find(OtoBMaster.class, one.getId()); assertThat(m2.getId()).isEqualTo(one.getId()); assertThat(m2.getName()).isEqualTo(one.getName()); - assertThat(m2.getChild()).isNull(); } }