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

Fix Oracle 11 issues with aliases and disable FollowOnLockingTest on that version

This commit is contained in:
Christian Beikov 2023-10-12 11:41:55 +02:00
parent 12442bd8c7
commit d9e962c991
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java
View File

@ -4440,6 +4440,16 @@ public abstract class AbstractSqlAstTranslator<T extends JdbcOperation> implemen
&& !( getCurrentQueryPart() instanceof QueryGroup ) ) { && !( getCurrentQueryPart() instanceof QueryGroup ) ) {
appendSql( '*' ); appendSql( '*' );
} }
else if ( columnAliases != null ) {
String separator = "";
for ( String columnAlias : columnAliases ) {
appendSql( separator );
appendSql( alias );
appendSql( '.' );
appendSql( columnAlias );
separator = COMA_SEPARATOR;
}
}
else { else {
int size = 0; int size = 0;
for ( SqlSelection sqlSelection : queryPart.getFirstQuerySpec().getSelectClause().getSqlSelections() ) { for ( SqlSelection sqlSelection : queryPart.getFirstQuerySpec().getSelectClause().getSqlSelections() ) {

2
hibernate-core/src/test/java/org/hibernate/orm/test/locking/jpa/FollowOnLockingTest.java
View File

@ -12,6 +12,7 @@ import java.util.concurrent.TimeUnit;
import org.hibernate.dialect.CockroachDialect; import org.hibernate.dialect.CockroachDialect;
import org.hibernate.dialect.HSQLDialect; import org.hibernate.dialect.HSQLDialect;
import org.hibernate.dialect.OracleDialect;
import org.hibernate.query.spi.QueryImplementor; import org.hibernate.query.spi.QueryImplementor;
import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.jdbc.SQLStatementInspector;
@ -39,6 +40,7 @@ import static org.hibernate.jpa.SpecHints.HINT_SPEC_QUERY_TIMEOUT;
@SessionFactory(useCollectingStatementInspector = true) @SessionFactory(useCollectingStatementInspector = true)
@SkipForDialect(dialectClass = HSQLDialect.class, reason = "Seems HSQLDB doesn't cancel the query if it waits for a lock?!") @SkipForDialect(dialectClass = HSQLDialect.class, reason = "Seems HSQLDB doesn't cancel the query if it waits for a lock?!")
@SkipForDialect(dialectClass = CockroachDialect.class, reason = "Cockroach allows the concurrent access but cancels one or both transactions at the end") @SkipForDialect(dialectClass = CockroachDialect.class, reason = "Cockroach allows the concurrent access but cancels one or both transactions at the end")
@SkipForDialect(dialectClass = OracleDialect.class, majorVersion = 11, reason = "Timeouts don't work on Oracle 11 when using a driver other than ojdbc6, but we can't test with that driver")
public class FollowOnLockingTest { public class FollowOnLockingTest {
@Test @Test