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

- fixed test cases to expect the || SQL standard syntax

Browse source
This commit is contained in:
lsmith 2008-01-10 13:15:34 +00:00
parent c6b6669a54
commit cb1a71f163
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tests/ExpressionTestCase.php
View file

@ -38,8 +38,8 @@ class Doctrine_Expression_TestCase extends Doctrine_UnitTestCase
public function testSavingWithAnExpression() public function testSavingWithAnExpression()
{ {
$e = new Doctrine_Expression("CONCAT('some', 'one')"); $e = new Doctrine_Expression("'some' || 'one'");
$this->assertEqual($e->getSql(), "CONCAT('some', 'one')"); $this->assertEqual($e->getSql(), "'some' || 'one'");
$u = new User(); $u = new User();
$u->name = $e; $u->name = $e;
@ -56,8 +56,7 @@ class Doctrine_Expression_TestCase extends Doctrine_UnitTestCase
public function testExpressionParserSupportsFunctionComposition() public function testExpressionParserSupportsFunctionComposition()
{ {
$e = new Doctrine_Expression("SUBSTRING(CONCAT('some', 'one'), 0, 3)"); $e = new Doctrine_Expression("SUBSTRING('some' || 'one', 0, 3)");
$this->assertEqual($e->getSql(), "SUBSTR(CONCAT('some', 'one'), 0, 3)"); $this->assertEqual($e->getSql(), "SUBSTR('some' || 'one', 0, 3)");
} }
} }

14
tests/QueryTestCase.php
View file

@ -30,7 +30,7 @@
* @since 1.0 * @since 1.0
* @version $Revision$ * @version $Revision$
*/ */
class Doctrine_Query_TestCase extends Doctrine_UnitTestCase class Doctrine_Query_TestCase extends Doctrine_UnitTestCase
{ {
public function testGetQueryHookResetsTheManuallyAddedDqlParts() public function testGetQueryHookResetsTheManuallyAddedDqlParts()
@ -48,7 +48,7 @@ class Doctrine_Query_TestCase extends Doctrine_UnitTestCase
public function testParseClauseSupportsArithmeticOperators() public function testParseClauseSupportsArithmeticOperators()
{ {
$q = new Doctrine_Query(); $q = new Doctrine_Query();
$str = $q->parseClause('2 + 3'); $str = $q->parseClause('2 + 3');
@ -60,7 +60,7 @@ class Doctrine_Query_TestCase extends Doctrine_UnitTestCase
} }
public function testParseClauseSupportsArithmeticOperatorsWithFunctions() public function testParseClauseSupportsArithmeticOperatorsWithFunctions()
{ {
$q = new Doctrine_Query(); $q = new Doctrine_Query();
$str = $q->parseClause('ACOS(2) + 3'); $str = $q->parseClause('ACOS(2) + 3');
@ -69,7 +69,7 @@ class Doctrine_Query_TestCase extends Doctrine_UnitTestCase
public function testParseClauseSupportsArithmeticOperatorsWithParenthesis() public function testParseClauseSupportsArithmeticOperatorsWithParenthesis()
{ {
$q = new Doctrine_Query(); $q = new Doctrine_Query();
$str = $q->parseClause('(3 + 3)*3'); $str = $q->parseClause('(3 + 3)*3');
@ -82,7 +82,7 @@ class Doctrine_Query_TestCase extends Doctrine_UnitTestCase
public function testParseClauseSupportsArithmeticOperatorsWithParenthesisAndFunctions() public function testParseClauseSupportsArithmeticOperatorsWithParenthesisAndFunctions()
{ {
$q = new Doctrine_Query(); $q = new Doctrine_Query();
$str = $q->parseClause('(3 + 3)*ACOS(3)'); $str = $q->parseClause('(3 + 3)*ACOS(3)');
@ -95,11 +95,11 @@ class Doctrine_Query_TestCase extends Doctrine_UnitTestCase
public function testParseClauseSupportsComponentReferences() public function testParseClauseSupportsComponentReferences()
{ {
$q = new Doctrine_Query(); $q = new Doctrine_Query();
$q->from('User u')->leftJoin('u.Phonenumber p'); $q->from('User u')->leftJoin('u.Phonenumber p');
$q->getQuery(); $q->getQuery();
//Doctrine::dump($q->getCachedForm(array('foo' => 'bar'))); //Doctrine::dump($q->getCachedForm(array('foo' => 'bar')));
$this->assertEqual($q->parseClause("CONCAT('u.name', u.name)"), "CONCAT('u.name', e.name)"); $this->assertEqual($q->parseClause("CONCAT('u.name', u.name)"), "'u.name' || e.name");
} }
} }
class MyQuery extends Doctrine_Query class MyQuery extends Doctrine_Query