Support concat function

hibernate-dialect-v6/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## 1.5.3 ##
 
-- Support `lower` and `upper` functions
+- Support `lower`, `upper` and `concat` functions
 
 ## 1.5.2 ##
 

hibernate-dialect-v6/src/main/java/tech/ydb/hibernate/dialect/YdbDialect.java

@@ -19,6 +19,8 @@
 import org.hibernate.mapping.Index;
 import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.query.sqm.function.SqmFunctionRegistry;
+import org.hibernate.query.sqm.produce.function.FunctionParameterType;
+import org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers;
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.sql.ast.SqlAstTranslatorFactory;
 import org.hibernate.sql.ast.spi.SqlAppender;
@@ -65,6 +67,7 @@
 import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
 import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl;
 import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
+import org.hibernate.type.spi.TypeConfiguration;
 import tech.ydb.hibernate.dialect.code.YdbJdbcCode;
 import tech.ydb.hibernate.dialect.exporter.EmptyExporter;
 import tech.ydb.hibernate.dialect.exporter.YdbIndexExporter;
@@ -241,6 +244,8 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
         super.initializeFunctionRegistry(functionContributions);
 
         final SqmFunctionRegistry functionRegistry = functionContributions.getFunctionRegistry();
+        final TypeConfiguration typeConfig = functionContributions.getTypeConfiguration();
+
         final BasicType<LocalDateTime> localDateTimeType = functionContributions
                 .getTypeConfiguration()
                 .getBasicTypeRegistry()
@@ -260,6 +265,14 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
                 "upper",
                 "Unicode::ToUpper(?1)"
         );
+
+        functionRegistry.patternDescriptorBuilder("concat", "(?1||?2...)")
+                .setInvariantType(typeConfig.getBasicTypeRegistry().resolve(StandardBasicTypes.STRING))
+                .setMinArgumentCount(1)
+                .setArgumentTypeResolver(
+                        StandardFunctionArgumentTypeResolvers.impliedOrInvariant(typeConfig, FunctionParameterType.STRING))
+                .setArgumentListSignature("(STRING string0[, STRING string1[, ...]])")
+                .register();
     }
 
     @Override

hibernate-dialect-v6/src/test/java/tech/ydb/hibernate/casing/StringCasingTest.java → hibernate-dialect-v6/src/test/java/tech/ydb/hibernate/string/StringFunctionsTest.java

@@ -1,10 +1,9 @@
-package tech.ydb.hibernate.casing;
+package tech.ydb.hibernate.string;
 
 import org.hibernate.cfg.AvailableSettings;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
-import tech.ydb.hibernate.TestUtils;
 import tech.ydb.test.junit5.YdbHelperExtension;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -13,14 +12,14 @@
 /**
  * @author Ainur Mukhtarov
  */
-public class StringCasingTest {
+public class StringFunctionsTest {
 
     @RegisterExtension
     private static final YdbHelperExtension ydb = new YdbHelperExtension();
 
     @BeforeAll
     static void beforeAll() {
-        TestUtils.SESSION_FACTORY = basedConfiguration()
+        SESSION_FACTORY = basedConfiguration()
                 .setProperty(AvailableSettings.URL, jdbcUrl(ydb))
                 .buildSessionFactory();
     }
@@ -38,4 +37,15 @@ void upperFunctionTest() {
                 .createQuery("select upper('LoWer Text 123')")
                 .getSingleResult()));
     }
+
+    @Test
+    void concatFunctionTest() {
+        inTransaction(session -> assertEquals("123", session
+                .createQuery("select concat('1', '2', '3')")
+                .getSingleResult()));
+
+        inTransaction(session -> assertEquals("text", session
+                .createQuery("select concat('text')")
+                .getSingleResult()));
+    }
 }

hibernate-dialect-v7/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.9.2 ##
+
+- Support `concat` function
+
 ## 0.9.1 ##
 
 - Full CRUD operations

hibernate-dialect-v7/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>tech.ydb.dialects</groupId>
     <artifactId>hibernate-ydb-dialect-v7</artifactId>
