Add correlate parameter

* Add correlate parameter to select_correlated_expression function
This commit is contained in:
Konsta Vesterinen
2015-08-16 11:24:31 +03:00
parent e25865bed0
commit d97dfe4da4
3 changed files with 14 additions and 5 deletions

View File

@@ -4,6 +4,12 @@ Changelog
Here you can see the full list of changes between each SQLAlchemy-Utils release. Here you can see the full list of changes between each SQLAlchemy-Utils release.
0.30.17 (2015-08-16)
^^^^^^^^^^^^^^^^^^^^
- Added correlate parameter to select_correlated_expression function
0.30.16 (2015-08-04) 0.30.16 (2015-08-04)
^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^

View File

@@ -92,4 +92,4 @@ from .types import ( # noqa
WeekDaysType WeekDaysType
) )
__version__ = '0.30.16' __version__ = '0.30.17'

View File

@@ -89,7 +89,8 @@ def select_correlated_expression(
path, path,
leaf_model, leaf_model,
from_obj=None, from_obj=None,
order_by=None order_by=None,
correlate=True
): ):
relationships = list(reversed(path_to_relationships(path, root_model))) relationships = list(reversed(path_to_relationships(path, root_model)))
@@ -112,6 +113,8 @@ def select_correlated_expression(
query = query.select_from(join_expr.selectable) query = query.select_from(join_expr.selectable)
return query.correlate( if correlate:
from_obj if from_obj is not None else root_model query = query.correlate(
).where(condition) from_obj if from_obj is not None else root_model
)
return query.where(condition)