Fix comparing the deltas with current data for some some datatypes, mostly dates and times #588
Conversation
This file contains 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
…ostly dates and times `QgsFeature.attribute()` will return an instance of `QDate`, `QTime` or `QDateTime`, depending on the attribute datatype. We need to explicitly handle such situations. Note geopackages does not support `time` fields, so this case is untested, but should follow the same logic as date/datetime.
…and lists the conflicts in the job output
…atch "sourcePk" in the delta"
suricactus
added
bug
suricactus
commented
Mar 19, 2023
Comment on lines
-1271
to
+1296
| if feature.attribute(attr) != delta_feature_attrs[attr]: | ||
| current_value = feature.attribute(attr) | ||
| incoming_value = delta_feature_attrs[attr] | ||
|
|
||
| # modify the incoming value to the desired type if needed | ||
| if incoming_value is not None: | ||
| if isinstance(current_value, QDateTime): | ||
| incoming_value = QDateTime.fromString( | ||
| incoming_value, Qt.ISODateWithMs | ||
| ) | ||
| elif isinstance(current_value, QDate): | ||
| incoming_value = QDate.fromString(incoming_value, Qt.ISODate) | ||
| elif isinstance(current_value, QTime): | ||
| incoming_value = QTime.fromString(incoming_value) | ||
|
|
||
| if current_value != incoming_value: | ||
| conflicts.append( | ||
| f'The attribute "{attr}" that has a conflict:\n-{delta_feature_attrs[attr]}\n+{feature.attribute(attr)}' | ||
| f'The attribute "{attr}" that has a conflict:\n-{current_value}\n+{incoming_value}' |
There was a problem hiding this comment.
@m-kuhn kind request for review. If I understand correctly, there are no more interesting return value types from QgsFeature.attribute(QString). Tried with binary and json, also checked QVariant docs, and seems everything else will be a datatype supported from JSON (as incoming_value is read from delta's JSON).
m-kuhn
approved these changes
Mar 20, 2023
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.
QgsFeature.attribute()will return an instance ofQDate,QTimeorQDateTime,depending on the attribute datatype. We need to explicitly handle such situations.
Note geopackages does not support
timefields, so this case is untested, but should follow the same logic as date/datetime.Fixes #572 .