RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-13 14:56:01 +03:00
Code Issues Projects Releases Wiki Activity

Browse Source
This commit is contained in:
zYne 2007-08-13 21:14:53 +00:00
parent 3bf396c06c
commit ce8fa91204
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Doctrine/Query/Where.php
View File

@ -68,9 +68,13 @@ class Doctrine_Query_Where extends Doctrine_Query_Condition
$alias = $this->query->getTableAlias($reference); $alias = $this->query->getTableAlias($reference);
$table = $map['table']; $table = $map['table'];
$first = $conn->quoteIdentifier($alias) if ($this->query->getType() === Doctrine_Query::SELECT) {
. '.' $first = $conn->quoteIdentifier($alias)
. $conn->quoteIdentifier($table->getColumnName($field)); . '.'
. $conn->quoteIdentifier($table->getColumnName($field));
} else {
$first = $conn->quoteIdentifier($table->getColumnName($field));
}
} else { } else {
$first = $this->query->parseClause($first); $first = $this->query->parseClause($first);
} }
@ -126,8 +130,11 @@ class Doctrine_Query_Where extends Doctrine_Query_Condition
$this->query->addEnumParam($value, null, null); $this->query->addEnumParam($value, null, null);
} }
} else { } else {
// check if value is enumerated value $enumIndex = false;
$enumIndex = $table->enumIndex($field, trim($value, "'")); if (isset($table) && isset($field)) {
// check if value is enumerated value
$enumIndex = $table->enumIndex($field, trim($value, "'"));
}
if ($enumIndex !== false) { if ($enumIndex !== false) {
$value = $enumIndex; $value = $enumIndex;