Fix review feedback for Oracle RETURNING INTO support (#3762)

* Initial plan

* Apply PR review feedback for Oracle RETURNING INTO support

Co-authored-by: radovanradic <10271067+radovanradic@users.noreply.github.com>

* Use DEFAULT_POSITIONAL_PARAMETER_MARKER constant and clarify assembledSql comment

Co-authored-by: radovanradic <10271067+radovanradic@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: radovanradic <10271067+radovanradic@users.noreply.github.com>

Author: Copilot

data-jdbc/src/main/java/io/micronaut/data/jdbc/operations/DefaultJdbcRepositoryOperations.java

@@ -420,7 +420,9 @@ private <T, R> List<R> findAll(Connection connection, SqlPreparedQuery<T, R> pre
                 boolean isEntityResult = preparedQuery.getResultDataType() == DataType.ENTITY;
                 if (isEntityResult) {
                     SqlResultEntityTypeMapper mapper = getSqlResultEntityTypeMapper(preparedQuery.getPersistentEntity(), columnNames, inCount);
-                    return List.of((R) mapper.readEntity(cs));
+                    T entity = (T) mapper.readEntity(cs);
+                    entity = triggerPostLoad(entity, (RuntimePersistentEntity<T>) preparedQuery.getPersistentEntity(), preparedQuery.getAnnotationMetadata());
+                    return List.of((R) entity);
                 }
                 // Otherwise single field
                 List<R> result = new ArrayList<>();

data-model/src/main/java/io/micronaut/data/model/query/builder/sql/SqlQueryBuilder.java

@@ -1015,6 +1015,7 @@ public QueryResult buildInsert(AnnotationMetadata repositoryMetadata, InsertQuer
                             .orElse(identity.getName()));
                     resultColumns.add(identityName);
                     resultColumnTypes.add(identity.getDataType());
+                    unescapedColumns.add(identityName);
                     builder = "BEGIN " + builder + " RETURNING JSON_VALUE(" + columnName + ",'$." + identityName + "') INTO " + formatParameter(key + 1) + "; END;";
                 }
                 parameterBindings.add(new QueryParameterBinding() {

data-processor/src/main/java/io/micronaut/data/processor/visitors/RepositoryTypeElementVisitor.java

@@ -696,12 +696,8 @@ private void addQueryDefinition(MethodMatchContext methodMatchContext,
                 List<AnnotationValue<?>> outAnnotations = new ArrayList<>(outBindings.size());
                 for (QueryOutParameterBinding b : outBindings) {
                     AnnotationValueBuilder<?> outBuilder = AnnotationValue.builder(DataMethodQueryOutParameter.class);
-                    if (StringUtils.isNotEmpty(b.getName())) {
-                        outBuilder.member(DataMethodQueryOutParameter.META_MEMBER_NAME, b.getName());
-                    }
-                    if (b.getDataType() != null) {
-                        outBuilder.member(DataMethodQueryOutParameter.META_MEMBER_DATA_TYPE, b.getDataType());
-                    }
+                    outBuilder.member(DataMethodQueryOutParameter.META_MEMBER_NAME, b.getName());
+                    outBuilder.member(DataMethodQueryOutParameter.META_MEMBER_DATA_TYPE, b.getDataType());
                     outAnnotations.add(outBuilder.build());
                 }
                 annotationBuilder.member(DataMethodQuery.META_MEMBER_OUT_PARAMETERS, outAnnotations.toArray(new AnnotationValue[0]));

data-processor/src/main/java/io/micronaut/data/processor/visitors/finders/RawQueryMethodMatcher.java

@@ -60,6 +60,7 @@
 import io.micronaut.data.model.DataType;
 import io.micronaut.data.model.Association;
 import io.micronaut.data.model.query.builder.QueryOutParameterBinding;
+import io.micronaut.data.model.query.builder.sql.SqlQueryBuilder;
 
 /**
  * Finder with custom defied query used to return a single result.
@@ -319,7 +320,8 @@ private QueryResult getQueryResult(MethodMatchContext matchContext,
                 .orElse(Dialect.ANSI);
             if (dialect == Dialect.ORACLE) {
                 SourcePersistentEntity entity = persistentEntity != null ? persistentEntity : matchContext.getRootEntity();
-                int returningIdx = cleanLower.lastIndexOf("returning");
+                String finalQueryLower = finalQueryString.toLowerCase(Locale.ENGLISH);
+                int returningIdx = finalQueryLower.lastIndexOf("returning");
                 String afterReturning = finalQueryString.substring(returningIdx + "returning".length()).trim();
                 int intoPos = indexOfIntoIgnoreCase(afterReturning);
                 String selection = intoPos > -1 ? afterReturning.substring(0, intoPos).trim() : afterReturning;
@@ -486,7 +488,19 @@ public DataType getDataType() {
                     queryParts = new ArrayList<>();
                     queryParts.add(finalSql);
                 }
-                return QueryResult.of("", queryParts, parameterBindings, outBindings, Map.of());
+                // Build the assembled SQL from queryParts: parts represent SQL fragments between
+                // positional IN-parameter placeholders (SqlQueryBuilder.DEFAULT_POSITIONAL_PARAMETER_MARKER).
+                String assembledSql;
+                if (queryParts.size() == 1) {
+                    assembledSql = queryParts.get(0);
+                } else {
+                    var sqlBuilder = new StringBuilder(queryParts.get(0));
+                    for (int i = 1; i < queryParts.size(); i++) {
+                        sqlBuilder.append(SqlQueryBuilder.DEFAULT_POSITIONAL_PARAMETER_MARKER).append(queryParts.get(i));
+                    }
+                    assembledSql = sqlBuilder.toString();
+                }
+                return QueryResult.of(assembledSql, queryParts, parameterBindings, outBindings, Map.of());
             }
         }
 

data-runtime/src/main/java/io/micronaut/data/runtime/query/internal/QueryResultStoredQuery.java

@@ -204,17 +204,17 @@ private record QueryResultOutParameterBinding(
         io.micronaut.data.model.query.builder.QueryOutParameterBinding delegate) implements QueryOutParameterBinding {
 
         @Override
-            public String name() {
-                return delegate.getName();
-            }
-
-            @Override
-            public DataType dataType() {
-                return delegate.getDataType();
-            }
+        public String name() {
+            return delegate.getName();
+        }
 
+        @Override
+        public DataType dataType() {
+            return delegate.getDataType();
         }
 
+    }
+
     private static final class QueryResultParameterBinding implements QueryParameterBinding {
         private final io.micronaut.data.model.query.builder.QueryParameterBinding p;
         private final List<QueryParameterBinding> all;