- MDB2_PORTABILITY_RTRIM ignored by driver (Bug #8239)

git-svn-id: http://svn.php.net/repository/pear/packages/MDB2/trunk@216704 c90b9560-bf6c-de11-be94-00142212c4b1
pear · Jul 19, 2006 · d3c3264 · d3c3264
1 parent af51687
commit d3c3264
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/MDB2/Driver/pgsql.php b/MDB2/Driver/pgsql.php
@@ -986,8 +986,10 @@ function &fetchRow($fetchmode = MDB2_FETCHMODE_DEFAULT, $rownum = null)
             $null = null;
             return $null;
         }
-        if ($this->db->options['portability'] & MDB2_PORTABILITY_EMPTY_TO_NULL) {
-            $this->db->_fixResultArrayValues($row, MDB2_PORTABILITY_EMPTY_TO_NULL);
+        if (($mode = ($this->db->options['portability'] & MDB2_PORTABILITY_RTRIM)
+            + ($this->db->options['portability'] & MDB2_PORTABILITY_EMPTY_TO_NULL))
+        ) {
+            $this->db->_fixResultArrayValues($row, $mode);
         }
         if (!empty($this->values)) {
             $this->_assignBindColumns($row);

diff --git a/MDB2/Driver/sqlite.php b/MDB2/Driver/sqlite.php
@@ -869,8 +869,10 @@ function &fetchRow($fetchmode = MDB2_FETCHMODE_DEFAULT, $rownum = null)
             $null = null;
             return $null;
         }
-        if ($this->db->options['portability'] & MDB2_PORTABILITY_EMPTY_TO_NULL) {
-            $this->db->_fixResultArrayValues($row, MDB2_PORTABILITY_EMPTY_TO_NULL);
+        if (($mode = ($this->db->options['portability'] & MDB2_PORTABILITY_RTRIM)
+            + ($this->db->options['portability'] & MDB2_PORTABILITY_EMPTY_TO_NULL))
+        ) {
+            $this->db->_fixResultArrayValues($row, $mode);
         }
         if (!empty($this->values)) {
             $this->_assignBindColumns($row);