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

DQL enum handling fixed, fixes #202

Browse source
This commit is contained in:
zYne 2006-10-26 20:53:59 +00:00
parent 79034ea74d
commit 4cd29eaf2c
5 changed files with 94 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
lib/Doctrine/Query/Where.php
View file

@ -28,7 +28,7 @@ class Doctrine_Query_Where extends Doctrine_Query_Condition {
} }
$r = array_shift($e); $r = array_shift($e);
$a = explode(".",$r); $a = explode('.', $r);
if(count($a) > 1) { if(count($a) > 1) {
$field = array_pop($a); $field = array_pop($a);
@ -84,36 +84,43 @@ class Doctrine_Query_Where extends Doctrine_Query_Condition {
} }
} else { } else {
$table = $this->query->load($reference, false); $table = $this->query->load($reference, false);
$enumIndex = $table->enumIndex($field, trim($value,"'"));
$alias = $this->query->getTableAlias($reference); $alias = $this->query->getTableAlias($reference);
$table = $this->query->getTable($alias); $table = $this->query->getTable($alias);
// check if value is enumerated value
$enumIndex = $table->enumIndex($field, trim($value, "'"));
if(substr($value, 0, 1) == '(') {
// trim brackets
$trimmed = Doctrine_Query::bracketTrim($value);
if($value == 'true') if(substr($trimmed, 0, 4) == 'FROM' || substr($trimmed, 0, 6) == 'SELECT') {
$value = 1; // subquery found
elseif($value == 'false') $q = new Doctrine_Query();
$value = 0; $value = '(' . $q->parseQuery($trimmed)->getQuery() . ')';
elseif(substr($value,0,5) == '(FROM') { } elseif(substr($trimmed, 0, 4) == 'SQL:') {
// subquery $value = '(' . substr($trimmed, 4) . ')';
$sub = Doctrine_Query::bracketTrim($value); } else {
$q = new Doctrine_Query(); // simple in expression found
$value = '(' . $q->parseQuery($sub)->getQuery() . ')'; $e = Doctrine_Query::sqlExplode($trimmed, ',');
} else {
// check that value isn't a string $value = array();
if(strpos($value, '\'') === false) { foreach($e as $part) {
$a = explode('.', $value); $index = $table->enumIndex($field, trim($part, "'"));
if($index !== false)
if(count($a) > 1) { $value[] = $index;
// either a float or a component.. else
$value[] = $this->parseLiteralValue($part);
if( ! is_numeric($a[0])) {
// a component found
$value = $this->query->getTableAlias($a[0]). '.' . $a[1];
}
} }
$value = '(' . implode(', ', $value) . ')';
} }
} else {
if($enumIndex !== false)
$value = $enumIndex;
else
$value = $this->parseLiteralValue($value);
} }
switch($operator) { switch($operator) {
case '<': case '<':
case '>': case '>':
@ -128,7 +135,32 @@ class Doctrine_Query_Where extends Doctrine_Query_Condition {
} }
return $where; return $where;
} }
public function parseLiteralValue($value) {
// check that value isn't a string
if(strpos($value, '\'') === false) {
// parse booleans
if($value == 'true')
$value = 1;
elseif($value == 'false')
$value = 0;
$a = explode('.', $value);
if(count($a) > 1) {
// either a float or a component..
if( ! is_numeric($a[0])) {
// a component found
$value = $this->query->getTableAlias($a[0]). '.' . $a[1];
}
}
} else {
// string literal found
}
return $value;
}
public function parseExists($where, $negation) { public function parseExists($where, $negation) {
$operator = ($negation) ? 'EXISTS' : 'NOT EXISTS'; $operator = ($negation) ? 'EXISTS' : 'NOT EXISTS';

9
lib/Doctrine/Relation/Association.php
View file

@ -61,10 +61,11 @@ class Doctrine_Relation_Association extends Doctrine_Relation {
public function getRelationDql($count, $context = 'record') { public function getRelationDql($count, $context = 'record') {
switch($context): switch($context):
case "record": case "record":
$sub = "SELECT ".$this->foreign. $sub = 'SQL:SELECT ' . $this->foreign.
" FROM ".$this->associationTable->getTableName(). ' FROM ' . $this->associationTable->getTableName().
" WHERE ".$this->local. ' WHERE ' . $this->local.
" IN (".substr(str_repeat("?, ", $count),0,-2).")"; ' IN (' . substr(str_repeat("?, ", $count),0,-2) .
')';
$dql = "FROM ".$this->table->getComponentName(); $dql = "FROM ".$this->table->getComponentName();
$dql .= ".".$this->associationTable->getComponentName(); $dql .= ".".$this->associationTable->getComponentName();

34
lib/Doctrine/Table.php
View file

@ -88,8 +88,8 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable {
* *
* so the full columns array might look something like the following: * so the full columns array might look something like the following:
* array( * array(
* 'name' => array('string', 20, array('notnull' => true, 'default' => 'someone') * 'name' => array('string', 20, array('notnull' => true, 'default' => 'someone')),
* 'age' => array('integer', 11, array('notnull' => true)) * 'age' => array('integer', 11, array('notnull' => true))
* ) * )
*/ */
protected $columns = array(); protected $columns = array();
@ -115,21 +115,21 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable {
*/ */
private $hasDefaultValues; private $hasDefaultValues;
/** /**
* @var array $options an array containing all options * @var array $options an array containing all options
* *
* -- name name of the component, for example component name of the GroupTable is 'Group' * -- name name of the component, for example component name of the GroupTable is 'Group'
* *
* -- tableName database table name, in most cases this is the same as component name but in some cases * -- tableName database table name, in most cases this is the same as component name but in some cases
* where one-table-multi-class inheritance is used this will be the name of the inherited table * where one-table-multi-class inheritance is used this will be the name of the inherited table
* *
* -- sequenceName Some databases need sequences instead of auto incrementation primary keys, * -- sequenceName Some databases need sequences instead of auto incrementation primary keys,
* you can set specific sequence for your table by calling setOption('sequenceName', $seqName) * you can set specific sequence for your table by calling setOption('sequenceName', $seqName)
* where $seqName is the name of the desired sequence * where $seqName is the name of the desired sequence
* *
* -- enumMap enum value arrays * -- enumMap enum value arrays
* *
* -- inheritanceMap inheritanceMap is used for inheritance mapping, keys representing columns and values * -- inheritanceMap inheritanceMap is used for inheritance mapping, keys representing columns and values
* the column values that should correspond to child classes * the column values that should correspond to child classes
*/ */
protected $options = array('name' => null, protected $options = array('name' => null,
'tableName' => null, 'tableName' => null,
@ -484,7 +484,7 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable {
public function getBoundForName($name, $component) { public function getBoundForName($name, $component) {
foreach($this->bound as $k => $bound) { foreach($this->bound as $k => $bound) {
$e = explode('.', $bound[0]); $e = explode('.', $bound[0]);
if($bound[3] == $name && $e[0] == $component) { if($bound[3] == $name && $e[0] == $component) {
return $this->bound[$k]; return $this->bound[$k];
} }
@ -873,7 +873,6 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable {
/** /**
* @param $id database row id * @param $id database row id
* @throws Doctrine_Find_Exception * @throws Doctrine_Find_Exception
* @return DAOProxy a proxy for given identifier
*/ */
final public function getProxy($id = null) { final public function getProxy($id = null) {
if($id !== null) { if($id !== null) {
@ -889,13 +888,6 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable {
} }
return $this->getRecord(); return $this->getRecord();
} }
/**
* getTableDescription
* @return array
*/
final public function getTableDescription() {
return $this->columns;
}
/** /**
* count * count
* *

21
tests/EnumTestCase.php
View file

@ -22,7 +22,7 @@ class Doctrine_EnumTestCase extends Doctrine_UnitTestCase {
try { try {
$query = new Doctrine_Query($this->connection); $query = new Doctrine_Query($this->connection);
$ret = $query->query('FROM EnumTest WHERE EnumTest.status = open'); $ret = $query->query("FROM EnumTest WHERE EnumTest.status = 'open'");
$this->assertEqual(count($ret), 1); $this->assertEqual(count($ret), 1);
} catch (Exception $e) { } catch (Exception $e) {
$this->fail(); $this->fail();
@ -32,7 +32,7 @@ class Doctrine_EnumTestCase extends Doctrine_UnitTestCase {
public function testInAndNotIn() { public function testInAndNotIn() {
try { try {
$query = new Doctrine_Query($this->connection); $query = new Doctrine_Query($this->connection);
$ret = $query->query('FROM EnumTest WHERE EnumTest.status IN (open)'); $ret = $query->query("FROM EnumTest WHERE EnumTest.status IN ('open')");
$this->assertEqual(count($ret), 1); $this->assertEqual(count($ret), 1);
} catch (Exception $e) { } catch (Exception $e) {
$this->fail(); $this->fail();
@ -40,18 +40,26 @@ class Doctrine_EnumTestCase extends Doctrine_UnitTestCase {
try { try {
$query = new Doctrine_Query($this->connection); $query = new Doctrine_Query($this->connection);
$ret = $query->query('FROM EnumTest WHERE EnumTest.status NOT IN (verified, closed)'); $ret = $query->query("FROM EnumTest WHERE EnumTest.status NOT IN ('verified', 'closed')");
$this->assertEqual(count($ret), 1); $this->assertEqual(count($ret), 1);
} catch (Exception $e) { } catch (Exception $e) {
$this->fail(); $this->fail();
} }
} }
public function testNotEqual() public function testExpressionComposition() {
{
try { try {
$query = new Doctrine_Query($this->connection); $query = new Doctrine_Query($this->connection);
$ret = $query->query('FROM EnumTest WHERE EnumTest.status != closed'); $ret = $query->query("FROM EnumTest e WHERE e.id > 0 AND (e.status != 'closed' OR e.status = 'verified')");
$this->assertEqual(count($ret), 1);
} catch (Exception $e) {
$this->fail();
}
}
public function testNotEqual() {
try {
$query = new Doctrine_Query($this->connection);
$ret = $query->query("FROM EnumTest WHERE EnumTest.status != 'closed'");
$this->assertEqual(count($ret), 1); $this->assertEqual(count($ret), 1);
} catch (Exception $e) { } catch (Exception $e) {
$this->fail(); $this->fail();
@ -119,5 +127,6 @@ class Doctrine_EnumTestCase extends Doctrine_UnitTestCase {
} }
$this->assertTrue($f); $this->assertTrue($f);
} }
} }
?> ?>

8
tests/run.php
View file

@ -54,6 +54,9 @@ require_once('BooleanTestCase.php');
require_once('EnumTestCase.php'); require_once('EnumTestCase.php');
require_once('DataDictSqliteTestCase.php'); require_once('DataDictSqliteTestCase.php');
require_once('DataDict/PgsqlTestCase.php');
require_once('CustomResultSetOrderTestCase.php'); require_once('CustomResultSetOrderTestCase.php');
error_reporting(E_ALL); error_reporting(E_ALL);
@ -61,6 +64,7 @@ print '<pre>';
$test = new GroupTest('Doctrine Framework Unit Tests'); $test = new GroupTest('Doctrine Framework Unit Tests');
$test->addTestCase(new Doctrine_DataDict_Pgsql_TestCase());
$test->addTestCase(new Doctrine_Relation_TestCase()); $test->addTestCase(new Doctrine_Relation_TestCase());
@ -124,8 +128,6 @@ $test->addTestCase(new Doctrine_CustomResultSetOrderTestCase());
$test->addTestCase(new Doctrine_BooleanTestCase()); $test->addTestCase(new Doctrine_BooleanTestCase());
$test->addTestCase(new Doctrine_EnumTestCase());
$test->addTestCase(new Doctrine_Record_Filter_TestCase()); $test->addTestCase(new Doctrine_Record_Filter_TestCase());
$test->addTestCase(new Doctrine_Query_Limit_TestCase()); $test->addTestCase(new Doctrine_Query_Limit_TestCase());
@ -149,6 +151,8 @@ $test->addTestCase(new Doctrine_Query_Delete_TestCase());
$test->addTestCase(new Doctrine_Query_Update_TestCase()); $test->addTestCase(new Doctrine_Query_Update_TestCase());
$test->addTestCase(new Doctrine_EnumTestCase());
//$test->addTestCase(new Doctrine_Cache_FileTestCase()); //$test->addTestCase(new Doctrine_Cache_FileTestCase());
//$test->addTestCase(new Doctrine_Cache_SqliteTestCase()); //$test->addTestCase(new Doctrine_Cache_SqliteTestCase());