Merge branch 'refs/heads/feature/STORM-32'

# Conflicts:
#	README.adoc
#	pom.xml
#	storm-json/pom.xml
#	storm-kotlin/pom.xml
#	storm-kotlin/src/main/java/st/orm/kotlin/template/KQueryBuilder.java
#	storm-kotlin/src/main/kotlin/st/orm/kotlin/repository/KRepositoryLookupExtensions.kt
#	storm-kotlin/src/main/kotlin/st/orm/kotlin/repository/RepositoryLookupExtensions.kt
#	storm-mariadb/pom.xml
#	storm-metamodel-processor/pom.xml
#	storm-mssqlserver/pom.xml
#	storm-mysql/pom.xml
#	storm-oracle/pom.xml
#	storm-postgresql/pom.xml
#	storm-spring/pom.xml
#	storm/pom.xml
#	storm/src/main/java/st/orm/template/impl/QueryBuilderImpl.java

Author: zantvoort

README.adoc

@@ -45,15 +45,15 @@ Maven::
 <dependency>
     <groupId>st.orm</groupId>
     <artifactId>storm</artifactId>
-    <version>1.3.7</version>
+    <version>1.3.8</version>
     <scope>compile</scope>
 </dependency>
 ----
 Gradle::
 +
 [source,groovy]
 ----
-implementation 'st.orm:storm:1.3.7'
+implementation 'st.orm:storm:1.3.8'
 ----
 ====
 
@@ -846,15 +846,15 @@ Maven::
 <dependency>
     <groupId>st.orm</groupId>
     <artifactId>storm-oracle</artifactId>
-    <version>1.3.7</version>
+    <version>1.3.8</version>
     <scope>runtime</scope>
 </dependency>
 ----
 Gradle::
 +
 [source,groovy]
 ----
-runtimeOnly 'st.orm:storm-oracle:1.3.7'
+runtimeOnly 'st.orm:storm-oracle:1.3.8'
 ----
 ====
 
@@ -876,15 +876,15 @@ Maven::
 <dependency>
     <groupId>st.orm</groupId>
     <artifactId>storm-metamodel-processor</artifactId>
-    <version>1.3.7</version>
+    <version>1.3.8</version>
     <scope>provided</scope>
 </dependency>
 ----
 Gradle::
 +
 [source,groovy]
 ----
-annotationProcessor 'st.orm:storm-metamodel-processor:1.3.7'
+annotationProcessor 'st.orm:storm-metamodel-processor:1.3.8'
 ----
 ====
 
@@ -952,15 +952,15 @@ Maven::
 <dependency>
     <groupId>st.orm</groupId>
     <artifactId>storm-json</artifactId>
-    <version>1.3.7</version>
+    <version>1.3.8</version>
     <scope>compile</scope>
 </dependency>
 ----
 Gradle::
 +
 [source,groovy]
 ----
-implementation 'st.orm:storm-json:1.3.7'
+implementation 'st.orm:storm-json:1.3.8'
 ----
 ====
 
@@ -1096,15 +1096,15 @@ Maven::
 <dependency>
     <groupId>st.orm</groupId>
     <artifactId>storm-spring</artifactId>
-    <version>1.3.7</version>
+    <version>1.3.8</version>
     <scope>compile</scope>
 </dependency>
 ----
 Gradle::
 +
 [source,groovy]
 ----
-implementation 'st.orm:storm-spring:1.3.7'
+implementation 'st.orm:storm-spring:1.3.8'
 ----
 ====
 

pom.xml

@@ -12,7 +12,7 @@
     </properties>
     <groupId>st.orm</groupId>
     <artifactId>storm-framework</artifactId>
-    <version>1.3.7</version>
+    <version>1.3.8</version>
     <packaging>pom</packaging>
     <name>Storm Framework</name>
     <description>A SQL Template and ORM framework, focusing on modernizing and simplifying database programming.</description>

storm-json/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>st.orm</groupId>
         <artifactId>storm-framework</artifactId>
-        <version>1.3.7</version>
+        <version>1.3.8</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>storm-json</artifactId>

storm-kotlin/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>st.orm</groupId>
         <artifactId>storm-framework</artifactId>
-        <version>1.3.7</version>
+        <version>1.3.8</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>storm-kotlin</artifactId>

