Connection: Support IS NULL in update/delete criteria

If you pass a null to the where array of update or delete it's pretty obvious what you want. Most (all?) databases won't match anything if you actually try to compare with NULL making this a silent failure without it.
doctrine · Mar 25, 2017 · 04919c9 · 04919c9
1 parent e0169b2
commit 04919c9
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 6 deletions.
diff --git a/lib/Doctrine/DBAL/Connection.php b/lib/Doctrine/DBAL/Connection.php
@@ -584,9 +584,13 @@ public function delete($tableExpression, array $identifier, array $types = array
         $paramValues = array();
 
         foreach ($identifier as $columnName => $value) {
-            $columnList[] = $columnName;
-            $criteria[] = $columnName . ' = ?';
-            $paramValues[] = $value;
+            if (is_null($value)) {
+                $criteria[] = $this->getDatabasePlatform()->getIsNullExpression($columnName);
+            } else {
+                $columnList[] = $columnName;
+                $paramValues[] = $value;
+                $criteria[] = $columnName . ' = ?';
+            }
         }
 
         return $this->executeUpdate(
@@ -662,9 +666,13 @@ public function update($tableExpression, array $data, array $identifier, array $
         }
 
         foreach ($identifier as $columnName => $value) {
-            $columnList[] = $columnName;
-            $criteria[] = $columnName . ' = ?';
-            $paramValues[] = $value;
+            if (is_null($value)) {
+                $criteria[] = $this->getDatabasePlatform()->getIsNullExpression($columnName);
+            } else {
+                $columnList[] = $columnName;
+                $paramValues[] = $value;
+                $criteria[] = $columnName . ' = ?';
+            }
         }
 
         if (is_string(key($types))) {

diff --git a/tests/Doctrine/Tests/DBAL/ConnectionTest.php b/tests/Doctrine/Tests/DBAL/ConnectionTest.php
@@ -403,6 +403,57 @@ public function testUpdateWithSameColumnInDataAndIdentifiers()
         );
     }
 
+    /**
+     * @group DBAL-2511
+     */
+    public function testUpdateWithIsNull()
+    {
+        $driverMock = $this->createMock('Doctrine\DBAL\Driver');
+
+        $driverMock->expects($this->any())
+            ->method('connect')
+            ->will($this->returnValue(new DriverConnectionMock()));
+
+        $conn = $this->getMockBuilder('Doctrine\DBAL\Connection')
+            ->setMethods(array('executeUpdate'))
+            ->setConstructorArgs(array(array('platform' => new Mocks\MockPlatform()), $driverMock))
+            ->getMock();
+
+        $conn->expects($this->once())
+            ->method('executeUpdate')
+            ->with(
+                'UPDATE TestTable SET text = ?, is_edited = ? WHERE id IS NULL AND name = ?',
+                [
+                    'some text',
+                    null,
+                    'foo',
+                ],
+                [
+                    'string',
+                    'null',
+                    'string',
+                ]
+            );
+
+        $conn->update(
+            'TestTable',
+            [
+                'text' => 'some text',
+                'is_edited' => null,
+            ],
+            [
+                'id' => null,
+                'name' => 'foo',
+            ],
+            [
+                'text' => 'string',
+                'is_edited' => 'null',
+                'id' => 'null',
+                'name' => 'string',
+            ]
+        );
+    }
+
     public function testFetchAssoc()
     {
         $statement = 'SELECT * FROM foo WHERE bar = ?';