svn commit: r1529346 - in /openmeetings/trunk/singlewebapp/src: db/java/org/apache/openmeetings/db/dao/label/ db/java/org/apache/openmeetings/db/entity/label/ test/java/org/apache/openmeetings/test/labels/

[sebawagner]

Author: sebawagner
Date: Fri Oct  4 23:27:06 2013
New Revision: 1529346

URL: http://svn.apache.org/r1529346
Log:
Fixes Issue in JPQL query (basically I just removed the where clause that 
filters the fieldvalues, I do not see any functional requirement for that where 
clause, seemed to be a optimization to load less records from the database)

Modified:
    
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/label/FieldValueDao.java
    
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/label/Fieldvalues.java
    
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/TestGetFieldValues.java

Modified: 
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/label/FieldValueDao.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/label/FieldValueDao.java?rev=1529346&r1=1529345&r2=1529346&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/label/FieldValueDao.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/label/FieldValueDao.java
 Fri Oct  4 23:27:06 2013
@@ -52,13 +52,8 @@ public class FieldValueDao implements ID
        }
        
        public Fieldvalues get(long id) {
-               return get(getDefaultLanguage(), id);
-       }
-
-       public Fieldvalues get(Long language_id, long id) {
                TypedQuery<Fieldvalues> q = 
em.createNamedQuery("getFieldByIdAndLanguage", Fieldvalues.class);
                q.setParameter("id", id);
-               q.setParameter("lang", language_id);
                List<Fieldvalues> l = q.getResultList();
                return l == null || l.isEmpty() ? null : l.get(0);
        }

Modified: 
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/label/Fieldvalues.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/label/Fieldvalues.java?rev=1529346&r1=1529345&r2=1529346&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/label/Fieldvalues.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/label/Fieldvalues.java
 Fri Oct  4 23:27:06 2013
@@ -39,8 +39,8 @@ import org.apache.openmeetings.db.entity
 @NamedQueries({
        @NamedQuery(name = "getFieldCount", query = "SELECT COUNT(fv) FROM 
Fieldvalues fv WHERE fv.deleted = false ")
        , @NamedQuery(name = "getFieldByIdAndLanguage", query = "SELECT fv FROM 
Fieldvalues fv " +
-               "LEFT OUTER JOIN FETCH fv.fieldlanguagesvalues flv WHERE " +
-               "       fv.fieldvalues_id = :id AND fv.deleted = false AND 
flv.language_id = :lang")
+               "LEFT OUTER JOIN FETCH fv.fieldlanguagesvalues WHERE " +
+               "fv.fieldvalues_id = :id AND fv.deleted = false")
        , @NamedQuery(name = "getFieldByLanguage", query = "SELECT fv FROM 
Fieldvalues fv WHERE fv.deleted = false") //FIXME no language yet
 })
 @Table(name = "fieldvalues")

Modified: 
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/TestGetFieldValues.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/TestGetFieldValues.java?rev=1529346&r1=1529345&r2=1529346&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/TestGetFieldValues.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/TestGetFieldValues.java
 Fri Oct  4 23:27:06 2013
@@ -38,7 +38,7 @@ public class TestGetFieldValues extends 
 
        @Test
        public void testCount() throws Exception {
-               Fieldvalues fv = fieldValueDao.get(1L, 1L);
+               Fieldvalues fv = fieldValueDao.get(1L);
                
                assertTrue("Fieldvalues should not be null", (fv != null));
        }