Merge branch 'fix' into 'master'

Ady · Ady · commit dbdfc1c0707e · 2022-01-29T05:50:56.000Z
fix: handle null value in insert statement

See merge request adynemo/maintenance-bundle!4
diff --git a/Drivers/Query/DefaultQuery.php b/Drivers/Query/DefaultQuery.php
@@ -82,10 +82,11 @@ public function insertQuery($ttl, $db)
         return $this->exec(
             $db,
             sprintf(
-                'INSERT INTO %s (ttl) VALUES (?)',
-                $this->options['table']
+                'INSERT INTO %1$s (ttl) VALUES (%2$s)',
+                $this->options['table'],
+                $ttl ? '?' : 'NULL'
             ),
-            [1 => $ttl]
+            $ttl ? [1 => $ttl] : []
         );
     }
 }
diff --git a/Drivers/Query/DsnQuery.php b/Drivers/Query/DsnQuery.php
@@ -63,10 +63,11 @@ public function insertQuery($ttl, $db)
         return $this->exec(
             $db,
             sprintf(
-                'INSERT INTO %s (ttl) VALUES (?)',
-                $this->options['table']
+                'INSERT INTO %1$s (ttl) VALUES (%2$s)',
+                $this->options['table'],
+                $ttl ? '?' : 'NULL'
             ),
-            [1 => $ttl]
+            $ttl ? [1 => $ttl] : []
         );
     }
 }
diff --git a/Drivers/Query/PdoQuery.php b/Drivers/Query/PdoQuery.php
@@ -158,15 +158,7 @@ protected function fetch($db, $query, array $args = [])
     private function bindValues($stmt, array $args)
     {
         foreach ($args as $arg => $val) {
-            if (is_null($val)) {
-                $type = \PDO::PARAM_NULL;
-            } elseif (is_int($val)) {
-                $type = \PDO::PARAM_INT;
-            } else {
-                $type = \PDO::PARAM_STR;
-            }
-
-            $stmt->bindValue($arg, $val, $type);
+            $stmt->bindValue($arg, $val, is_int($val) ? \PDO::PARAM_INT : \PDO::PARAM_STR);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -158,15 +158,7 @@ protected function fetch($db, $query, array $args = [])`
`158`	`158`	`private function bindValues($stmt, array $args)`
`159`	`159`	`{`
`160`	`160`	`foreach ($args as $arg => $val) {`
`161`		`- if (is_null($val)) {`
`162`		`- $type = \PDO::PARAM_NULL;`
`163`		`- } elseif (is_int($val)) {`
`164`		`- $type = \PDO::PARAM_INT;`
`165`		`- } else {`
`166`		`- $type = \PDO::PARAM_STR;`
`167`		`- }`
`168`		`-`
`169`		`- $stmt->bindValue($arg, $val, $type);`
	`161`	`+ $stmt->bindValue($arg, $val, is_int($val) ? \PDO::PARAM_INT : \PDO::PARAM_STR);`
`170`	`162`	`}`
`171`	`163`	`}`
`172`	`164`	`}`