From 1b50cfaea15152838ced9902d36ff8da5cd36c52 Mon Sep 17 00:00:00 2001 From: Andrea Boriero Date: Tue, 18 May 2021 10:14:22 +0200 Subject: [PATCH] HHH-14616 Oprimistic Lock throws org.hibernate.exception.SQLGrammarException: could not retrieve version --- .../hibernate/persister/entity/AbstractEntityPersister.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java index ac6e614eae..47364f6ad6 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java @@ -165,6 +165,7 @@ public abstract class AbstractEntityPersister private static final CoreMessageLogger LOG = CoreLogging.messageLogger( AbstractEntityPersister.class ); public static final String ENTITY_CLASS = "class"; + public static final String VERSION_COLUMN_ALIAS = "v"; private final NavigableRole navigableRole; @@ -1709,7 +1710,7 @@ public String generateSelectVersionString() { SimpleSelect select = new SimpleSelect( getFactory().getDialect() ) .setTableName( getVersionedTableName() ); if ( isVersioned() ) { - select.addColumn( versionColumnName ); + select.addColumn( getVersionColumnName(), VERSION_COLUMN_ALIAS ); } else { select.addColumns( rootTableKeyColumnNames ); @@ -1935,7 +1936,7 @@ public Object getCurrentVersion(Serializable id, SharedSessionContractImplemento if ( !isVersioned() ) { return this; } - return getVersionType().nullSafeGet( rs, getVersionColumnName(), session, null ); + return getVersionType().nullSafeGet( rs, VERSION_COLUMN_ALIAS, session, null ); } finally { session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( rs, st );