-    <version>0.9.1</version>
+    <version>0.9.2</version>
 
     <packaging>jar</packaging>
 

hibernate-dialect-v7/src/main/java/tech/ydb/hibernate/dialect/YdbDialect.java

@@ -62,13 +62,17 @@
 import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
 import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl;
 import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
+import org.hibernate.type.spi.TypeConfiguration;
 import tech.ydb.hibernate.dialect.code.YdbJdbcCode;
 import tech.ydb.hibernate.dialect.exporter.EmptyExporter;
 import tech.ydb.hibernate.dialect.exporter.YdbIndexExporter;
 import tech.ydb.hibernate.dialect.hint.IndexQueryHintHandler;
 import tech.ydb.hibernate.dialect.hint.PragmaQueryHintHandler;
 import tech.ydb.hibernate.dialect.hint.QueryHintHandler;
 import tech.ydb.hibernate.dialect.hint.ScanQueryHintHandler;
+import org.hibernate.query.sqm.produce.function.FunctionParameterType;
+import org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers;
+import org.hibernate.type.StandardBasicTypes;
 import tech.ydb.hibernate.dialect.identity.YdbIdentityColumnSupport;
 import tech.ydb.hibernate.dialect.translator.YdbSqlAstTranslatorFactory;
 import tech.ydb.hibernate.dialect.types.BigDecimalJavaType;
@@ -238,6 +242,7 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
         super.initializeFunctionRegistry(functionContributions);
 
         final SqmFunctionRegistry functionRegistry = functionContributions.getFunctionRegistry();
+        final TypeConfiguration typeConfig = functionContributions.getTypeConfiguration();
 
         functionRegistry.registerPattern(
                 "lower",
@@ -248,6 +253,14 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
                 "upper",
                 "Unicode::ToUpper(?1)"
         );
+
+        functionRegistry.patternDescriptorBuilder("concat", "(?1||?2...)")
+                .setInvariantType(typeConfig.getBasicTypeRegistry().resolve(StandardBasicTypes.STRING))
+                .setMinArgumentCount(1)
+                .setArgumentTypeResolver(
+                        StandardFunctionArgumentTypeResolvers.impliedOrInvariant(typeConfig, FunctionParameterType.STRING))
+                .setArgumentListSignature("(STRING string0[, STRING string1[, ...]])")
+                .register();
     }
 
     @Override

hibernate-dialect-v7/src/test/java/tech/ydb/hibernate/casing/StringCasingTest.java → hibernate-dialect-v7/src/test/java/tech/ydb/hibernate/string/StringFunctionsTest.java

@@ -1,10 +1,9 @@
-package tech.ydb.hibernate.casing;
+package tech.ydb.hibernate.string;
 
 import org.hibernate.cfg.AvailableSettings;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
-import tech.ydb.hibernate.TestUtils;
 import tech.ydb.test.junit5.YdbHelperExtension;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -13,14 +12,14 @@
 /**
  * @author Ainur Mukhtarov
  */
-public class StringCasingTest {
+public class StringFunctionsTest {
 
     @RegisterExtension
     private static final YdbHelperExtension ydb = new YdbHelperExtension();
 
     @BeforeAll
     static void beforeAll() {
-        TestUtils.SESSION_FACTORY = basedConfiguration()
+        SESSION_FACTORY = basedConfiguration()
                 .setProperty(AvailableSettings.URL, jdbcUrl(ydb))
                 .buildSessionFactory();
     }
@@ -38,4 +37,15 @@ void upperFunctionTest() {
                 .createQuery("select upper('UpPer Text 123')")
                 .getSingleResult()));
     }
+
+    @Test
+    void concatFunctionTest() {
+        inTransaction(session -> assertEquals("123", session
+                .createQuery("select concat('1', '2', '3')")
+                .getSingleResult()));
+
+        inTransaction(session -> assertEquals("text", session
+                .createQuery("select concat('text')")
+                .getSingleResult()));
+    }
 }