add support for QuerySet.union() #120
Conversation
|
Once this code is merged, we should change the: |
WaVEV
force-pushed
the
support-union
branch
3 times, most recently
from
5acdf8e to
70c2b20
Compare
django_mongodb/compiler.py
Outdated
| if "_id" not in projected_fields: | ||
| combinator_pipeline.append({"$unset": "_id"}) | ||
| else: | ||
| raise NotSupportedError(f"Combinator {self.query.combinator} isn't supported.") |
There was a problem hiding this comment.
Isn't this already checked by supports_select_{self.query.combinator}?
There was a problem hiding this comment.
Yes, when I wrote this code I had in mind the other combinators. But yes, it is being checked twice.
django_mongodb/query.py
Outdated
| @@ -166,6 +169,10 @@ def join(self, compiler, connection): | |||
| return lookup_pipeline | |||
|
|
|||
|
|
|||
| def orderby(self, compiler, connection): | |||
There was a problem hiding this comment.
order_by (follows the pattern of other function names with multiple words)
django_mongodb/compiler.py
Outdated
| @@ -391,6 +398,9 @@ def project_field(column): | |||
| if hasattr(column, "target"): | |||
| # column is a Col. | |||
| target = column.target.column | |||
| # Handle Order by columns as refs columns. | |||
django_mongodb/compiler.py
Outdated
| parts.append((compiler_.build_query(columns), compiler_.collection_name)) | ||
|
|
||
| except EmptyResultSet: | ||
| # Omit the empty queryset with UNION and with DIFFERENCE if the |
There was a problem hiding this comment.
chop "and with DIFFERENCE"
django_mongodb/compiler.py
Outdated
| _, exprs = zip(*columns, strict=True) | ||
| columns = tuple(zip(main_query_fields, exprs, strict=True)) | ||
| parts.append((compiler_.build_query(columns), compiler_.collection_name)) | ||
|
|
django_mongodb/compiler.py
Outdated
| @@ -32,6 +32,33 @@ def __init__(self, *args, **kwargs): | |||
| # A list of OrderBy objects for this query. | |||
| self.order_by_objs = None | |||
|
|
|||
| def _unfold_column(self, col): | |||
| """ | |||
| Flattens a field by returning its target or by replacing dots with GROUP_SEPARATOR | |||
There was a problem hiding this comment.
PEP 257 verb style: Flatten
There was a problem hiding this comment.
Cool wow, I didn't know about that.
django_mongodb/compiler.py
Outdated
|
|
||
| def _fold_columns(self, unfold_columns): | ||
| """ | ||
| Converts flat columns into a nested dictionary, grouping fields by table names. |
django_mongodb/features.py
Outdated
| @@ -512,6 +517,7 @@ def django_test_expected_failures(self): | |||
| "delete.tests.DeletionTests.test_only_referenced_fields_selected", | |||
| "lookup.tests.LookupTests.test_in_ignore_none", | |||
| "lookup.tests.LookupTests.test_textfield_exact_null", | |||
| "queries.test_qs_combinators.QuerySetSetOperationTests.test_exists_union", | |||
There was a problem hiding this comment.
This test seems useful except for the SQL introspection part, so I comment out the unneeded lines in the latest commit on the Django fork.
WaVEV
force-pushed
the
support-union
branch
2 times, most recently
from
b68183f to
fee311a
Compare
Done in #123 |
timgraham
force-pushed
the
support-union
branch
from
fee311a to
df2cddd
Compare
fixes #72