From cca642b0944c31d497a09fad63cd8d5ad1cfced7 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Sun, 20 Mar 2011 12:05:28 +0100
Subject: [PATCH] Remove CASE, COALESCSE, NULLIF EBNF rules for the time being,
 they are not yet supported.

---
 en/reference/dql-doctrine-query-language.rst | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/en/reference/dql-doctrine-query-language.rst b/en/reference/dql-doctrine-query-language.rst
index 93a36d0cb..cd9e6a97a 100644
--- a/en/reference/dql-doctrine-query-language.rst
+++ b/en/reference/dql-doctrine-query-language.rst
@@ -1457,18 +1457,7 @@ Scalar and Type Expressions
 .. code-block:: php
 
     ScalarExpression       ::= SimpleArithmeticExpression | StringPrimary | DateTimePrimary | StateFieldPathExpression
-                               BooleanPrimary | CaseExpression | EntityTypeExpression
-    CaseExpression         ::= GeneralCaseExpression | SimpleCaseExpression |
-                               CoalesceExpression | NullifExpression
-    GeneralCaseExpression  ::= "CASE" WhenClause {WhenClause}* "ELSE" ScalarExpression
-                               "END"
-    WhenClause             ::= "WHEN" ConditionalExpression "THEN" ScalarExpression
-    SimpleCaseExpression   ::= "CASE" CaseOperand SimpleWhenClause {SimpleWhenClause}*
-                               "ELSE" ScalarExpression "END"
-    CaseOperand            ::= StateFieldPathExpression | TypeDiscriminator
-    SimpleWhenClause       ::= "WHEN" ScalarExpression "THEN" ScalarExpression
-    CoalesceExpression     ::= "COALESCE" "(" ScalarExpression {"," ScalarExpression}* ")"
-    NullifExpression       ::= "NULLIF" "(" ScalarExpression "," ScalarExpression ")"
+                               BooleanPrimary | EntityTypeExpression
     StringExpression       ::= StringPrimary | "(" Subselect ")"
     StringPrimary          ::= StateFieldPathExpression | string | InputParameter | FunctionsReturningStrings | AggregateExpression
     BooleanExpression      ::= BooleanPrimary | "(" Subselect ")"
@@ -1478,6 +1467,10 @@ Scalar and Type Expressions
     DatetimeExpression     ::= DatetimePrimary | "(" Subselect ")"
     DatetimePrimary        ::= StateFieldPathExpression | InputParameter | FunctionsReturningDatetime | AggregateExpression
 
+.. note::
+
+    Parts of CASE expressions are not yet implemented.
+
 Aggregate Expressions
 ~~~~~~~~~~~~~~~~~~~~~