RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-26 01:43:52 +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:17:05 +00:00
parent e98035999a
commit 88dfc98704
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Expression/DriverTestCase.php
View File

@ -96,7 +96,7 @@ class Doctrine_Expression_Driver_TestCase extends Doctrine_UnitTestCase {
$this->assertEqual($this->expr->locate('id', 3), 'LOCATE(id, 3)'); $this->assertEqual($this->expr->locate('id', 3), 'LOCATE(id, 3)');
} }
public function testConcatReturnsValidSql() { 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() { public function testSubstringReturnsValidSql() {
$this->assertEqual($this->expr->substring('id', 3), 'SUBSTRING(id FROM 3)'); $this->assertEqual($this->expr->substring('id', 3), 'SUBSTRING(id FROM 3)');

8
tests/Query/ExpressionTestCase.php
View File

@ -52,7 +52,7 @@ class Doctrine_Query_Expression_TestCase extends Doctrine_UnitTestCase
$q = new Doctrine_Query(); $q = new Doctrine_Query();
try { try {
$q->parseQuery('SELECT CONCAT(u.name, u.unknown) FROM User u'); $q->parseQuery('SELECT u.name || u.unknown FROM User u');
$q->execute(); $q->execute();
$this->fail(); $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'); $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() 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"); $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() 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"); $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() public function testNonPortableFunctionsAreSupported()