From 4625ffa6b410f059f2629fabd85f6c8077babcbd Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sun, 12 Jan 2025 21:43:48 +0100 Subject: Fix return value from dba_pdo::q() According to the documentation, this function should never return null. Still that's what it did if a non-select query raised a PDOException. This patch fixes this, so that it so that the function conforms to the docs. --- include/dba/dba_pdo.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'include/dba') diff --git a/include/dba/dba_pdo.php b/include/dba/dba_pdo.php index fc10fee56..503b71233 100644 --- a/include/dba/dba_pdo.php +++ b/include/dba/dba_pdo.php @@ -73,7 +73,7 @@ class dba_pdo extends dba_driver { } } - $result = null; + $result = false; $this->error = ''; $select = stripos($sql, 'select') === 0 || stripos($sql, 'returning ') > 0; @@ -162,10 +162,6 @@ class dba_pdo extends dba_driver { db_logger('dba_pdo: PDOStatement returned, did not expect that.'); return false; } - } elseif ($res === null) { - // While `q` should never return null, that's exactly what it - // does when the insert fails. Let's turn it to a false instead. - $res = false; } if (is_array($res)) { -- cgit v1.2.3