Project

General

Profile

« Previous | Next » 

Revision 1925e9f2

Added by Andreas Müller over 7 years ago

ref #5974 Fix synonymRelationship issues in vaadin

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmQueryFactory.java
173 173
        return generateQueryDelegate(SELECT_QUERY, COUNT_QUERY, CONTAINS_QUERY);
174 174
    }
175 175

  
176
    public static QueryDelegate generateSynonymofTaxonQuery(String name_id)  {
176
    public static QueryDelegate generateSynonymOfTaxonQuery(String name_id)  {
177 177
    	String FROM_QUERY = " FROM TaxonBase tb " +
178 178
    			"INNER JOIN TaxonNameBase tnb on tb.name_id=tnb.id " +
179
    			"INNER JOIN TaxonBase syn on tb.id = syn.acceptedTaxon_id "; //or s.id = ?
179
    			"INNER JOIN TaxonBase acc on tb.acceptedTaxon_id = acc.id "; //or s.id = ?
180 180
    	String SELECT_QUERY="SELECT tb.id as " + ID +
181 181
    			", tnb.titleCache as " + name_id +
182 182
    			FROM_QUERY;
183 183
    	String COUNT_QUERY = "SELECT count(*) " + FROM_QUERY;
184
    	String CONTAINS_QUERY = "SELECT * FROM TaxonBase syn WHERE syn.acceptedTaxon_id = ?"; //or s.id = ?
184
    	String CONTAINS_QUERY = "SELECT * FROM TaxonBase syn WHERE syn.id = ?"; //or s.id = ?
185 185

  
186 186
    	return generateQueryDelegate(SELECT_QUERY, COUNT_QUERY, CONTAINS_QUERY);
187 187
    }

Also available in: Unified diff