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

minor cleanup

This commit is contained in:
Steve Ebersole 2019-09-23 11:01:00 -05:00
parent 25152db2de
commit cd354f1e2b
2 changed files with 11 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hibernate-core/src/main/java/org/hibernate/query/spi/QueryEngine.java
View File

@ -13,6 +13,8 @@ import org.hibernate.Incubating;
import org.hibernate.boot.spi.MetadataImplementor;
import org.hibernate.boot.spi.SessionFactoryOptions;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.dialect.Dialect;
import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
import org.hibernate.engine.jdbc.spi.JdbcServices;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.internal.util.config.ConfigurationHelper;
@ -66,9 +68,16 @@ public class QueryEngine {
SqmCreationOptions sqmCreationOptions,
Map properties,
NamedQueryRepository namedQueryRepository) {
final JdbcServices jdbcServices = serviceRegistry.getService( JdbcServices.class );
final JdbcEnvironment jdbcEnvironment = jdbcServices.getJdbcEnvironment();
final Dialect dialect = jdbcEnvironment.getDialect();
this.namedQueryRepository = namedQueryRepository;
// todo (6.0) : allow SemanticQueryProducer to be pluggable (see legacy `QueryTranslatorFactoryInitiator`)
// - also, allow for Dialect to specify producer to use (or defer to standard producer)
this.semanticQueryProducer = new SemanticQueryProducerImpl( sqmCreationContext, sqmCreationOptions );
this.criteriaBuilder = new SqmCriteriaNodeBuilder(
this,
domainModel.getJpaMetamodel(),
@ -78,10 +87,7 @@ public class QueryEngine {
this.interpretationCache = buildQueryPlanCache( properties );
this.sqmFunctionRegistry = new SqmFunctionRegistry();
serviceRegistry.getService( JdbcServices.class )
.getJdbcEnvironment()
.getDialect()
.initializeFunctionRegistry( this );
dialect.initializeFunctionRegistry( this );
if ( runtimeOptions.getSqmFunctionRegistry() != null ) {
runtimeOptions.getSqmFunctionRegistry().overlay( sqmFunctionRegistry );
}

33
hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstWalker.java
View File

@ -57,38 +57,7 @@ import org.hibernate.sql.results.internal.EmptySqlSelection;
import org.hibernate.type.descriptor.sql.SqlTypeDescriptorIndicators;
import org.hibernate.type.spi.TypeConfiguration;
import static org.hibernate.sql.ast.spi.SqlAppender.AND_KEYWORD;
import static org.hibernate.sql.ast.spi.SqlAppender.ASC_KEYWORD;
import static org.hibernate.sql.ast.spi.SqlAppender.AS_KEYWORD;
import static org.hibernate.sql.ast.spi.SqlAppender.BETWEEN_KEYWORD;
import static org.hibernate.sql.ast.spi.SqlAppender.CASE_KEYWORD;
import static org.hibernate.sql.ast.spi.SqlAppender.CLOSE_PARENTHESIS;
import static org.hibernate.sql.ast.spi.SqlAppender.COLLATE_KEYWORD;
import static org.hibernate.sql.ast.spi.SqlAppender.COMA_SEPARATOR;
import static org.hibernate.sql.ast.spi.SqlAppender.DESC_KEYWORD;
import static org.hibernate.sql.ast.spi.SqlAppender.DISTINCT_KEYWORD;
import static org.hibernate.sql.ast.spi.SqlAppender.ELSE_KEYWORD;
import static org.hibernate.sql.ast.spi.SqlAppender.EMPTY_STRING;
import static org.hibernate.sql.ast.spi.SqlAppender.END_KEYWORD;
import static org.hibernate.sql.ast.spi.SqlAppender.ESCAPE_KEYWORD;
import static org.hibernate.sql.ast.spi.SqlAppender.FROM_KEYWORD;
import static org.hibernate.sql.ast.spi.SqlAppender.IN_KEYWORD;
import static org.hibernate.sql.ast.spi.SqlAppender.IS_NOT_NULL_FRAGMENT;
import static org.hibernate.sql.ast.spi.SqlAppender.IS_NULL_FRAGMENT;
import static org.hibernate.sql.ast.spi.SqlAppender.JOIN_KEYWORD;
import static org.hibernate.sql.ast.spi.SqlAppender.LIKE_KEYWORD;
import static org.hibernate.sql.ast.spi.SqlAppender.NOT_KEYWORD;
import static org.hibernate.sql.ast.spi.SqlAppender.NO_SEPARATOR;
import static org.hibernate.sql.ast.spi.SqlAppender.NULL_KEYWORD;
import static org.hibernate.sql.ast.spi.SqlAppender.ON_KEYWORD;
import static org.hibernate.sql.ast.spi.SqlAppender.OPEN_PARENTHESIS;
import static org.hibernate.sql.ast.spi.SqlAppender.ORDER_BY_KEYWORD;
import static org.hibernate.sql.ast.spi.SqlAppender.OR_KEYWORD;
import static org.hibernate.sql.ast.spi.SqlAppender.PARAM_MARKER;
import static org.hibernate.sql.ast.spi.SqlAppender.SELECT_KEYWORD;
import static org.hibernate.sql.ast.spi.SqlAppender.THEN_KEYWORD;
import static org.hibernate.sql.ast.spi.SqlAppender.WHEN_KEYWORD;
import static org.hibernate.sql.ast.spi.SqlAppender.WHERE_KEYWORD;
import static org.hibernate.sql.ast.spi.SqlAppender.*;
/**
* @author Steve Ebersole