Merge branch 'hotfix/6510' into develop

Forward port zendframework/zendframework#6510
zendframework · Aug 4, 2014 · 9ee64b1 · 9ee64b1
commit 9ee64b1
Show file tree

Hide file tree

Showing 2 changed files with 418 additions and 0 deletions.
diff --git a/src/Adapter/DbTable/AbstractAdapter.php b/src/Adapter/DbTable/AbstractAdapter.php
@@ -324,6 +324,11 @@ protected function authenticateQuerySelect(Sql\Select $dbSelect)
             $resultIdentities = array();
             // iterate result, most cross platform way
             foreach ($result as $row) {
+                // ZF-6428 - account for db engines that by default return uppercase column names
+                if (isset($row['ZEND_AUTH_CREDENTIAL_MATCH'])) {
+                    $row['zend_auth_credential_match'] = $row['ZEND_AUTH_CREDENTIAL_MATCH'];
+                    unset($row['ZEND_AUTH_CREDENTIAL_MATCH']);
+                }
                 $resultIdentities[] = $row;
             }
         } catch (\Exception $e) {