fix incorrect GenericRelation joining #130
Conversation
.github/workflows/test-python.yml
Outdated
| repository: 'wavev/django' | ||
| ref: 'add-support-join-extra-conditions' |
There was a problem hiding this comment.
I imagine this should be reverted
django_mongodb/fields/object_id.py
Outdated
| @@ -0,0 +1,30 @@ | |||
| from bson import ObjectId, errors | |||
There was a problem hiding this comment.
is this file a required part of the change?
There was a problem hiding this comment.
This new field was used in the django library when a new model is created, not here. But we will handle those fields as string for now, so this field is not longer needed.
django_mongodb/query.py
Outdated
| columns = [] | ||
| for expr in extra.leaves(): | ||
| if hasattr(expr, "lhs") and isinstance(expr.lhs, Col): | ||
| columns.append((expr.lhs, len(lhs_fields))) |
There was a problem hiding this comment.
To confirm, we use len(lhs_fields) because expr.lhs will now be the newest column index, thus equal to len(lhs_fields)?
django_mongodb/query.py
Outdated
| columns.append((expr.lhs, len(lhs_fields))) | ||
| lhs_fields.append(expr.lhs.as_mql(compiler, connection)) | ||
| if hasattr(expr, "rhs") and isinstance(expr.rhs, Col): | ||
| columns.append((expr.rhs, None)) |
There was a problem hiding this comment.
Why does rhs not get the same as lhs. Can it not be referenced by number still?
There was a problem hiding this comment.
You are right, it should be the same.
django_mongodb/query.py
Outdated
| column_target.alias = compiler.collection_name | ||
| else: | ||
| column_target.target.db_column = f"{parent_template}{parent_pos}" | ||
| column_target.target.set_attributes_from_name(f"{parent_template}{len(lhs_fields)}") |
There was a problem hiding this comment.
why do we need to use len(lhs_fields) instead of parent_pos
WaVEV
force-pushed
the
add-support-join-extra-conditions
branch
4 times, most recently
from
5bc356b to
ac054a7
Compare
WaVEV
force-pushed
the
add-support-join-extra-conditions
branch
from
ac054a7 to
e1042f5
Compare
By adding support for Field.get_extra_restriction().
timgraham
force-pushed
the
add-support-join-extra-conditions
branch
from
e52293a to
78a8619
Compare
timgraham
changed the title
By adding support for Field.get_extra_restriction().