Add batching flag to SQLAlchemyObjectType and ORMField
#2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Nabellaleen
reviewed
Jan 22, 2020
|
|
||
| if not _type: | ||
| batching_ = batching if is_selectin_available else False | ||
| connection_field_factory_ = connection_field_factory |
| **field_kwargs | ||
| ) | ||
| resolver = get_custom_resolver(obj_type, orm_field_name) | ||
| if resolver is None: |
There was a problem hiding this comment.
I don't find this syntax very readable. maybe something like that ?
Suggested change
| if resolver is None: | |
| if resolver is None and batching_: |
| ) | ||
| resolver = get_custom_resolver(obj_type, orm_field_name) | ||
| if resolver is None: | ||
| resolver = get_batch_resolver(relationship_prop) if batching_ else \ |
There was a problem hiding this comment.
Suggested change
| resolver = get_batch_resolver(relationship_prop) if batching_ else \ | |
| resolver = get_batch_resolver(relationship_prop) |
| resolver = get_custom_resolver(obj_type, orm_field_name) | ||
| if resolver is None: | ||
| resolver = get_batch_resolver(relationship_prop) if batching_ else \ | ||
| get_attr_resolver(obj_type, relationship_prop.key) |
There was a problem hiding this comment.
Suggested change
| get_attr_resolver(obj_type, relationship_prop.key) | |
| elif resolver is None: | |
| resolver = get_attr_resolver(obj_type, relationship_prop.key) |
Comment on lines
+70
to
+72
| if connection_field_factory_ is None: | ||
| connection_field_factory_ = BatchSQLAlchemyConnectionField.from_relationship if batching_ else \ | ||
| default_connection_field_factory |
Comment on lines
+158
to
177
| resolver = get_custom_resolver(obj_type, orm_field_name) or get_attr_resolver(obj_type, attr_name) | ||
|
|
||
| if isinstance(attr, ColumnProperty): | ||
| field = convert_sqlalchemy_column( | ||
| attr, | ||
| registry, | ||
| custom_resolver or _get_attr_resolver(obj_type, orm_field_name, attr_name), | ||
| **orm_field.kwargs | ||
| ) | ||
| field = convert_sqlalchemy_column(attr, registry, resolver, **orm_field.kwargs) | ||
| elif isinstance(attr, RelationshipProperty): | ||
| batching_ = orm_field.kwargs.pop('batching', batching) | ||
| field = convert_sqlalchemy_relationship( | ||
| attr, | ||
| registry, | ||
| connection_field_factory, | ||
| custom_resolver or _get_relationship_resolver(obj_type, attr, attr_name), | ||
| **orm_field.kwargs | ||
| ) | ||
| attr, obj_type, connection_field_factory, batching_, attr_name, | ||
| orm_field_name, **orm_field.kwargs) | ||
| elif isinstance(attr, CompositeProperty): | ||
| if attr_name != orm_field_name or orm_field.kwargs: | ||
| # TODO Add a way to override composite property fields | ||
| raise ValueError( | ||
| "ORMField kwargs for composite fields must be empty. " | ||
| "Field: {}.{}".format(obj_type.__name__, orm_field_name)) | ||
| field = convert_sqlalchemy_composite( | ||
| attr, | ||
| registry, | ||
| custom_resolver or _get_attr_resolver(obj_type, orm_field_name, attr_name), | ||
| ) | ||
| field = convert_sqlalchemy_composite(attr, registry, resolver) | ||
| elif isinstance(attr, hybrid_property): | ||
| field = convert_sqlalchemy_hybrid_method( | ||
| attr, | ||
| custom_resolver or _get_attr_resolver(obj_type, orm_field_name, attr_name), | ||
| **orm_field.kwargs | ||
| ) | ||
| field = convert_sqlalchemy_hybrid_method(attr, resolver, **orm_field.kwargs) | ||
| else: | ||
| raise Exception('Property type is not supported') # Should never happen |
|
@Nabellaleen Thanks for the review. Unfortunately, I have to close this one and send a new one in the |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Preview