From: <sc...@hy...> - 2008-03-04 04:44:18
|
Author: scottmf Date: 2008-03-03 20:44:14 -0800 (Mon, 03 Mar 2008) New Revision: 8023 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=8023 Modified: trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityDataDAO.java Log: remove delete cascade in Measurement.hbm and updated HQL query to work with postgres Modified: trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityDataDAO.java =================================================================== --- trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityDataDAO.java 2008-03-04 03:23:45 UTC (rev 8022) +++ trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityDataDAO.java 2008-03-04 04:44:14 UTC (rev 8023) @@ -218,7 +218,8 @@ .append(" OR rle.endtime > :startime)") .append(" AND (rle.availabilityDataId.startime < :endtime") .append(" OR rle.endtime < :endtime)") - .append(" GROUP BY rle.availabilityDataId.startime") + .append(" GROUP BY rle.availabilityDataId.startime,") + .append(" rle.endtime") .append(" ORDER BY rle.availabilityDataId.startime") .append(((descending) ? " DESC" : " ASC")).toString(); return getSession() |