Spring/spring-data-relational
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAJDBC-291 - Setting DB-generated ids now works across collections.

Browse Source 
Original pull request: #173.
This commit is contained in:
Jens Schauder
2019-09-11 10:44:48 +02:00
committed by Mark Paluch
parent 2a0729d7fe
commit feb60c8560
7 changed files with 1363 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/ImmutableAggregateTemplateHsqlIntegrationTests.java
View File

@@ -97,6 +97,29 @@ public class ImmutableAggregateTemplateHsqlIntegrationTests {
softly.assertAll();
}
@Test // DATAJDBC-291
public void saveAndLoadAnEntityWithTwoReferencedEntitiesById() {
LegoSet saved = template.save(createLegoSet(createManual(), new Author(null, "Alfred E. Neumann")));
assertThat(saved.manual.id).describedAs("id of stored manual").isNotNull();
assertThat(saved.author.id).describedAs("id of stored author").isNotNull();
LegoSet reloadedLegoSet = template.findById(saved.getId(), LegoSet.class);
assertThat(reloadedLegoSet.manual).isNotNull();
SoftAssertions softly = new SoftAssertions();
softly.assertThat(reloadedLegoSet.manual.getId()) //
.isEqualTo(saved.getManual().getId()) //
.isNotNull();
softly.assertThat(reloadedLegoSet.manual.getContent()).isEqualTo(saved.getManual().getContent());
softly.assertThat(reloadedLegoSet.author.getName()).isEqualTo(saved.getAuthor().getName());
softly.assertAll();
}
@Test // DATAJDBC-241
public void saveAndLoadManyEntitiesWithReferencedEntity() {
@@ -168,7 +191,7 @@ public class ImmutableAggregateTemplateHsqlIntegrationTests {
LegoSet saved = template.save(createLegoSet(null));
LegoSet changedLegoSet = new LegoSet(saved.id, saved.name, new Manual(23L, "Some content"));
LegoSet changedLegoSet = new LegoSet(saved.id, saved.name, new Manual(23L, "Some content"), null);
template.save(changedLegoSet);
@@ -182,7 +205,7 @@ public class ImmutableAggregateTemplateHsqlIntegrationTests {
LegoSet saved = template.save(createLegoSet(null));
LegoSet changedLegoSet = new LegoSet(saved.id, saved.name, null);
LegoSet changedLegoSet = new LegoSet(saved.id, saved.name, null, null);
template.save(changedLegoSet);
@@ -201,7 +224,7 @@ public class ImmutableAggregateTemplateHsqlIntegrationTests {
LegoSet saved = template.save(createLegoSet(null));
LegoSet changedLegoSet = new LegoSet(saved.id, saved.name, new Manual(null, "other content"));
LegoSet changedLegoSet = new LegoSet(saved.id, saved.name, new Manual(null, "other content"), null);
template.save(changedLegoSet);
@@ -233,7 +256,12 @@ public class ImmutableAggregateTemplateHsqlIntegrationTests {
private static LegoSet createLegoSet(Manual manual) {
return new LegoSet(null, "Star Destroyer", manual);
return new LegoSet(null, "Star Destroyer", manual, null);
}
private static LegoSet createLegoSet(Manual manual, Author author) {
return new LegoSet(null, "Star Destroyer", manual, author);
}
private static Manual createManual() {
@@ -248,6 +276,7 @@ public class ImmutableAggregateTemplateHsqlIntegrationTests {
@Id Long id;
String name;
Manual manual;
Author author;
}
@Value
@@ -258,6 +287,14 @@ public class ImmutableAggregateTemplateHsqlIntegrationTests {
String content;
}
@Value
@Wither
static class Author {
@Id Long id;
String name;
}
@Configuration
@Import(TestConfiguration.class)
static class Config {

28
spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.core/ImmutableAggregateTemplateHsqlIntegrationTests-hsql.sql
View File

@@ -1,5 +1,25 @@
CREATE TABLE LEGO_SET ( id BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1) PRIMARY KEY, NAME VARCHAR(30));
CREATE TABLE MANUAL ( id BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1) PRIMARY KEY, LEGO_SET BIGINT, CONTENT VARCHAR(2000));
CREATE TABLE LEGO_SET
(
id BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1) PRIMARY KEY,
NAME VARCHAR(30)
);
ALTER TABLE MANUAL ADD FOREIGN KEY (LEGO_SET)
REFERENCES LEGO_SET(id);
CREATE TABLE MANUAL
(
id BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1) PRIMARY KEY,
LEGO_SET BIGINT,
CONTENT VARCHAR(2000)
);
ALTER TABLE MANUAL
ADD FOREIGN KEY (LEGO_SET)
REFERENCES LEGO_SET (id);
CREATE TABLE AUTHOR
(
id BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1) PRIMARY KEY,
LEGO_SET BIGINT,
NAME VARCHAR(2000)
);
ALTER TABLE AUTHOR
ADD FOREIGN KEY (LEGO_SET)
REFERENCES LEGO_SET (id);