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

HHH-18175 StatelessSession not incrementing @Version for entities with IDENTITY id generation 

Signed-off-by: Gavin King <gavin@hibernate.org>
This commit is contained in:
Gavin King 2024-05-28 16:33:28 +02:00
parent d33ed62b21
commit e21a590e7d
2 changed files with 77 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java
View File

@ -125,14 +125,14 @@ public class StatelessSessionImpl extends AbstractSharedSessionContract implemen
final EntityPersister persister = getEntityPersister( entityName, entity ); final EntityPersister persister = getEntityPersister( entityName, entity );
final Object id; final Object id;
final Object[] state = persister.getValues( entity ); final Object[] state = persister.getValues( entity );
final Generator generator = persister.getGenerator();
if ( !generator.generatedOnExecution( entity, this ) ) {
id = ( (BeforeExecutionGenerator) generator).generate( this, entity, null, INSERT );
if ( persister.isVersioned() ) { if ( persister.isVersioned() ) {
if ( seedVersion( entity, state, persister, this ) ) { if ( seedVersion( entity, state, persister, this ) ) {
persister.setValues( entity, state ); persister.setValues( entity, state );
} }
} }
final Generator generator = persister.getGenerator();
if ( !generator.generatedOnExecution( entity, this ) ) {
id = ( (BeforeExecutionGenerator) generator).generate( this, entity, null, INSERT );
if ( firePreInsert(entity, id, state, persister) ) { if ( firePreInsert(entity, id, state, persister) ) {
return id; return id;
} }

72
hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionVersioningTest.java Normal file
View File

@ -0,0 +1,72 @@
package org.hibernate.orm.test.stateless;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Version;
import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.OracleDialect;
import org.hibernate.dialect.SQLServerDialect;
import org.hibernate.testing.orm.junit.DomainModel;
import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.junit.jupiter.api.Test;
import java.util.UUID;
import static jakarta.persistence.GenerationType.IDENTITY;
import static org.junit.jupiter.api.Assertions.assertEquals;
@SessionFactory
@DomainModel(annotatedClasses = {StatelessSessionVersioningTest.IdentityVersioned.class,
StatelessSessionVersioningTest.UUIDVersioned.class})
public class StatelessSessionVersioningTest {
@Test void testIdentity(SessionFactoryScope scope) {
Dialect dialect = scope.getMetadataImplementor().getDatabase().getDialect();
scope.inStatelessTransaction(s -> {
IdentityVersioned v = new IdentityVersioned();
s.insert(v);
assertEquals(0, v.version);
s.update(v);
assertEquals(1, v.version);
if ( !(dialect instanceof SQLServerDialect) && !(dialect instanceof OracleDialect) ) {
//TODO: upsert() with IDENTITY not working on SQL Server
//TODO: upsert() with version not working on Oracle
s.upsert(v);
assertEquals(2, v.version);
}
s.delete(v);
});
}
@Test void testUUID(SessionFactoryScope scope) {
Dialect dialect = scope.getMetadataImplementor().getDatabase().getDialect();
scope.inStatelessTransaction(s -> {
UUIDVersioned v = new UUIDVersioned();
s.insert(v);
assertEquals(0, v.version);
s.update(v);
assertEquals(1, v.version);
if ( !(dialect instanceof OracleDialect) ) {
//TODO: upsert() with version not working on Oracle
s.upsert(v);
assertEquals(2, v.version);
}
s.delete(v);
});
}
@Entity
static class IdentityVersioned {
@Id @GeneratedValue(strategy = IDENTITY)
long id;
@Version
int version = -1;
}
@Entity
static class UUIDVersioned {
@Id @GeneratedValue(strategy = GenerationType.UUID)
UUID id;
@Version
int version = -1;
}
}