From 9bd51aaeb6d0f61f4d25ea838a951cb52db1e8b7 Mon Sep 17 00:00:00 2001
From: Christophe Coevoet <stof@notk.org>
Date: Wed, 3 Jul 2024 15:14:49 +0200
Subject: [PATCH] Fix the support for custom parameter types in native queries

The Query class (used for DQL queries) takes care of using the value and
type as is when a type was specified for a parameter instead of going
through the default processing of values.
The NativeQuery class was missing the equivalent check, making the
custom type work only if the default processing of values does not
convert the value to a different one.
---
 src/NativeQuery.php                       | 10 +++++-
 tests/Tests/ORM/Query/NativeQueryTest.php | 42 +++++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 tests/Tests/ORM/Query/NativeQueryTest.php

diff --git a/src/NativeQuery.php b/src/NativeQuery.php
index aa44539d544..782983d50ec 100644
--- a/src/NativeQuery.php
+++ b/src/NativeQuery.php
@@ -50,7 +50,15 @@ protected function _doExecute()
         $types      = [];
 
         foreach ($this->getParameters() as $parameter) {
-            $name  = $parameter->getName();
+            $name = $parameter->getName();
+
+            if ($parameter->typeWasSpecified()) {
+                $parameters[$name] = $parameter->getValue();
+                $types[$name]      = $parameter->getType();
+
+                continue;
+            }
+
             $value = $this->processParameterValue($parameter->getValue());
             $type  = $parameter->getValue() === $value
                 ? $parameter->getType()
diff --git a/tests/Tests/ORM/Query/NativeQueryTest.php b/tests/Tests/ORM/Query/NativeQueryTest.php
new file mode 100644
index 00000000000..0e68389494e
--- /dev/null
+++ b/tests/Tests/ORM/Query/NativeQueryTest.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\ORM\Query;
+
+use DateTime;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\Query\ResultSetMapping;
+use Doctrine\ORM\UnitOfWork;
+use Doctrine\Tests\Mocks\EntityManagerMock;
+use Doctrine\Tests\OrmTestCase;
+
+class NativeQueryTest extends OrmTestCase
+{
+    /** @var EntityManagerMock */
+    protected $entityManager;
+
+    protected function setUp(): void
+    {
+        $this->entityManager = $this->getTestEntityManager();
+    }
+
+    public function testValuesAreNotBeingResolvedForSpecifiedParameterTypes(): void
+    {
+        $unitOfWork = $this->createMock(UnitOfWork::class);
+
+        $this->entityManager->setUnitOfWork($unitOfWork);
+
+        $unitOfWork
+            ->expects(self::never())
+            ->method('getSingleIdentifierValue');
+
+        $rsm = new ResultSetMapping();
+
+        $query = $this->entityManager->createNativeQuery('SELECT d.* FROM date_time_model d WHERE d.datetime = :value', $rsm);
+
+        $query->setParameter('value', new DateTime(), Types::DATETIME_MUTABLE);
+
+        self::assertEmpty($query->getResult());
+    }
+}