[Andromdaplugins-cvs] CVS update: cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades EJB3FinderMethodFacadeLogicImpl.java

[Vance K. <va...@us...>]

  User: vancek  
  Date: 06/01/25 20:38:47

  Modified:    andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
                        EJB3FinderMethodFacadeLogicImpl.java
  Log:
  moved WHERE statement in getQuery method to avoid being included if there is no where clause
  
  Revision  Changes    Path
  1.3       +5 -3      cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3FinderMethodFacadeLogicImpl.java
  
  Index: EJB3FinderMethodFacadeLogicImpl.java
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3FinderMethodFacadeLogicImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -w -r1.2 -r1.3
  --- EJB3FinderMethodFacadeLogicImpl.java	25 Jan 2006 03:02:13 -0000	1.2
  +++ EJB3FinderMethodFacadeLogicImpl.java	26 Jan 2006 04:38:47 -0000	1.3
  @@ -62,17 +62,19 @@
               queryString = "FROM " + this.getOwner().getName() + " AS " + variableName;
               if (this.getArguments().size() > 0)
               {
  -                queryString = queryString + " WHERE";
  -                Collection parameters = this.getArguments();
  +                final Collection parameters = this.getArguments();
                   if (parameters != null && !parameters.isEmpty())
                   {
                       Iterator parameterIt = parameters.iterator();
                       for (int ctr = 0; parameterIt.hasNext(); ctr++)
                       {
                           EJB3FinderMethodArgumentFacade param = (EJB3FinderMethodArgumentFacade)parameterIt.next();
  -                        
                           if (!param.isFirstResult() && !param.isMaxResults()) 
                           {
  +                            if (ctr == 0)
  +                            {
  +                                queryString = queryString + " WHERE";
  +                            }
                               String parameter = "?";
                               if (this.isUseNamedParameters()) 
                               {