Fix query in get_reservations_for_resources

For PostgreSQL if you're using GROUP BY everything in the SELECT
list must be an aggregate SUM(...) or used in the GROUP BY.
For reference:
http://www.postgresql.org/message-id/200402271700.28133.dev@archonet.com
Closes-bug: #1486467

Change-Id: Ieb4ead5c785ff17f580bfbc58f370a491733d96d

diff --git a/neutron/db/quota/api.py b/neutron/db/quota/api.py
index 9657db07959fc1b6843e9a40228483438e96bc06..92394761b26b85eb7c7029b86ad2965fb3270e12 100644 (file)
--- a/neutron/db/quota/api.py
+++ b/neutron/db/quota/api.py
@@ -280,7 +280,8 @@ def get_reservations_for_resources(context, tenant_id, resources,
         quota_models.Reservation.tenant_id == tenant_id,
         quota_models.ResourceDelta.resource.in_(resources),
         exp_expr)).group_by(
-        quota_models.ResourceDelta.resource)
+        quota_models.ResourceDelta.resource,
+        quota_models.Reservation.expiration)
     return dict((resource, total_reserved)
            for (resource, exp, total_reserved) in resv_query)