storm-kotlin/src/main/java/st/orm/kotlin/repository/KEntityRepository.java

@@ -27,6 +27,7 @@
 import st.orm.kotlin.template.KModel;
 import st.orm.kotlin.template.KQueryBuilder;
 import st.orm.repository.Entity;
+import st.orm.template.TemplateFunction;
 
 import java.util.List;
 import java.util.Optional;
@@ -133,6 +134,18 @@ public interface KEntityRepository<E extends Record & Entity<ID>, ID> extends KR
      */
     <R> KQueryBuilder<E, R, ID> select(@Nonnull KClass<R> selectType, @Nonnull StringTemplate template);
 
+    /**
+     * Creates a new query builder for the custom {@code selectType} and custom {@code template} for the select clause.
+     *
+     * @param selectType the result type of the query.
+     * @param function the custom template for the select clause.
+     * @return a new query builder for the custom {@code selectType}.
+     * @param <R> the result type of the query.
+     */
+    default <R> KQueryBuilder<E, R, ID> select(@Nonnull KClass<R> selectType, @Nonnull TemplateFunction function) {
+        return select(selectType, TemplateFunction.template(function));
+    }
+
     /**
      * Creates a new query builder for selecting refs to entities of the type managed by this repository.
      *

storm-kotlin/src/main/java/st/orm/kotlin/repository/KProjectionRepository.java

@@ -25,6 +25,7 @@
 import st.orm.kotlin.template.KModel;
 import st.orm.kotlin.template.KQueryBuilder;
 import st.orm.repository.Projection;
+import st.orm.template.TemplateFunction;
 
 import java.util.List;
 import java.util.Optional;
@@ -121,6 +122,18 @@ public interface KProjectionRepository<P extends Record & Projection<ID>, ID> ex
      */
     <R> KQueryBuilder<P, R, ID> select(@Nonnull Class<R> selectType, @Nonnull StringTemplate template);
 
+    /**
+     * Creates a new query builder for the custom {@code selectType} and custom {@code template} for the select clause.
+     *
+     * @param selectType the result type of the query.
+     * @param function the custom template for the select clause.
+     * @return a new query builder for the custom {@code selectType}.
+     * @param <R> the result type of the query.
+     */
+    default <R> KQueryBuilder<P, R, ID> select(@Nonnull Class<R> selectType, @Nonnull TemplateFunction function) {
+        return select(selectType, TemplateFunction.template(function));
+    }
+
     // Base methods.
 
     /**

storm-kotlin/src/main/java/st/orm/kotlin/spi/KORMReflectionImpl.java

@@ -87,13 +87,15 @@ public boolean isAnnotationPresent(@Nonnull Class<?> type, @Nonnull Class<? exte
         return getAnnotation(type, annotationType) != null;
     }
 
-    record ComponentCacheKey(@Nonnull Constructor<?> constructor, @Nonnull String componentName) {
+    record ComponentCacheKey(@Nonnull Class<? extends Record> recordType, @Nonnull String componentName) {
         ComponentCacheKey(RecordComponent component) throws IllegalArgumentException {
             //noinspection unchecked
-            this(defaultReflection.findCanonicalConstructor(
-                    (Class<? extends Record>) component.getDeclaringRecord()).orElseThrow(
-                            () -> new IllegalArgumentException(STR."No canonical constructor found for record type: \{component.getDeclaringRecord().getSimpleName()}.")),
-                    component.getName());
+            this((Class<? extends Record>) component.getDeclaringRecord(), component.getName());
+        }
+
+        private Constructor<?> constructor() {
+            return defaultReflection.findCanonicalConstructor(recordType)
+                    .orElseThrow(() -> new IllegalArgumentException(STR."No canonical constructor found for record type: \{recordType.getSimpleName()}."));
         }
     }
 

storm-kotlin/src/main/java/st/orm/kotlin/template/KQueryBuilder.java

@@ -30,7 +30,6 @@
 import st.orm.template.Operator;
 import st.orm.template.QueryBuilder;
 import st.orm.template.TemplateFunction;
-import st.orm.template.WhereBuilder;
 import st.orm.template.impl.Elements.ObjectExpression;
 
 import java.util.List;
@@ -203,26 +202,26 @@ public final KJoinBuilder<T, R, ID> rightJoin(@Nonnull TemplateFunction function
     public abstract KJoinBuilder<T, R, ID> join(@Nonnull JoinType type, @Nonnull StringTemplate template, @Nonnull String alias);
 
     /**
-     * Adds a join of the specified type to the query using a subquery.
+     * Adds a join of the specified type to the query.
      *
      * @param type the join type.
-     * @param subquery the subquery to join.
+     * @param function the function used to define the condition to join.
      * @param alias the alias to use for the joined relation.
      * @return the query builder.
      */
