Skip to content

D
doctrine-dbal
Commit 46154c56 authored by zYne's avatar zYne
Browse files
Options

fixes #418

parent 5fe33464
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
lib/Doctrine/Hydrate.php
View file @ 46154c56
...@@ -882,10 +882,10 @@ class Doctrine_Hydrate extends Doctrine_Object implements Serializable ...@@ -882,10 +882,10 @@ class Doctrine_Hydrate extends Doctrine_Object implements Serializable
$identifier = $this->_conn->quoteIdentifier($tableAlias . $field); $identifier = $this->_conn->quoteIdentifier($tableAlias . $field);
if ($index > 0) { if ($index > 0) {
$b[] = '(' . $identifier . ' = ' . $value $b[] = '(' . $identifier . ' = ' . $this->_conn->quote($value)
. ' OR ' . $identifier . ' IS NULL)'; . ' OR ' . $identifier . ' IS NULL)';
} else { } else {
$b[] = $identifier . ' = ' . $value; $b[] = $identifier . ' = ' . $this->_conn->quote($value);
} }
} }
...@@ -987,7 +987,6 @@ class Doctrine_Hydrate extends Doctrine_Object implements Serializable ...@@ -987,7 +987,6 @@ class Doctrine_Hydrate extends Doctrine_Object implements Serializable
} }
while ($data = $stmt->fetch(Doctrine::FETCH_ASSOC)) { while ($data = $stmt->fetch(Doctrine::FETCH_ASSOC)) {
$parse = true; $parse = true;
foreach ($data as $key => $value) { foreach ($data as $key => $value) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment