Skip to content

Commit 298623d

Browse files
committed
MysqlDialect register localtimeLocaltimestamp functions
1 parent 1ae61b3 commit 298623d

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
import org.hibernate.sql.ast.spi.StandardSqlAstTranslatorFactory;
6262
import org.hibernate.sql.ast.tree.Statement;
6363
import org.hibernate.sql.exec.spi.JdbcOperation;
64+
import org.hibernate.type.BasicTypeRegistry;
6465
import org.hibernate.type.NullType;
6566
import org.hibernate.type.SqlTypes;
6667
import org.hibernate.type.StandardBasicTypes;
@@ -491,6 +492,14 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
491492
functionFactory.adddateSubdateAddtimeSubtime();
492493
functionFactory.format_dateFormat();
493494
functionFactory.makedateMaketime();
495+
functionFactory.localtimeLocaltimestamp();
496+
497+
BasicTypeRegistry basicTypeRegistry = queryEngine.getTypeConfiguration().getBasicTypeRegistry();
498+
499+
queryEngine.getSqmFunctionRegistry().noArgsBuilder( "localtime" )
500+
.setInvariantType(basicTypeRegistry.resolve( StandardBasicTypes.TIMESTAMP ))
501+
.setUseParenthesesWhenNoArgs( false )
502+
.register();
494503

495504
if ( getMySQLVersion().isBefore( 5, 7 ) ) {
496505
functionFactory.sysdateParens();

hibernate-core/src/main/java/org/hibernate/type/StandardBasicTypes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1205,7 +1205,7 @@ public static void prime(TypeConfiguration typeConfiguration) {
12051205
);
12061206

12071207
handle(
1208-
OBJECT_TYPE,
1208+
JavaObjectType.INSTANCE,
12091209
null,
12101210
basicTypeRegistry,
12111211
"object", Object.class.getName()

hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQL57TimestampFspFunctionTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.hibernate.query.Query;
1313

1414
import org.hibernate.testing.TestForIssue;
15-
import org.hibernate.testing.orm.domain.StandardDomainModel;
1615
import org.hibernate.testing.orm.junit.DomainModel;
1716
import org.hibernate.testing.orm.junit.RequiresDialect;
1817
import org.hibernate.testing.orm.junit.ServiceRegistry;
@@ -30,7 +29,7 @@
3029
@TestForIssue( jiraKey = "HHH-8401")
3130
@RequiresDialect( value = MySQLDialect.class, majorVersion = 5, minorVersion = 7)
3231
@ServiceRegistry
33-
@DomainModel( standardModels = StandardDomainModel.GAMBIT )
32+
@DomainModel
3433
@SessionFactory
3534
public class MySQL57TimestampFspFunctionTest {
3635

0 commit comments

Comments
 (0)