-    public abstract KJoinBuilder<T, R, ID> join(@Nonnull JoinType type, @Nonnull KQueryBuilder<?, ?, ?> subquery, @Nonnull String alias);
+    public final KJoinBuilder<T, R, ID> join(@Nonnull JoinType type, @Nonnull TemplateFunction function, @Nonnull String alias) {
+        return join(type, TemplateFunction.template(function), alias);
+    }
 
     /**
-     * Adds a join of the specified type to the query.
+     * Adds a join of the specified type to the query using a subquery.
      *
      * @param type the join type.
-     * @param function the function used to define the condition to join.
+     * @param subquery the subquery to join.
      * @param alias the alias to use for the joined relation.
      * @return the query builder.
-     */  
-    public final KJoinBuilder<T, R, ID> join(@Nonnull JoinType type, @Nonnull TemplateFunction function, @Nonnull String alias) {
-        return join(type, TemplateFunction.template(function), alias);
-    }
+     */
+    public abstract KJoinBuilder<T, R, ID> join(@Nonnull JoinType type, @Nonnull KQueryBuilder<?, ?, ?> subquery, @Nonnull String alias);
 
     /**
      * Adds a WHERE clause that matches the specified primary key of the table.

storm-kotlin/src/main/java/st/orm/kotlin/template/KSubqueryTemplate.java

@@ -17,6 +17,7 @@
 
 import jakarta.annotation.Nonnull;
 import kotlin.reflect.KClass;
+import st.orm.template.TemplateFunction;
 
 import static java.lang.StringTemplate.RAW;
 
@@ -65,5 +66,18 @@ public interface KSubqueryTemplate {
      * @param <T> the table type.
      */
     <T extends Record> KQueryBuilder<T, ?, ?> subquery(@Nonnull KClass<T> fromType,
-                                                          @Nonnull StringTemplate template);
+                                                       @Nonnull StringTemplate template);
+
+    /**
+     * Create a subquery for the given table and select type using the given template.
+     *
+     * @param fromType the table to create the subquery for.
+     * @param function the template to use for the subquery.
+     * @return the subquery builder.
+     * @param <T> the table type.
+     */
+    default <T extends Record> KQueryBuilder<T, ?, ?> subquery(@Nonnull KClass<T> fromType,
+                                                               @Nonnull TemplateFunction function) {
+        return subquery(fromType, TemplateFunction.template(function));
+    }
 }

storm-kotlin/src/main/kotlin/st/orm/kotlin/repository/KRepositoryLookupExtensions.kt

@@ -1173,7 +1173,7 @@ inline fun <reified T, V> KRepositoryLookup.countBy(
  * @return the count of matching entities.
  */
 @Suppress("UNCHECKED_CAST")
-inline fun <reified T, V> KRepositoryLookup.count(
+inline fun <reified T> KRepositoryLookup.count(
     noinline predicate: KWhereBuilder<T, *, *>.() -> KPredicateBuilder<T, *, *>
 ): Long where T : Record = when {
     Entity::class.java.isAssignableFrom(T::class.java) -> {
@@ -1194,7 +1194,7 @@ inline fun <reified T, V> KRepositoryLookup.count(
  * @return the count of matching entities.
  */
 @Suppress("UNCHECKED_CAST")
-inline fun <reified T, V> KRepositoryLookup.count(predicateBuilder: KPredicateBuilder<T, *, *>): Long
+inline fun <reified T> KRepositoryLookup.count(predicateBuilder: KPredicateBuilder<T, *, *>): Long
         where T : Record = when {
     Entity::class.java.isAssignableFrom(T::class.java) -> {
         val method = this::class.java.getMethod("entity", Class::class.java)