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

Refactored condition property

Browse Source
This commit is contained in:
Konsta Vesterinen
2013-08-26 18:05:50 +03:00
parent 3e24683324
commit 89be443a73
1 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
sqlalchemy_utils/functions/batch_fetch.py
View File

@@ -292,11 +292,15 @@ class Fetcher(object):
if self.path.populate_backrefs:
self.populate_backrefs(self.related_entities)
@property
def remote(self):
return self.path.model
@property
def condition(self):
names = self.remote_column_names
if len(names) == 1:
return getattr(self.path.model, names[0]).in_(
return getattr(self.remote, names[0]).in_(
value[0] for value in self.local_values_list
)
else:
@@ -305,10 +309,11 @@ class Fetcher(object):
conditions.append(
sa.and_(
*[
getattr(self.path.model, remote.name)
getattr(self.remote, remote.name)
==
getattr(entity, local.name)
for local, remote in self.prop.local_remote_pairs
if remote in self.remote_column_names
]
)
)
@@ -320,6 +325,10 @@ class Fetcher(object):
class ManyToManyFetcher(Fetcher):
@property
def remote(self):
return self.prop.secondary.c
@property
def remote_column_names(self):
names = []
@@ -331,31 +340,6 @@ class ManyToManyFetcher(Fetcher):
return names
@property
def condition(self):
if len(self.remote_column_names) == 1:
return (
getattr(self.prop.secondary.c, self.remote_column_names[0])
.in_(
[value[0] for value in self.local_values_list]
)
)
else:
conditions = []
for entity in self.path.entities:
conditions.append(
sa.and_(
*[
getattr(self.prop.secondary.c, remote.name)
==
getattr(entity, local.name)
for local, remote in self.prop.local_remote_pairs
if remote.name in self.remote_column_names
]
)
)
return sa.or_(*conditions)
@property
def related_entities(self):
return (