openstack/deb-python-sqlalchemy-utils
Code Issues Proposed changes

Refactor aggregates

Browse Source
This commit is contained in:
Konsta Vesterinen
2014-01-04 03:07:38 +02:00
parent 9f6f1f98d1
commit 4a916e5fab
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
sqlalchemy_utils/aggregates.py
View File

@@ -331,7 +331,7 @@ class AggregatedValue(object):
if len(self.relationships) == 1: if len(self.relationships) == 1:
remote_pairs = self.relationships[-1].property.local_remote_pairs remote_pairs = self.relationships[-1].property.local_remote_pairs
query = query.where( return query.where(
remote_pairs[0][0].in_( remote_pairs[0][0].in_(
getattr(obj, remote_pairs[0][1].key) for obj in objects getattr(obj, remote_pairs[0][1].key) for obj in objects
) )
@@ -352,29 +352,31 @@ class AggregatedValue(object):
local = remote_pairs[0][0] local = remote_pairs[0][0]
remote = remote_pairs[0][1] remote = remote_pairs[0][1]
return query.where(
from_ = property_.mapper.class_.__table__
for relationship in reversed(self.relationships[1:-1]):
property_ = relationship.property
from_ = (
from_.join(property_.mapper.class_, property_.primaryjoin)
)
property_ = self.relationships[0].property
query = query.where(
local.in_( local.in_(
sa.select( sa.select(
[remote], [remote],
from_obj=[from_] from_obj=[self.multi_level_aggregate_query_base]
).where( ).where(
self.local_condition(property_, objects) self.local_condition(
self.relationships[0].property,
objects
)
) )
) )
) )
return query @property
def multi_level_aggregate_query_base(self):
property_ = self.relationships[-1].property
from_ = property_.mapper.class_.__table__
for relationship in reversed(self.relationships[1:-1]):
property_ = relationship.property
from_ = (
from_.join(property_.mapper.class_, property_.primaryjoin)
)
return from_
def local_condition(self, prop, objects): def local_condition(self, prop, objects):
return prop.local_remote_pairs[0][0].in_( return prop.local_remote_pairs[0][0].in_(