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

Fixes #156

Browse Source 
Ticket: 156
This commit is contained in:
zYne 2006-10-09 16:32:37 +00:00
parent cba61cb346
commit 499da8f9b8
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/Doctrine/Query.php
View File

@ -423,17 +423,22 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable {
* first splits the query in parts and then uses individual
* parsers for each part
*
* @param string $query DQL query
* @param string $query DQL query
* @throws Doctrine_Query_Exception if some generic parsing error occurs
* @return Doctrine_Query
*/
public function parseQuery($query) {
$this->clear();
$query = trim($query);
$query = str_replace("\n"," ",$query);
$query = str_replace("\r"," ",$query);
$e = self::sqlExplode($query," ","(",")");
$parts = array();
foreach($e as $k=>$part):
switch(strtolower($part)):
foreach($e as $k=>$part) {
$part = trim($part);
switch(strtolower($part)) {
case "select":
case "from":
case "where":
@ -449,24 +454,26 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable {
if(isset($e[$i]) && strtolower($e[$i]) === "by") {
$p = $part;
$parts[$part] = array();
} else
} else
$parts[$p][] = $part;
break;
case "by":
continue;
default:
if( ! isset($p))
throw new Doctrine_Query_Exception("Couldn't parse query.");
$parts[$p][] = $part;
endswitch;
endforeach;
}
}
foreach($parts as $k => $part) {
$part = implode(" ",$part);
switch(strtoupper($k)):
switch(strtoupper($k)) {
case "SELECT":
$this->parseSelect($part);
break;
case "FROM":
$class = "Doctrine_Query_".ucwords(strtolower($k));
$parser = new $class($this);
$parser->parse($part);
@ -488,7 +495,7 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable {
case "OFFSET":
$this->parts["offset"] = trim($part);
break;
endswitch;
}
}
return $this;

11
tests/QueryTestCase.php
View File

@ -66,9 +66,18 @@ class Doctrine_QueryTestCase extends Doctrine_UnitTestCase {
$this->assertTrue($users[2]->getState(), Doctrine_Record::STATE_CLEAN);
$this->assertEqual($count + 3, count($this->dbh));
}
public function testMultilineParsing() {
$dql = "
FROM User u
WHERE User.id = ?
";
$q = new Doctrine_Query();
$q->parseQuery($dql);
$this->assertEqual($q->getQuery(), "SELECT entity.id AS entity__id, entity.name AS entity__name, entity.loginname AS entity__loginname, entity.password AS entity__password, entity.type AS entity__type, entity.created AS entity__created, entity.updated AS entity__updated, entity.email_id AS entity__email_id FROM entity WHERE entity.id = ? AND (entity.type = 0)");
}
public function testUnknownFunction() {
$q = new Doctrine_Query();
$f = false;