DateTime filter (#189): Convert \DateTimeImmutable to Database value

thecodingmachine · Feb 7, 2020 · 443e451 · 443e451
1 parent a437f48
commit 443e451
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/src/Utils/BeanDescriptor.php b/src/Utils/BeanDescriptor.php
@@ -8,6 +8,7 @@
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Schema\ForeignKeyConstraint;
+use Doctrine\DBAL\Types\Type;
 use JsonSerializable;
 use Mouf\Database\SchemaAnalyzer\SchemaAnalyzer;
 use PhpParser\Comment\Doc;
@@ -1291,7 +1292,17 @@ private function generateFindByDaoCodeForIndex(Index $index, string $beanNamespa
         foreach ($elements as $element) {
             $params[] = $element->getParamAnnotation();
             if ($element instanceof ScalarBeanPropertyDescriptor) {
-                $filterArrayCode .= '            '.var_export($element->getColumnName(), true).' => '.$element->getSafeVariableName().",\n";
+                $typeName = $element->getDatabaseType()->getName();
+                if ($typeName === Type::DATETIME_IMMUTABLE) {
+                    $filterArrayCode .= sprintf(
+                        "            %s => \$this->tdbmService->getConnection()->convertToDatabaseValue(%s, %s),\n",
+                        var_export($element->getColumnName(), true),
+                        $element->getSafeVariableName(),
+                        var_export($typeName, true)
+                    );
+                } else {
+                    $filterArrayCode .= '            '.var_export($element->getColumnName(), true).' => '.$element->getSafeVariableName().",\n";
+                }
             } elseif ($element instanceof ObjectBeanPropertyDescriptor) {
                 $foreignKey = $element->getForeignKey();
                 $columns = SafeFunctions::arrayCombine($foreignKey->getLocalColumns(), $foreignKey->getForeignColumns());

diff --git a/src/Utils/ScalarBeanPropertyDescriptor.php b/src/Utils/ScalarBeanPropertyDescriptor.php
@@ -73,6 +73,16 @@ public function getPhpType(): string
         return TDBMDaoGenerator::dbalTypeToPhpType($type);
     }
 
+    /**
+     * Returns the Database type for the property
+     *
+     * @return Type
+     */
+    public function getDatabaseType(): Type
+    {
+        return $this->column->getType();
+    }
+
     /**
      * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
      *

diff --git a/tests/TDBMDaoGeneratorTest.php b/tests/TDBMDaoGeneratorTest.php
@@ -2175,7 +2175,7 @@ public function testMethodNameConflictsBetweenRegularAndAutoPivotProperties(): v
     public function testFindByDateTime(): void
     {
         $personDao = new PersonDao($this->tdbmService);
-        $personDao->findByModifiedAt(new \DateTimeImmutable('+1 year'))->count();
+        $personDao->findByModifiedAt(new \DateTimeImmutable())->count();
         $this->assertTrue(true);
     }
 }