fix fetching NULL values via fetchColumn()

doctrine · Nov 5, 2014 · d3f658f · d3f658f
1 parent 4af1b64
commit d3f658f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php b/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php
@@ -267,7 +267,7 @@ public function fetchColumn($columnIndex = 0)
             return false;
         }
 
-        return isset($row[$columnIndex]) || array_key_exists($columnIndex, $row) ? $row[$columnIndex] : null;
+        return isset($row[$columnIndex]) ? $row[$columnIndex] : null;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php b/lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php
@@ -293,7 +293,7 @@ public function fetchColumn($columnIndex = 0)
             return false;
         }
 
-        return isset($row[$columnIndex]) || array_key_exists($columnIndex, $row) ? $row[$columnIndex] : null;
+        return isset($row[$columnIndex]) ? $row[$columnIndex] : null;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereStatement.php b/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereStatement.php
@@ -270,7 +270,7 @@ public function fetchColumn($columnIndex = 0)
             return false;
         }
 
-        return isset($row[$columnIndex]) || array_key_exists($columnIndex, $row) ? $row[$columnIndex] : null;
+        return isset($row[$columnIndex]) ? $row[$columnIndex] : null;
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php b/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php
@@ -251,6 +251,7 @@ public function fetch($fetchMode = null)
             }
 
             $rows = sqlsrv_fetch_object($this->stmt, $className, $ctorArgs);
+
             return $rows ?: false;
         }
 
@@ -295,7 +296,7 @@ public function fetchColumn($columnIndex = 0)
             return false;
         }
 
-        return isset($row[$columnIndex]) || array_key_exists($columnIndex, $row) ? $row[$columnIndex] : null;
+        return isset($row[$columnIndex]) ? $row[$columnIndex] : null;
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -267,7 +267,7 @@ public function fetchColumn($columnIndex = 0) @@
                 return false;
             }
-            return isset($row[$columnIndex]) || array_key_exists($columnIndex, $row) ? $row[$columnIndex] : null;
+            return isset($row[$columnIndex]) ? $row[$columnIndex] : null;
         }
         /**
@@ Expand Down @@