- 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) {
|
if ($key % 2) {
|
||||||
$match .= $value;
|
$match .= $value;
|
||||||
} else {
|
} else {
|
||||||
$match .= $db->escapePattern($db->escape($value));
|
$match .= $this->conn->escapePattern($this->conn->escape($value));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$match.= "'";
|
$match.= "'";
|
||||||
|
@ -151,8 +151,7 @@ class Doctrine_Expression_Pgsql extends Doctrine_Expression
|
|||||||
$match = $field.'LIKE ';
|
$match = $field.'LIKE ';
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
|
throw new Doctrine_Expression_Pgsql_Exception('not a supported operator type:'. $operator);
|
||||||
'not a supported operator type:'. $operator, __FUNCTION__);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$match.= "'";
|
$match.= "'";
|
||||||
@ -160,7 +159,7 @@ class Doctrine_Expression_Pgsql extends Doctrine_Expression
|
|||||||
if ($key % 2) {
|
if ($key % 2) {
|
||||||
$match.= $value;
|
$match.= $value;
|
||||||
} else {
|
} else {
|
||||||
$match.= $db->escapePattern($db->escape($value));
|
$match.= $this->conn->escapePattern($this->conn->escape($value));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$match.= "'";
|
$match.= "'";
|
||||||
|
Loading…
Reference in New Issue
Block a user