Commit be1d5f16 authored by doctrine's avatar doctrine

Possibility to override Doctrine_Record::delete()

parent f0d74ea1
...@@ -600,7 +600,7 @@ class Doctrine_DQL_Parser { ...@@ -600,7 +600,7 @@ class Doctrine_DQL_Parser {
foreach($parts as $part) { foreach($parts as $part) {
$ret[] = $this->parseWhere($part); $ret[] = $this->parseWhere($part);
} }
$r = implode(" || ",$ret); $r = implode(" OR ",$ret);
} else { } else {
return $this->loadWhere($parts[0]); return $this->loadWhere($parts[0]);
} }
......
...@@ -725,7 +725,7 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite ...@@ -725,7 +725,7 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
* *
* @return boolean true on success, false on failure * @return boolean true on success, false on failure
*/ */
final public function delete() { public function delete() {
$this->table->getSession()->delete($this); $this->table->getSession()->delete($this);
} }
/** /**
......
...@@ -88,6 +88,7 @@ class Doctrine_DQL_ParserTestCase extends Doctrine_UnitTestCase { ...@@ -88,6 +88,7 @@ class Doctrine_DQL_ParserTestCase extends Doctrine_UnitTestCase {
// DYNAMIC FETCHMODES // DYNAMIC FETCHMODES
$e = false;
try { try {
$users = $graph->query("FROM User-unknown"); $users = $graph->query("FROM User-unknown");
} catch(Exception $e) { } catch(Exception $e) {
......
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