fix fetching NULL values via fetchColumn()

deeky666 · deeky666 · commit d3f658f11189 · 2014-11-05T14:14:48.000+01:00
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 number	Diff line change
`@@ -267,7 +267,7 @@ public function fetchColumn($columnIndex = 0)`
`267`	`267`	`return false;`
`268`	`268`	`}`
`269`	`269`
`270`		`- return isset($row[$columnIndex]) \|\| array_key_exists($columnIndex, $row) ? $row[$columnIndex] : null;`
	`270`	`+ return isset($row[$columnIndex]) ? $row[$columnIndex] : null;`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ public function fetchColumn($columnIndex = 0)`
`293`	`293`	`return false;`
`294`	`294`	`}`
`295`	`295`
`296`		`- return isset($row[$columnIndex]) \|\| array_key_exists($columnIndex, $row) ? $row[$columnIndex] : null;`
	`296`	`+ return isset($row[$columnIndex]) ? $row[$columnIndex] : null;`
`297`	`297`	`}`
`298`	`298`
`299`	`299`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ public function fetchColumn($columnIndex = 0)`
`270`	`270`	`return false;`
`271`	`271`	`}`
`272`	`272`
`273`		`- return isset($row[$columnIndex]) \|\| array_key_exists($columnIndex, $row) ? $row[$columnIndex] : null;`
	`273`	`+ return isset($row[$columnIndex]) ? $row[$columnIndex] : null;`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -251,6 +251,7 @@ public function fetch($fetchMode = null)`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`$rows = sqlsrv_fetch_object($this->stmt, $className, $ctorArgs);`
	`254`	`+`
`254`	`255`	`return $rows ?: false;`
`255`	`256`	`}`
`256`	`257`
`@@ -295,7 +296,7 @@ public function fetchColumn($columnIndex = 0)`
`295`	`296`	`return false;`
`296`	`297`	`}`
`297`	`298`
`298`		`- return isset($row[$columnIndex]) \|\| array_key_exists($columnIndex, $row) ? $row[$columnIndex] : null;`
	`299`	`+ return isset($row[$columnIndex]) ? $row[$columnIndex] : null;`
`299`	`300`	`}`
`300`	`301`
`301`	`302`	`/**`