RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-13 06:46:03 +03:00
Code Issues Projects Releases Wiki Activity

Reverted some BNF changes

Browse Source
This commit is contained in:
romanb 2009-01-19 19:24:40 +00:00
parent 602c6d973e
commit d1cd35d395
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
query-language.txt
View File

@ -168,19 +168,17 @@ ConditionalExpression ::= ConditionalTerm {"OR" ConditionalTerm}*
ConditionalTerm ::= ConditionalFactor {"AND" ConditionalFactor}*
ConditionalFactor ::= ["NOT"] ConditionalPrimary
ConditionalPrimary ::= SimpleConditionalExpression | "(" ConditionalExpression ")"
SimpleConditionalExpression ::= ExistsExpression |
(SimpleStateFieldPathExpression (ComparisonExpression | BetweenExpression | LikeExpression |
InExpression | NullComparisonExpression)) |
(CollectionValuedPathExpression EmptyCollectionComparisonExpression) |
(EntityExpression CollectionMemberExpression)
SimpleConditionalExpression ::= ComparisonExpression | BetweenExpression | LikeExpression |
InExpression | NullComparisonExpression | ExistsExpression |
EmptyCollectionComparisonExpression | CollectionMemberExpression
/* EmptyCollectionComparisonExpression and CollectionMemberExpression are for the future */
/*
* COLLECTION EXPRESSIONS (FOR THE FUTURE)
*/
EmptyCollectionComparisonExpression ::= "IS" ["NOT"] "EMPTY"
CollectionMemberExpression ::= ["NOT"] "MEMBER" ["OF"] CollectionValuedPathExpression
EmptyCollectionComparisonExpression ::= CollectionValuedPathExpression "IS" ["NOT"] "EMPTY"
CollectionMemberExpression ::= EntityExpression ["NOT"] "MEMBER" ["OF"] CollectionValuedPathExpression
/*

4
tests/Orm/Query/SelectSqlGenerationTest.php
View File

@ -109,14 +109,14 @@ class Orm_Query_SelectSqlGenerationTest extends Doctrine_OrmTestCase
);
}
/* public function testWhereClauseInSelect()
public function testWhereClauseInSelect()
{
$this->assertSqlGeneration(
'select u from ForumUser u where u.id = ?',
'SELECT fu.id AS fu__id, fu.username AS fu__username FROM ForumUser fu WHERE fu.id = ?'
);
}
*/
/* public function testAggregateFunctionWithDistinctInSelect()
{
$this->assertSqlGeneration(