Skip to content

Commit

Permalink
support the full set of standard HQL functions
Browse files Browse the repository at this point in the history 
- implement LOCATE(), POSITION() query functions
- implement CAST() query function with support for
    string/integer/long/float/double/time/date/timestamp
- make SUBSTRING, TRIM, LENGTH, ABS, SQRT, etc, etc work
- and rationalize function registration in the Dialects
  • Loading branch information
@gavinking @sebersole
gavinking authored and sebersole committed May 8, 2019
1 parent e4f3d95 commit afb9a01
Show file tree
Hide file tree
Showing 110 changed files with 1,124 additions and 2,108 deletions.
5 changes: 3 additions & 2 deletions hibernate-core/src/main/antlr/org/hibernate/query/hql/internal/HqlParser.g4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@ castTarget
// - "pass through"
// - coded cast (INTEGER_LITERAL)
// - SqlTypeDescriptorRegistry key
: IDENTIFIER
: identifier
;

concatFunction
Expand Down Expand Up @@ -737,7 +737,7 @@ positionStringArgument
;

charLengthFunction
: CAST LEFT_PAREN expression RIGHT_PAREN
: CHARACTER_LENGTH LEFT_PAREN expression RIGHT_PAREN
;

octetLengthFunction
Expand Down Expand Up @@ -772,6 +772,7 @@ identifier
| BIT_LENGTH
| BOTH
| CAST
| CHARACTER_LENGTH
| COALESCE
| COLLATE
| CONCAT
Expand Down
3 changes: 0 additions & 3 deletions hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.BaselineSessionEventsListenerBuilder;
import org.hibernate.context.spi.CurrentTenantIdentifierResolver;
import org.hibernate.dialect.function.SQLFunctionTemplate;
import org.hibernate.engine.config.internal.ConfigurationServiceImpl;
import org.hibernate.engine.config.spi.ConfigurationService;
import org.hibernate.engine.jdbc.env.spi.ExtractedDatabaseMetaData;
Expand Down Expand Up @@ -239,8 +238,6 @@ public class SessionFactoryOptionsBuilder implements SessionFactoryOptions {
private LiteralHandlingMode criteriaLiteralHandlingMode;
private ImmutableEntityUpdateQueryHandlingMode immutableEntityUpdateQueryHandlingMode;

private Map<String, SQLFunctionTemplate> sqlFunctions;

private JpaCompliance jpaCompliance;

private boolean failOnPaginationOverCollectionFetchEnabled;
Expand Down
37 changes: 21 additions & 16 deletions hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import org.hibernate.ScrollMode;
import org.hibernate.boot.model.TypeContributions;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.dialect.function.LocateEmulation;
import org.hibernate.dialect.identity.HANAIdentityColumnSupport;
import org.hibernate.dialect.identity.IdentityColumnSupport;
import org.hibernate.dialect.pagination.AbstractLimitHandler;
Expand Down Expand Up @@ -80,8 +81,6 @@
import org.hibernate.query.sqm.mutation.spi.idtable.GlobalTempTableExporter;
import org.hibernate.query.sqm.mutation.spi.idtable.GlobalTemporaryTableStrategy;
import org.hibernate.query.sqm.mutation.spi.idtable.IdTable;
import org.hibernate.query.sqm.produce.function.spi.AnsiTrimFunctionTemplate;
import org.hibernate.query.sqm.produce.function.spi.ConcatFunctionTemplate;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.sql.AbstractJdbcValueBinder;
import org.hibernate.sql.AbstractJdbcValueExtractor;
Expand Down Expand Up @@ -280,9 +279,6 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
queryEngine.getSqmFunctionRegistry().registerNamed( "to_time", StandardSpiBasicTypes.TIME );
queryEngine.getSqmFunctionRegistry().registerNamed( "to_timestamp", StandardSpiBasicTypes.TIMESTAMP );

queryEngine.getSqmFunctionRegistry().registerNoArgs( "current_date", StandardSpiBasicTypes.DATE );
queryEngine.getSqmFunctionRegistry().registerNoArgs( "current_time", StandardSpiBasicTypes.TIME );
queryEngine.getSqmFunctionRegistry().registerNoArgs( "current_timestamp", StandardSpiBasicTypes.TIMESTAMP );
queryEngine.getSqmFunctionRegistry().registerNoArgs( "current_utcdate", StandardSpiBasicTypes.DATE );
queryEngine.getSqmFunctionRegistry().registerNoArgs( "current_utctime", StandardSpiBasicTypes.TIME );
queryEngine.getSqmFunctionRegistry().registerNoArgs( "current_utctimestamp", StandardSpiBasicTypes.TIMESTAMP );
Expand Down Expand Up @@ -324,7 +320,6 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
queryEngine.getSqmFunctionRegistry().registerNamed( "to_smallint", StandardSpiBasicTypes.SHORT );
queryEngine.getSqmFunctionRegistry().registerNamed( "to_tinyint", StandardSpiBasicTypes.BYTE );

queryEngine.getSqmFunctionRegistry().registerNamed( "abs" );
queryEngine.getSqmFunctionRegistry().registerNamed( "acos", StandardSpiBasicTypes.DOUBLE );
queryEngine.getSqmFunctionRegistry().registerNamed( "asin", StandardSpiBasicTypes.DOUBLE );
queryEngine.getSqmFunctionRegistry().namedTemplateBuilder( "atan2", "atan" )
Expand All @@ -348,13 +343,12 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
queryEngine.getSqmFunctionRegistry().namedTemplateBuilder( "log", "ln" )
.setInvariantType( StandardSpiBasicTypes.DOUBLE )
.register();

queryEngine.getSqmFunctionRegistry().registerNamed( "power" );
queryEngine.getSqmFunctionRegistry().registerNamed( "round" );
queryEngine.getSqmFunctionRegistry().registerNamed( "mod", StandardSpiBasicTypes.INTEGER );
queryEngine.getSqmFunctionRegistry().registerNamed( "sign", StandardSpiBasicTypes.INTEGER );
queryEngine.getSqmFunctionRegistry().registerNamed( "sin", StandardSpiBasicTypes.DOUBLE );
queryEngine.getSqmFunctionRegistry().registerNamed( "sinh", StandardSpiBasicTypes.DOUBLE );
queryEngine.getSqmFunctionRegistry().registerNamed( "sqrt", StandardSpiBasicTypes.DOUBLE );
queryEngine.getSqmFunctionRegistry().registerNamed( "tan", StandardSpiBasicTypes.DOUBLE );
queryEngine.getSqmFunctionRegistry().registerNamed( "tanh", StandardSpiBasicTypes.DOUBLE );
queryEngine.getSqmFunctionRegistry().registerNamed( "uminus" );
Expand All @@ -363,13 +357,12 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
queryEngine.getSqmFunctionRegistry().registerNamed( "to_nvarchar", StandardSpiBasicTypes.STRING );
queryEngine.getSqmFunctionRegistry().registerNamed( "to_varchar", StandardSpiBasicTypes.STRING );

queryEngine.getSqmFunctionRegistry().registerVarArgs( "concat", StandardSpiBasicTypes.STRING, "(", "||", ")" );

queryEngine.getSqmFunctionRegistry().registerNamed( "ascii", StandardSpiBasicTypes.INTEGER );
queryEngine.getSqmFunctionRegistry().registerNamed( "char", StandardSpiBasicTypes.CHARACTER );
queryEngine.getSqmFunctionRegistry().register( "concat", ConcatFunctionTemplate.INSTANCE );
queryEngine.getSqmFunctionRegistry().registerNamed( "lcase", StandardSpiBasicTypes.STRING );
queryEngine.getSqmFunctionRegistry().registerNamed( "left", StandardSpiBasicTypes.STRING );
queryEngine.getSqmFunctionRegistry().registerNamed( "length", StandardSpiBasicTypes.INTEGER );
queryEngine.getSqmFunctionRegistry().registerPattern( "locate", "locate(?2, ?1, ?3)", StandardSpiBasicTypes.INTEGER );
queryEngine.getSqmFunctionRegistry().registerNamed( "lpad", StandardSpiBasicTypes.STRING );
queryEngine.getSqmFunctionRegistry().registerNamed( "ltrim", StandardSpiBasicTypes.STRING );
queryEngine.getSqmFunctionRegistry().registerNamed( "nchar", StandardSpiBasicTypes.STRING );
Expand All @@ -379,24 +372,36 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
queryEngine.getSqmFunctionRegistry().registerNamed( "rtrim", StandardSpiBasicTypes.STRING );
queryEngine.getSqmFunctionRegistry().registerNamed( "substr_after", StandardSpiBasicTypes.STRING );
queryEngine.getSqmFunctionRegistry().registerNamed( "substr_before", StandardSpiBasicTypes.STRING );
queryEngine.getSqmFunctionRegistry().registerNamed( "substring", StandardSpiBasicTypes.STRING );
queryEngine.getSqmFunctionRegistry().register( "trim", AnsiTrimFunctionTemplate.INSTANCE );
queryEngine.getSqmFunctionRegistry().registerNamed( "ucase", StandardSpiBasicTypes.STRING );
queryEngine.getSqmFunctionRegistry().registerNamed( "unicode", StandardSpiBasicTypes.INTEGER );
queryEngine.getSqmFunctionRegistry().registerPattern( "bit_length", "length(to_binary(?1))*8", StandardSpiBasicTypes.INTEGER );

queryEngine.getSqmFunctionRegistry().register(
"locate",
new LocateEmulation(
queryEngine.getSqmFunctionRegistry()
.patternTemplateBuilder( "locate/2", "locate(?2, ?1)" )
.setExactArgumentCount( 2 )
.setInvariantType( StandardSpiBasicTypes.INTEGER )
.register(),
queryEngine.getSqmFunctionRegistry()
.patternTemplateBuilder( "locate/3", "locate(?2, ?1, ?3)" )
.setExactArgumentCount( 3 )
.setInvariantType( StandardSpiBasicTypes.INTEGER )
.register()
)
);

queryEngine.getSqmFunctionRegistry().registerNamed( "to_blob", StandardSpiBasicTypes.BLOB );
queryEngine.getSqmFunctionRegistry().registerNamed( "to_clob", StandardSpiBasicTypes.CLOB );
queryEngine.getSqmFunctionRegistry().registerNamed( "to_nclob", StandardSpiBasicTypes.NCLOB );

queryEngine.getSqmFunctionRegistry().registerNamed( "coalesce" );
queryEngine.getSqmFunctionRegistry().registerNoArgs( "current_connection", StandardSpiBasicTypes.INTEGER );
queryEngine.getSqmFunctionRegistry().registerNoArgs( "current_schema", StandardSpiBasicTypes.STRING );
queryEngine.getSqmFunctionRegistry().registerNoArgs( "current_user", StandardSpiBasicTypes.STRING );
queryEngine.getSqmFunctionRegistry().registerVarArgs( "grouping_id", StandardSpiBasicTypes.INTEGER, "(", ",", ")" );
queryEngine.getSqmFunctionRegistry().registerNamed( "grouping_id", StandardSpiBasicTypes.INTEGER);
queryEngine.getSqmFunctionRegistry().registerNamed( "ifnull" );
queryEngine.getSqmFunctionRegistry().registerNamed( "map" );
queryEngine.getSqmFunctionRegistry().registerNamed( "nullif" );
queryEngine.getSqmFunctionRegistry().registerNamed( "session_context" );
queryEngine.getSqmFunctionRegistry().registerNoArgs( "session_user", StandardSpiBasicTypes.STRING );
queryEngine.getSqmFunctionRegistry().registerNoArgs( "sysuuid", StandardSpiBasicTypes.STRING );
Expand Down
24 changes: 11 additions & 13 deletions hibernate-core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,14 @@
import org.hibernate.LockOptions;
import org.hibernate.cfg.Environment;
import org.hibernate.dialect.function.CommonFunctionFactory;
import org.hibernate.dialect.function.SybaseLocateEmulationFunctionTemplate;
import org.hibernate.dialect.function.TransactSQLTrimEmulation;
import org.hibernate.dialect.identity.AbstractTransactSQLIdentityColumnSupport;
import org.hibernate.dialect.identity.IdentityColumnSupport;
import org.hibernate.naming.Identifier;
import org.hibernate.query.spi.QueryEngine;
import org.hibernate.query.sqm.mutation.spi.SqmMutationStrategy;
import org.hibernate.query.sqm.mutation.spi.idtable.LocalTemporaryTableStrategy;
import org.hibernate.query.sqm.mutation.spi.idtable.StandardIdTableSupport;
import org.hibernate.query.sqm.produce.function.spi.ConcatFunctionTemplate;
import org.hibernate.type.spi.StandardSpiBasicTypes;

/**
Expand Down Expand Up @@ -73,8 +72,7 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
.setInvariantType( StandardSpiBasicTypes.LONG )
.setExactArgumentCount( 1 )
.register();
CommonFunctionFactory.lower( queryEngine );
CommonFunctionFactory.upper( queryEngine );

queryEngine.getSqmFunctionRegistry().namedTemplateBuilder( "str" )
.setInvariantType( StandardSpiBasicTypes.STRING )
.setArgumentCountBetween( 1, 3 )
Expand All @@ -96,11 +94,12 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
.setExactArgumentCount( 1 )
.register();

queryEngine.getSqmFunctionRegistry().registerNoArgs( "user", StandardSpiBasicTypes.STRING );
queryEngine.getSqmFunctionRegistry().namedTemplateBuilder( "charindex" )
.setInvariantType( StandardSpiBasicTypes.INTEGER )
.setExactArgumentCount( 2 )
.register();

queryEngine.getSqmFunctionRegistry().registerNoArgs( "current_timestamp", StandardSpiBasicTypes.TIMESTAMP );
queryEngine.getSqmFunctionRegistry().registerNoArgs( "current_time", StandardSpiBasicTypes.TIME );
queryEngine.getSqmFunctionRegistry().registerNoArgs( "current_date", StandardSpiBasicTypes.DATE );
queryEngine.getSqmFunctionRegistry().registerNoArgs( "user", StandardSpiBasicTypes.STRING );

queryEngine.getSqmFunctionRegistry().noArgsBuilder( "getdate" )
.setInvariantType( StandardSpiBasicTypes.TIMESTAMP )
Expand All @@ -127,7 +126,6 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
.setExactArgumentCount( 2 )
.register();

CommonFunctionFactory.abs( queryEngine );
CommonFunctionFactory.sign( queryEngine );

CommonFunctionFactory.acos( queryEngine );
Expand All @@ -139,7 +137,6 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
CommonFunctionFactory.log( queryEngine );
CommonFunctionFactory.log10( queryEngine );
CommonFunctionFactory.sin( queryEngine );
CommonFunctionFactory.sqrt( queryEngine );
CommonFunctionFactory.tan( queryEngine );
CommonFunctionFactory.sin( queryEngine );
queryEngine.getSqmFunctionRegistry().noArgsBuilder( "pi" )
Expand All @@ -162,11 +159,12 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
.setExactArgumentCount( 2 )
.register();

queryEngine.getSqmFunctionRegistry().register( "concat", new ConcatFunctionTemplate( "(", "+", ")" ) );
queryEngine.getSqmFunctionRegistry().registerVarArgs( "concat", StandardSpiBasicTypes.STRING, "(", "+", ")" );


queryEngine.getSqmFunctionRegistry().registerAlternateKey( "length", "len" );
queryEngine.getSqmFunctionRegistry().registerPattern( "trim", "ltrim(rtrim(?1))", StandardSpiBasicTypes.STRING );
queryEngine.getSqmFunctionRegistry().register( "locate", new SybaseLocateEmulationFunctionTemplate() );

queryEngine.getSqmFunctionRegistry().register( "trim", new TransactSQLTrimEmulation() );
}

@Override
Expand Down
16 changes: 0 additions & 16 deletions hibernate-core/src/main/java/org/hibernate/dialect/CUBRIDDialect.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,12 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
queryEngine.getSqmFunctionRegistry().registerNamed( "lengthb", StandardSpiBasicTypes.LONG );
queryEngine.getSqmFunctionRegistry().registerNamed( "lengthh", StandardSpiBasicTypes.LONG );
queryEngine.getSqmFunctionRegistry().registerNamed( "lcase" );
queryEngine.getSqmFunctionRegistry().registerNamed( "lower" );
queryEngine.getSqmFunctionRegistry().registerNamed( "ltrim" );
queryEngine.getSqmFunctionRegistry().registerNamed( "reverse" );
queryEngine.getSqmFunctionRegistry().registerNamed( "rtrim" );
queryEngine.getSqmFunctionRegistry().registerNamed( "trim" );
queryEngine.getSqmFunctionRegistry().registerNamed( "space", StandardSpiBasicTypes.STRING );
queryEngine.getSqmFunctionRegistry().registerNamed( "ucase" );
queryEngine.getSqmFunctionRegistry().registerNamed( "upper" );

queryEngine.getSqmFunctionRegistry().registerNamed( "abs" );
queryEngine.getSqmFunctionRegistry().registerNamed( "sign", StandardSpiBasicTypes.INTEGER );

queryEngine.getSqmFunctionRegistry().registerNamed( "acos", StandardSpiBasicTypes.DOUBLE );
Expand All @@ -123,7 +119,6 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
queryEngine.getSqmFunctionRegistry().registerNoArgs( "rand", StandardSpiBasicTypes.DOUBLE );
queryEngine.getSqmFunctionRegistry().registerNoArgs( "random", StandardSpiBasicTypes.DOUBLE );
queryEngine.getSqmFunctionRegistry().registerNamed( "sin", StandardSpiBasicTypes.DOUBLE );
queryEngine.getSqmFunctionRegistry().registerNamed( "sqrt", StandardSpiBasicTypes.DOUBLE );
queryEngine.getSqmFunctionRegistry().registerNamed( "tan", StandardSpiBasicTypes.DOUBLE );

queryEngine.getSqmFunctionRegistry().registerNamed( "radians", StandardSpiBasicTypes.DOUBLE );
Expand All @@ -138,18 +133,15 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {

queryEngine.getSqmFunctionRegistry().registerNamed( "date", StandardSpiBasicTypes.DATE );
queryEngine.getSqmFunctionRegistry().registerNoArgs( "curdate", StandardSpiBasicTypes.DATE );
queryEngine.getSqmFunctionRegistry().registerNoArgs( "current_date", StandardSpiBasicTypes.DATE );
queryEngine.getSqmFunctionRegistry().registerNoArgs( "sys_date", StandardSpiBasicTypes.DATE );
queryEngine.getSqmFunctionRegistry().registerNoArgs( "sysdate", StandardSpiBasicTypes.DATE );

queryEngine.getSqmFunctionRegistry().registerNamed( "time", StandardSpiBasicTypes.TIME );
queryEngine.getSqmFunctionRegistry().registerNoArgs( "curtime", StandardSpiBasicTypes.TIME );
queryEngine.getSqmFunctionRegistry().registerNoArgs( "current_time", StandardSpiBasicTypes.TIME );
queryEngine.getSqmFunctionRegistry().registerNoArgs( "sys_time", StandardSpiBasicTypes.TIME );
queryEngine.getSqmFunctionRegistry().registerNoArgs( "systime", StandardSpiBasicTypes.TIME );

queryEngine.getSqmFunctionRegistry().registerNamed( "timestamp", StandardSpiBasicTypes.TIMESTAMP );
queryEngine.getSqmFunctionRegistry().registerNoArgs( "current_timestamp", StandardSpiBasicTypes.TIMESTAMP );
queryEngine.getSqmFunctionRegistry().registerNoArgs( "sys_timestamp", StandardSpiBasicTypes.TIMESTAMP );
queryEngine.getSqmFunctionRegistry().registerNoArgs( "systimestamp", StandardSpiBasicTypes.TIMESTAMP );
queryEngine.getSqmFunctionRegistry().registerNoArgs( "localtime", StandardSpiBasicTypes.TIMESTAMP );
Expand Down Expand Up @@ -181,22 +173,14 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
queryEngine.getSqmFunctionRegistry().registerNamed( "hex", StandardSpiBasicTypes.STRING );

queryEngine.getSqmFunctionRegistry().registerNamed( "octet_length", StandardSpiBasicTypes.LONG );
queryEngine.getSqmFunctionRegistry().registerNamed( "bit_length", StandardSpiBasicTypes.LONG );

queryEngine.getSqmFunctionRegistry().registerNamed( "bit_count", StandardSpiBasicTypes.LONG );
queryEngine.getSqmFunctionRegistry().registerNamed( "md5", StandardSpiBasicTypes.STRING );

queryEngine.getSqmFunctionRegistry().registerNamed( "concat", StandardSpiBasicTypes.STRING );

queryEngine.getSqmFunctionRegistry().registerNamed( "substring", StandardSpiBasicTypes.STRING );
queryEngine.getSqmFunctionRegistry().registerNamed( "substr", StandardSpiBasicTypes.STRING );

queryEngine.getSqmFunctionRegistry().registerNamed( "length", StandardSpiBasicTypes.INTEGER );
queryEngine.getSqmFunctionRegistry().registerNamed( "bit_length", StandardSpiBasicTypes.INTEGER );
queryEngine.getSqmFunctionRegistry().registerNamed( "coalesce" );
queryEngine.getSqmFunctionRegistry().registerNamed( "nullif" );
queryEngine.getSqmFunctionRegistry().registerNamed( "mod" );

queryEngine.getSqmFunctionRegistry().registerNamed( "power" );
queryEngine.getSqmFunctionRegistry().registerNamed( "stddev" );
queryEngine.getSqmFunctionRegistry().registerNamed( "variance" );
Expand Down
Loading

0 comments on commit afb9a01

Please sign in to comment.