- s/\$db/\$this->conn
- turned raiseError() calls into throw Exception
This commit is contained in:
parent
67514f4c6a
commit
cf4c715cd2
@ -82,7 +82,7 @@ class Doctrine_Expression_Mysql extends Doctrine_Expression
|
||||
if ($key % 2) {
|
||||
$match .= $value;
|
||||
} else {
|
||||
$match .= $db->escapePattern($db->escape($value));
|
||||
$match .= $this->conn->escapePattern($this->conn->escape($value));
|
||||
}
|
||||
}
|
||||
$match.= "'";
|
||||
|
@ -151,8 +151,7 @@ class Doctrine_Expression_Pgsql extends Doctrine_Expression
|
||||
$match = $field.'LIKE ';
|
||||
break;
|
||||
default:
|
||||
return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
|
||||
'not a supported operator type:'. $operator, __FUNCTION__);
|
||||
throw new Doctrine_Expression_Pgsql_Exception('not a supported operator type:'. $operator);
|
||||
}
|
||||
}
|
||||
$match.= "'";
|
||||
@ -160,7 +159,7 @@ class Doctrine_Expression_Pgsql extends Doctrine_Expression
|
||||
if ($key % 2) {
|
||||
$match.= $value;
|
||||
} else {
|
||||
$match.= $db->escapePattern($db->escape($value));
|
||||
$match.= $this->conn->escapePattern($this->conn->escape($value));
|
||||
}
|
||||
}
|
||||
$match.= "'";
|
||||
|
Loading…
Reference in New Issue
Block a user