Project

General

Profile

« Previous | Next » 

Revision 47936c60

Added by Andreas Müller over 7 years ago

ref #5974 remove synonym relationship and other model changes

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmQueryFactory.java
75 75
                ", tb.uuid as " + UUID_ID +
76 76
                ", tnb.titleCache as " + name_id +
77 77
                ", tb.publish as " + pb_id +
78
                ", tb.unplaced as " + unp_id +
78
                ", tn.unplaced as " + unp_id +
79 79
                ", dtb.titleCache as " + rank_id +
80
                ", (SELECT COUNT(*) FROM  Synonym s WHERE tb.id = s.acceptedTaxon_id) as " + has_syn_id +
80
                ", (SELECT COUNT(*) FROM TaxonBase syn WHERE tb.id = syn.acceptedTaxon_id) as " + has_syn_id +
81 81
                FROM_QUERY;
82 82
        String COUNT_QUERY = "SELECT count(*) " + FROM_QUERY;
83 83
        String CONTAINS_QUERY = "SELECT * FROM TaxonBase tb WHERE tb.id = ?";
......
176 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 Synonym s on tb.id = s.acceptedTaxon_id "; //or s.id = ?
179
    			"INNER JOIN TaxonBase syn on tb.id = syn.acceptedTaxon_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 Synonym s WHERE s.acceptedTaxon_id = ?"; //or s.id = ?
184
    	String CONTAINS_QUERY = "SELECT * FROM TaxonBase syn WHERE syn.acceptedTaxon_id = ?"; //or s.id = ?
185 185

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

Also available in: Unified diff