RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 05:13:37 +03:00
Code Issues Projects Releases Wiki Activity

Added test case to demonstrate that delimiters in

Browse source 
Doctrine_Query_Tokenizer::bracketExplode() were case sensitive, and 
changed tokenizer to make them case insensitive.
This commit is contained in:
dbrewer 2007-12-07 03:23:09 +00:00
parent 227c1c3c1b
commit 7e0a902aba
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/Doctrine/Query/Tokenizer.php
View file

@ -33,9 +33,9 @@
* into a stateless StringUtil? class. This tokenizer should be concerned with tokenizing * into a stateless StringUtil? class. This tokenizer should be concerned with tokenizing
* DQL strings. * DQL strings.
*/ */
class Doctrine_Query_Tokenizer class Doctrine_Query_Tokenizer
{ {
/** /**
* tokenizeQuery * tokenizeQuery
* splits the given dql query into an array where keys * splits the given dql query into an array where keys
@ -102,7 +102,7 @@ class Doctrine_Query_Tokenizer
} }
return $parts; return $parts;
} }
/** /**
* trims brackets * trims brackets
* *
@ -143,7 +143,7 @@ class Doctrine_Query_Tokenizer
public function bracketExplode($str, $d = ' ', $e1 = '(', $e2 = ')') public function bracketExplode($str, $d = ' ', $e1 = '(', $e2 = ')')
{ {
if (is_array($d)) { if (is_array($d)) {
$a = preg_split('#('.implode('|', $d).')#', $str); $a = preg_split('#('.implode('|', $d).')#i', $str);
$d = stripslashes($d[0]); $d = stripslashes($d[0]);
} else { } else {
$a = explode($d, $str); $a = explode($d, $str);
@ -156,7 +156,7 @@ class Doctrine_Query_Tokenizer
$term[$i] = trim($val); $term[$i] = trim($val);
$s1 = substr_count($term[$i], $e1); $s1 = substr_count($term[$i], $e1);
$s2 = substr_count($term[$i], $e2); $s2 = substr_count($term[$i], $e2);
if ($s1 == $s2) { if ($s1 == $s2) {
$i++; $i++;
} }
@ -164,8 +164,8 @@ class Doctrine_Query_Tokenizer
$term[$i] .= $d . trim($val); $term[$i] .= $d . trim($val);
$c1 = substr_count($term[$i], $e1); $c1 = substr_count($term[$i], $e1);
$c2 = substr_count($term[$i], $e2); $c2 = substr_count($term[$i], $e2);
if ($c1 == $c2) { if ($c1 == $c2) {
$i++; $i++;
} }
} }
@ -381,4 +381,4 @@ class Doctrine_Query_Tokenizer
return $term; return $term;
} }
} }

16
tests/TokenizerTestCase.php
View file

@ -41,7 +41,7 @@ class Doctrine_Tokenizer_TestCase extends Doctrine_UnitTestCase
public function testSqlExplode() public function testSqlExplode()
{ {
$tokenizer = new Doctrine_Query_Tokenizer(); $tokenizer = new Doctrine_Query_Tokenizer();
$str = "word1 word2 word3"; $str = "word1 word2 word3";
$a = $tokenizer->sqlExplode($str); $a = $tokenizer->sqlExplode($str);
@ -113,6 +113,20 @@ class Doctrine_Tokenizer_TestCase extends Doctrine_UnitTestCase
$this->assertEqual($a, array('rdbms (dbal OR database)')); $this->assertEqual($a, array('rdbms (dbal OR database)'));
} }
public function testBracketExplode()
{
$tokenizer = new Doctrine_Query_Tokenizer();
$str = 'foo.field AND bar.field';
$a = $tokenizer->bracketExplode($str, array(' \&\& ', ' AND '), '(', ')');
$this->assertEqual($a, array('foo.field', 'bar.field'));
// delimiters should be case insensitive
$str = 'foo.field and bar.field';
$a = $tokenizer->bracketExplode($str, array(' \&\& ', ' AND '), '(', ')');
$this->assertEqual($a, array('foo.field', 'bar.field'));
}
public function testQuoteExplodedShouldQuoteArray() public function testQuoteExplodedShouldQuoteArray()
{ {