Skip to content

Don't retrieve generated keys on INSERT if primary key is defined. #939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Don't retrieve generated keys on INSERT if primary key is defined. #939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions ...c/src/main/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
* @author Milan Milanov
* @author Myeonghyeon Lee
* @author Yunyoung LEE
* @author Radim Tlusty
* @since 1.1
*/
public class DefaultDataAccessStrategy implements DataAccessStrategy {
Expand Down Expand Up @@ -121,24 +122,33 @@ public <T> Object insert(T instance, Class<T> domainType, Identifier identifier)
addConvertedPropertyValue(parameterSource, idProperty, idValue, idProperty.getColumnName());
}

KeyHolder holder = new GeneratedKeyHolder();

IdGeneration idGeneration = sqlGeneratorSource.getDialect().getIdGeneration();
String insertSql = sqlGenerator.getInsert(new HashSet<>(parameterSource.getIdentifiers()));

if (idGeneration.driverRequiresKeyColumnNames()) {
if (idValue == null) {

String[] keyColumnNames = getKeyColumnNames(domainType);
if (keyColumnNames.length == 0) {
operations.update(insertSql, parameterSource, holder);
KeyHolder holder = new GeneratedKeyHolder();

IdGeneration idGeneration = sqlGeneratorSource.getDialect().getIdGeneration();

if (idGeneration.driverRequiresKeyColumnNames()) {

String[] keyColumnNames = getKeyColumnNames(domainType);
if (keyColumnNames.length == 0) {
operations.update(insertSql, parameterSource, holder);
} else {
operations.update(insertSql, parameterSource, holder, keyColumnNames);
}
} else {
operations.update(insertSql, parameterSource, holder, keyColumnNames);
operations.update(insertSql, parameterSource, holder);
}
} else {
operations.update(insertSql, parameterSource, holder);

return getIdFromHolder(holder, persistentEntity);
}
else {

return getIdFromHolder(holder, persistentEntity);
operations.update(insertSql, parameterSource);
return null;
}
}

/*
Expand Down
42 changes: 37 additions & 5 deletions ...t/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategyUnitTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,13 @@
* @author Mark Paluch
* @author Myeonghyeon Lee
* @author Myat Min
* @author Radim Tlusty
*/
public class DefaultDataAccessStrategyUnitTests {

public static final long ID_FROM_ADDITIONAL_VALUES = 23L;
public static final long ORIGINAL_ID = 4711L;
public static final long GENERATED_ID = 17;

NamedParameterJdbcOperations namedJdbcOperations = mock(NamedParameterJdbcOperations.class);
JdbcOperations jdbcOperations = mock(JdbcOperations.class);
Expand Down Expand Up @@ -99,7 +101,7 @@ public void additionalParameterForIdDoesNotLeadToDuplicateParameters() {
accessStrategy.insert(new DummyEntity(ORIGINAL_ID), DummyEntity.class, Identifier.from(additionalParameters));

verify(namedJdbcOperations).update(eq("INSERT INTO \"DUMMY_ENTITY\" (\"ID\") VALUES (:ID)"),
paramSourceCaptor.capture(), any(KeyHolder.class));
paramSourceCaptor.capture());
}

@Test // DATAJDBC-146
Expand All @@ -111,7 +113,7 @@ public void additionalParametersGetAddedToStatement() {

accessStrategy.insert(new DummyEntity(ORIGINAL_ID), DummyEntity.class, Identifier.from(additionalParameters));

verify(namedJdbcOperations).update(sqlCaptor.capture(), paramSourceCaptor.capture(), any(KeyHolder.class));
verify(namedJdbcOperations).update(sqlCaptor.capture(), paramSourceCaptor.capture());

assertThat(sqlCaptor.getValue()) //
.containsSubsequence("INSERT INTO \"DUMMY_ENTITY\" (", "\"ID\"", ") VALUES (", ":id", ")") //
Expand All @@ -131,7 +133,7 @@ public void considersConfiguredWriteConverter() {

accessStrategy.insert(entity, EntityWithBoolean.class, Identifier.empty());

verify(namedJdbcOperations).update(sqlCaptor.capture(), paramSourceCaptor.capture(), any(KeyHolder.class));
verify(namedJdbcOperations).update(sqlCaptor.capture(), paramSourceCaptor.capture());

assertThat(paramSourceCaptor.getValue().getValue("id")).isEqualTo(ORIGINAL_ID);
assertThat(paramSourceCaptor.getValue().getValue("flag")).isEqualTo("T");
Expand All @@ -150,7 +152,7 @@ public void considersConfiguredWriteConverterForIdValueObjects() {

accessStrategy.insert(entity, WithValueObjectId.class, Identifier.empty());

verify(namedJdbcOperations).update(anyString(), paramSourceCaptor.capture(), any(KeyHolder.class));
verify(namedJdbcOperations).update(anyString(), paramSourceCaptor.capture());

assertThat(paramSourceCaptor.getValue().getValue("id")).isEqualTo(rawId);
assertThat(paramSourceCaptor.getValue().getValue("value")).isEqualTo("vs. superman");
Expand All @@ -177,7 +179,7 @@ public void considersConfiguredWriteConverterForIdValueObjectsWhichReferencedInO
additionalParameters.put(SqlIdentifier.quoted("DUMMYENTITYROOT"), rootIdValue);
accessStrategy.insert(root, DummyEntityRoot.class, Identifier.from(additionalParameters));

verify(namedJdbcOperations).update(anyString(), paramSourceCaptor.capture(), any(KeyHolder.class));
verify(namedJdbcOperations).update(anyString(), paramSourceCaptor.capture());

assertThat(paramSourceCaptor.getValue().getValue("id")).isEqualTo(rawId);

Expand All @@ -191,6 +193,36 @@ public void considersConfiguredWriteConverterForIdValueObjectsWhichReferencedInO
assertThat(paramSourceCaptor.getValue().getValue("DUMMYENTITYROOT")).isEqualTo(rawId);
}

@Test // gh-933
public void insertWithDefinedIdDoesNotRetrieveGeneratedKeys() {

Object generatedId = accessStrategy.insert(new DummyEntity(ORIGINAL_ID), DummyEntity.class, Identifier.from(additionalParameters));

assertThat(generatedId).isNull();

verify(namedJdbcOperations).update(eq("INSERT INTO \"DUMMY_ENTITY\" (\"ID\") VALUES (:id)"),
paramSourceCaptor.capture());
}

@Test // gh-933
public void insertWithUndefinedIdRetrievesGeneratedKeys() {

when(namedJdbcOperations.update(any(), any(), any()))
.then(invocation -> {

KeyHolder keyHolder = invocation.getArgument(2);
keyHolder.getKeyList().add(singletonMap("ID", GENERATED_ID));
return 1;
});

Object generatedId = accessStrategy.insert(new DummyEntity(null), DummyEntity.class, Identifier.from(additionalParameters));

assertThat(generatedId).isEqualTo(GENERATED_ID);

verify(namedJdbcOperations).update(eq("INSERT INTO \"DUMMY_ENTITY\" VALUES ()"),
paramSourceCaptor.capture(), any(KeyHolder.class));
}

private DefaultDataAccessStrategy createAccessStrategyWithConverter(List<?> converters) {
DelegatingDataAccessStrategy relationResolver = new DelegatingDataAccessStrategy();

Expand Down