1
0
mirror of synced 2025-01-18 06:21:40 +03:00

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

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

View File

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

View File

@ -99,7 +99,7 @@ class Doctrine_Query_TestCase extends Doctrine_UnitTestCase
$q->from('User u')->leftJoin('u.Phonenumber p');
$q->getQuery();
//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