Fix retrieving of NULLs in PG databases and binary fields

diff --git a/lib/dml/pgsql_native_moodle_database.php b/lib/dml/pgsql_native_moodle_database.php
index 98becbc6289024e585997a6bc740fe9d149a379e..67f213cd5be60e0b87102b8666f67cb6632e5df1 100644 (file)
--- a/lib/dml/pgsql_native_moodle_database.php
+++ b/lib/dml/pgsql_native_moodle_database.php
@@ -653,7 +653,7 @@ class pgsql_native_moodle_database extends moodle_database {
                 $id = reset($row);
                 if ($blobs) {
                     foreach ($blobs as $blob) {
-                        $row[$blob] = pg_unescape_bytea($row[$blob]);
+                        $row[$blob] = $row[$blob] !== null ? pg_unescape_bytea($row[$blob]) : null;
                     }
                 }
                 if (isset($return[$id])) {

diff --git a/lib/dml/pgsql_native_moodle_recordset.php b/lib/dml/pgsql_native_moodle_recordset.php
index 525a48c916a9788c77f5b2d4605d24ca24780806..41093740e0c89e5eb1aa796e52d4d33bb2579508 100644 (file)
--- a/lib/dml/pgsql_native_moodle_recordset.php
+++ b/lib/dml/pgsql_native_moodle_recordset.php
@@ -62,7 +62,7 @@ class pgsql_native_moodle_recordset extends moodle_recordset {
 
         if ($this->blobs) {
             foreach ($this->blobs as $blob) {
-                $row[$blob] = pg_unescape_bytea($row[$blob]);
+                $row[$blob] = $row[$blob] !== null ? pg_unescape_bytea($row[$blob]) : null;
             }
         }