Merge pull request #204 from homersimpsons/feature/automatic-integer-…

…type DbalUtils: Add integer type (MySQL 8 breaks on non integer for TIMESTAMP column)
thecodingmachine · Jun 12, 2020 · 07360b6 · 07360b6
2 parents fe88876 + b9a05eb
commit 07360b6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/src/InnerResultIterator.php b/src/InnerResultIterator.php
@@ -97,7 +97,7 @@ protected function executeQuery(): void
 
         $this->logger->debug('Running SQL request: '.$sql);
 
-        $this->statement = $this->tdbmService->getConnection()->executeQuery($sql, $this->parameters, DbalUtils::generateArrayTypes($this->parameters));
+        $this->statement = $this->tdbmService->getConnection()->executeQuery($sql, $this->parameters, DbalUtils::generateTypes($this->parameters));
 
         $this->fetchStarted = true;
     }

diff --git a/src/ResultIterator.php b/src/ResultIterator.php
@@ -89,7 +89,7 @@ protected function executeCountQuery(): void
     {
         $sql = $this->magicQuery->buildPreparedStatement($this->queryFactory->getMagicSqlCount(), $this->parameters);
         $this->logger->debug('Running count query: '.$sql);
-        $this->totalCount = (int) $this->tdbmService->getConnection()->fetchColumn($sql, $this->parameters, 0, DbalUtils::generateArrayTypes($this->parameters));
+        $this->totalCount = (int) $this->tdbmService->getConnection()->fetchColumn($sql, $this->parameters, 0, DbalUtils::generateTypes($this->parameters));
     }
 
     /**

diff --git a/src/Utils/DbalUtils.php b/src/Utils/DbalUtils.php
@@ -4,6 +4,7 @@
 namespace TheCodingMachine\TDBM\Utils;
 
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\ParameterType;
 use function is_array;
 use function is_int;
 
@@ -14,11 +15,12 @@ class DbalUtils
 {
     /**
      * If a parameter is an array (used in a "IN" statement), we need to tell Doctrine about it.
+     * If it is an integer we have to tell DBAL (default is string)
      * @see https://www.doctrine-project.org/projects/doctrine-dbal/en/2.9/reference/data-retrieval-and-manipulation.html#list-of-parameters-conversion
      * @param array<string, mixed> $parameters
      * @return array<string, int>
      */
-    public static function generateArrayTypes(array $parameters): array
+    public static function generateTypes(array $parameters): array
     {
         $types = [];
         foreach ($parameters as $key => $value) {
@@ -30,6 +32,8 @@ public static function generateArrayTypes(array $parameters): array
                     }
                 }
                 $types[$key] = Connection::PARAM_INT_ARRAY;
+            } elseif (is_int($value)) {
+                $types[$key] = ParameterType::INTEGER;
             }
         }
 

diff --git a/tests/Utils/DbalUtilsTest.php b/tests/Utils/DbalUtilsTest.php
@@ -3,18 +3,20 @@
 namespace TheCodingMachine\TDBM\Utils;
 
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\ParameterType;
 use PHPUnit\Framework\TestCase;
 
 class DbalUtilsTest extends TestCase
 {
-    public function testGenerateArrayTypes(): void
+    public function testGenerateTypes(): void
     {
         $params = [
             'key1' => 'foo',
             'key2' => [1,2,3],
             'key3' => [1,2,'baz'],
+            'key4' => 1,
         ];
 
-        $this->assertSame(['key2'=>Connection::PARAM_INT_ARRAY, 'key3'=>Connection::PARAM_STR_ARRAY], DbalUtils::generateArrayTypes($params));
+        $this->assertSame(['key2'=>Connection::PARAM_INT_ARRAY, 'key3'=>Connection::PARAM_STR_ARRAY, 'key4'=>ParameterType::INTEGER], DbalUtils::generateTypes($params));
     }
 }