Skip to content

D
doctrine-dbal
Commit bbf5b62a authored by lsmith's avatar lsmith
Browse files
Options

- not use the integer index, instead use the actual value for non emulated enums

parent 6987d11e
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
lib/Doctrine/Table.php
View file @ bbf5b62a
...@@ -1104,7 +1104,7 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable ...@@ -1104,7 +1104,7 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
return $index; return $index;
} }
if ( ! $this->conn->getAttribute(Doctrine::ATTR_USE_NATIVE_ENUM) if (!$this->conn->getAttribute(Doctrine::ATTR_USE_NATIVE_ENUM)
&& isset($this->columns[$field]['values'][$index]) && isset($this->columns[$field]['values'][$index])
) { ) {
return $this->columns[$field]['values'][$index]; return $this->columns[$field]['values'][$index];
...@@ -1127,7 +1127,7 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable ...@@ -1127,7 +1127,7 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
if ($index === false || !$this->conn->getAttribute(Doctrine::ATTR_USE_NATIVE_ENUM)) { if ($index === false || !$this->conn->getAttribute(Doctrine::ATTR_USE_NATIVE_ENUM)) {
return $index; return $index;
} }
return ($index+1); return $value;
} }
/* getColumnCount /* getColumnCount
* *
......
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