[Andromda-cvs] CVS update: translation-libraries/andromda-query/src/translations/query EJB-QL.vsl

[Chad B. <cwb...@us...>]

  User: cwbrandon
  Date: 05/01/08 12:16:44

  Modified:    andromda-query/src/test/translations/query
                        TranslationTest-EJB-QL.xml
               andromda-query/src/translations/query EJB-QL.vsl
  Log:
  update the EJB-QL expression to also work with grouping
  
  Revision  Changes    Path
  1.6       +23 -0     translation-libraries/andromda-query/src/test/translations/query/TranslationTest-EJB-QL.xml
  
  Index: TranslationTest-EJB-QL.xml
  ===================================================================
  RCS file: /cvsroot/andromda/translation-libraries/andromda-query/src/test/translations/query/TranslationTest-EJB-QL.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -w -r1.5 -r1.6
  --- TranslationTest-EJB-QL.xml	4 Jan 2005 06:02:27 -0000	1.5
  +++ TranslationTest-EJB-QL.xml	8 Jan 2005 20:16:43 -0000	1.6
  @@ -163,4 +163,27 @@
   			AND legalAgreement.agreementTypePk = ?2
   		</to>
   	</expression>
  +    
  +    <expression>
  +        <from>
  +            <![CDATA[
  +            context MedicalCertificate::findInvalidByPerson(personId:Long,date:Date):Collection(MedicalCertificate) 
  +            body findInvalidByPerson : 
  +                allInstances() -> select( certificate | 
  +                   certificate.person.id = personId 
  +                   and (certificate.validityStart > date or certificate.validityEnd < date)
  +                   or (certificate.validityStart = certificate.validityEnd)) 
  +            ]]>
  +        </from>
  +        <to>
  +            <![CDATA[
  +            SELECT DISTINCT OBJECT(certificate) 
  +			FROM MedicalCertificate certificate
  +			WHERE certificate.person.id = ?1 
  +			AND (certificate.validityStart > ?2 OR certificate.validityEnd < ?2)
  +            OR (certificate.validityStart = certificate.validityEnd)   
  +            ]]>          
  +        </to> 
  +    </expression>
  +    
   </translation-test>
  
  
  
  1.5       +8 -8      translation-libraries/andromda-query/src/translations/query/EJB-QL.vsl
  
  Index: EJB-QL.vsl
  ===================================================================
  RCS file: /cvsroot/andromda/translation-libraries/andromda-query/src/translations/query/EJB-QL.vsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -r1.4 -r1.5
  --- EJB-QL.vsl	8 Jan 2005 17:06:19 -0000	1.4
  +++ EJB-QL.vsl	8 Jan 2005 20:16:44 -0000	1.5
  @@ -73,7 +73,7 @@
   

           <!-- if 'and' is encountered in the expression then

                'and' will just be returned -->

  -        <fragment name="and\s*${navigableName}\s*.*"

  +        <fragment name="and.*"

                     handlerMethod="handleLogicalExpression">

               <kind name="body">

                   AND

  @@ -82,49 +82,49 @@
   

           <!-- if 'or' is encountered in the expression then

                'or' will just be returned -->

  -        <fragment name="or\s*${navigableName}\s*.*"

  +        <fragment name="or.*"

                     handlerMethod="handleLogicalExpression">

               <kind name="body">

                   OR

               </kind>

           </fragment>

   

  -        <fragment name="=\s*${navigableName}"

  +        <fragment name="=.*"

                     handlerMethod="handleRelationalExpression">

               <kind name="body">

                   {0} = {1}

               </kind>

           </fragment>

   

  -        <fragment name="&gt;\s*${navigableName}"

  +        <fragment name="&gt;.*"

                     handlerMethod="handleRelationalExpression">

               <kind name="body">

                   {0} &gt; {1}

               </kind>

           </fragment>

   

  -        <fragment name="&lt;\s*${navigableName}"

  +        <fragment name="&lt;.*"

                     handlerMethod="handleRelationalExpression">

               <kind name="body">

                   {0} &lt; {1}

               </kind>

           </fragment>

   

  -        <fragment name="&lt;&gt;\s*${navigableName}"

  +        <fragment name="&lt;&gt;.*"

                     handlerMethod="handleRelationalExpression">

               <kind name="body">

                   {0} not {1}

               </kind>

           </fragment>

   

  -        <fragment name="&gt;=\s*${navigableName}"

  +        <fragment name="&gt;=.*"

                     handlerMethod="handleRelationalExpression">

               <kind name="body">

                   {0} &gt;= {1}

               </kind>

           </fragment>

   

  -        <fragment name="&lt;=\s*${navigableName}"

  +        <fragment name="&lt;=.*"

                     handlerMethod="handleRelationalExpression">

               <kind name="body">

                   {0} &lt;= {1}