From 189c729f15d2fafecf92662cad9553c2ec3dccd7 Mon Sep 17 00:00:00 2001
From: Guilherme Blanco <guilhermeblanco@gmail.com>
Date: Mon, 8 Aug 2011 02:08:19 -0300
Subject: [PATCH] Added support to CaseExpression.

---
 en/reference/dql-doctrine-query-language.rst | 21 +++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/en/reference/dql-doctrine-query-language.rst b/en/reference/dql-doctrine-query-language.rst
index bd32720d1..955f7ee1c 100644
--- a/en/reference/dql-doctrine-query-language.rst
+++ b/en/reference/dql-doctrine-query-language.rst
@@ -1469,6 +1469,7 @@ Conditional Expressions
                                     InExpression | NullComparisonExpression | ExistsExpression |
                                     EmptyCollectionComparisonExpression | CollectionMemberExpression
 
+
 Collection Expressions
 ~~~~~~~~~~~~~~~~~~~~~~
 
@@ -1505,7 +1506,7 @@ Arithmetic Expressions
     ArithmeticFactor           ::= [("+" | "-")] ArithmeticPrimary
     ArithmeticPrimary          ::= SingleValuedPathExpression | Literal | "(" SimpleArithmeticExpression ")"
                                    | FunctionsReturningNumerics | AggregateExpression | FunctionsReturningStrings
-                                   | FunctionsReturningDatetime | IdentificationVariable | InputParameter
+                                   | FunctionsReturningDatetime | IdentificationVariable | InputParameter | CaseExpression
 
 Scalar and Type Expressions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1513,9 +1514,9 @@ Scalar and Type Expressions
 .. code-block:: php
 
     ScalarExpression       ::= SimpleArithmeticExpression | StringPrimary | DateTimePrimary | StateFieldPathExpression
-                               BooleanPrimary | EntityTypeExpression
+                               BooleanPrimary | EntityTypeExpression | CaseExpression
     StringExpression       ::= StringPrimary | "(" Subselect ")"
-    StringPrimary          ::= StateFieldPathExpression | string | InputParameter | FunctionsReturningStrings | AggregateExpression
+    StringPrimary          ::= StateFieldPathExpression | string | InputParameter | FunctionsReturningStrings | AggregateExpression | CaseExpression
     BooleanExpression      ::= BooleanPrimary | "(" Subselect ")"
     BooleanPrimary         ::= StateFieldPathExpression | boolean | InputParameter
     EntityExpression       ::= SingleValuedAssociationPathExpression | SimpleEntityExpression
@@ -1535,6 +1536,20 @@ Aggregate Expressions
     AggregateExpression ::= ("AVG" | "MAX" | "MIN" | "SUM") "(" ["DISTINCT"] StateFieldPathExpression ")" |
                             "COUNT" "(" ["DISTINCT"] (IdentificationVariable | SingleValuedPathExpression) ")"
 
+Case Expressions
+~~~~~~~~~~~~~~~~
+
+.. code-block:: php
+
+    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 ")"
+
 Other Expressions
 ~~~~~~~~~~~~~~~~~