- fixed test cases to expect the || SQL standard syntax
This commit is contained in:
parent
e98035999a
commit
88dfc98704
@ -96,7 +96,7 @@ class Doctrine_Expression_Driver_TestCase extends Doctrine_UnitTestCase {
|
||||
$this->assertEqual($this->expr->locate('id', 3), 'LOCATE(id, 3)');
|
||||
}
|
||||
public function testConcatReturnsValidSql() {
|
||||
$this->assertEqual($this->expr->concat('id', 'type'), 'CONCAT(id, type)');
|
||||
$this->assertEqual($this->expr->concat('id', 'type'), 'id || type');
|
||||
}
|
||||
public function testSubstringReturnsValidSql() {
|
||||
$this->assertEqual($this->expr->substring('id', 3), 'SUBSTRING(id FROM 3)');
|
||||
|
@ -52,7 +52,7 @@ class Doctrine_Query_Expression_TestCase extends Doctrine_UnitTestCase
|
||||
$q = new Doctrine_Query();
|
||||
|
||||
try {
|
||||
$q->parseQuery('SELECT CONCAT(u.name, u.unknown) FROM User u');
|
||||
$q->parseQuery('SELECT u.name || u.unknown FROM User u');
|
||||
|
||||
$q->execute();
|
||||
$this->fail();
|
||||
@ -67,7 +67,7 @@ class Doctrine_Query_Expression_TestCase extends Doctrine_UnitTestCase
|
||||
|
||||
$q->parseQuery('SELECT CONCAT(u.name, u.loginname) FROM User u');
|
||||
|
||||
$this->assertEqual($q->getQuery(), 'SELECT CONCAT(e.name, e.loginname) AS e__0 FROM entity e WHERE (e.type = 0)');
|
||||
$this->assertEqual($q->getQuery(), 'SELECT e.name || e.loginname AS e__0 FROM entity e WHERE (e.type = 0)');
|
||||
}
|
||||
|
||||
public function testConcatInSelectClauseSupportsLiteralStrings()
|
||||
@ -76,7 +76,7 @@ class Doctrine_Query_Expression_TestCase extends Doctrine_UnitTestCase
|
||||
|
||||
$q->parseQuery("SELECT CONCAT(u.name, 'The Man') FROM User u");
|
||||
|
||||
$this->assertEqual($q->getQuery(), "SELECT CONCAT(e.name, 'The Man') AS e__0 FROM entity e WHERE (e.type = 0)");
|
||||
$this->assertEqual($q->getQuery(), "SELECT e.name || 'The Man' AS e__0 FROM entity e WHERE (e.type = 0)");
|
||||
}
|
||||
|
||||
public function testConcatInSelectClauseSupportsMoreThanTwoArgs()
|
||||
@ -85,7 +85,7 @@ class Doctrine_Query_Expression_TestCase extends Doctrine_UnitTestCase
|
||||
|
||||
$q->parseQuery("SELECT CONCAT(u.name, 'The Man', u.loginname) FROM User u");
|
||||
|
||||
$this->assertEqual($q->getQuery(), "SELECT CONCAT(e.name, 'The Man', e.loginname) AS e__0 FROM entity e WHERE (e.type = 0)");
|
||||
$this->assertEqual($q->getQuery(), "SELECT e.name || 'The Man' || e.loginname AS e__0 FROM entity e WHERE (e.type = 0)");
|
||||
}
|
||||
|
||||
public function testNonPortableFunctionsAreSupported()
|
||||
|
Loading…
x
Reference in New Issue
Block a user