RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-25 17:33:55 +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)');

44
tests/Query/ExpressionTestCase.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* /*
* $Id$ * $Id$
* *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@ -30,16 +30,16 @@
* @link www.phpdoctrine.com * @link www.phpdoctrine.com
* @since 1.0 * @since 1.0
*/ */
class Doctrine_Query_Expression_TestCase extends Doctrine_UnitTestCase class Doctrine_Query_Expression_TestCase extends Doctrine_UnitTestCase
{ {
public function testUnknownExpressionInSelectClauseThrowsException() public function testUnknownExpressionInSelectClauseThrowsException()
{ {
$q = new Doctrine_Query(); $q = new Doctrine_Query();
try { try {
$q->parseQuery('SELECT SOMEUNKNOWNFUNC(u.name, " ", u.loginname) FROM User u'); $q->parseQuery('SELECT SOMEUNKNOWNFUNC(u.name, " ", u.loginname) FROM User u');
$q->getQuery(); $q->getQuery();
$this->fail(); $this->fail();
} catch(Doctrine_Query_Exception $e) { } catch(Doctrine_Query_Exception $e) {
@ -47,13 +47,13 @@ class Doctrine_Query_Expression_TestCase extends Doctrine_UnitTestCase
} }
} }
public function testUnknownColumnWithinFunctionInSelectClauseThrowsException() public function testUnknownColumnWithinFunctionInSelectClauseThrowsException()
{ {
$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();
} catch(Doctrine_Query_Exception $e) { } catch(Doctrine_Query_Exception $e) {
@ -61,31 +61,31 @@ class Doctrine_Query_Expression_TestCase extends Doctrine_UnitTestCase
} }
} }
public function testConcatIsSupportedInSelectClause() public function testConcatIsSupportedInSelectClause()
{ {
$q = new Doctrine_Query(); $q = new Doctrine_Query();
$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()
{ {
$q = new Doctrine_Query(); $q = new Doctrine_Query();
$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()
{ {
$q = new Doctrine_Query(); $q = new Doctrine_Query();
$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()
@ -99,7 +99,7 @@ class Doctrine_Query_Expression_TestCase extends Doctrine_UnitTestCase
$radius = '33'; $radius = '33';
$query->select("l.*, i18n.*, GeoDistKM(l.lat, l.lon, $lat, $lon) distance") $query->select("l.*, i18n.*, GeoDistKM(l.lat, l.lon, $lat, $lon) distance")
->from('Location l, l.LocationI18n i18n') ->from('Location l, l.LocationI18n i18n')
->where('l.id <> ? AND i18n.culture = ?', array(1, 'en')) ->where('l.id <> ? AND i18n.culture = ?', array(1, 'en'))
->having("distance < $radius") ->having("distance < $radius")
->orderby('distance ASC') ->orderby('distance ASC')