Fix single/multi select DateTime filter#4495
Open
gabriel-bolbotina wants to merge 5 commits into
Open
Conversation
Coverage Report for CI Build 27557989684Warning No base build found for commit Coverage: 59.068%Details
Uncovered ChangesNo uncovered changes found. Coverage RegressionsRequires a base build to compare against. How to fix this → Coverage Stats
💛 - Coveralls |
📦 Build Artifacts Ready
|
Withalion
reviewed
May 18, 2026
Contributor
|
I have a bad feeling though that, if the user will use |
📦 Build Artifacts Ready
|
Modified logic to convert convert utc date time
Added constant for timestamp with no milliseconds
gabriel-bolbotina
force-pushed
the
fix-filtering-dateTime-singleMulti-select
branch
from
bed2d9c to
429d49c
Compare
📦 Build Artifacts Ready
|
Withalion
approved these changes
Jun 5, 2026
tomasMizera
reviewed
Jun 5, 2026
tomasMizera
left a comment
tomasMizera
left a comment
Collaborator
There was a problem hiding this comment.
Can we add unit tests here?
Added helper methods to testUtils Changed single/ multi select filter to support IS NULL
📦 Build Artifacts Ready
|
Withalion
reviewed
Jun 17, 2026
Withalion
left a comment
Withalion
left a comment
Contributor
There was a problem hiding this comment.
The tests look okay in general, let's just improve the approach.
| QStringList expressions; | ||
| QString expressionTemplate( expressionCopy ); | ||
| expressionTemplate.replace( QStringLiteral( "@@value@@" ), QStringLiteral( "NULL" ) ); | ||
| expressionTemplate.replace( QStringLiteral( "= NULL" ), QStringLiteral( "IS NULL" ) ); |
Contributor
There was a problem hiding this comment.
if there was no change in plugin then the sql query should be column IS value. Did something change in the meantime?
| if ( QgsVariantUtils::isNull( value ) ) | ||
| { | ||
| expressionTemplate.replace( QStringLiteral( "@@value@@" ), QStringLiteral( "NULL" ) ); | ||
| expressionTemplate.replace( QStringLiteral( "= NULL" ), QStringLiteral( "IS NULL" ) ); |
Comment on lines
+27
to
+47
| void testDateRange_dateTime(); | ||
| void testDateRange_date(); | ||
| void testDateRange_dateTime_null(); // invalid bounds fall back to min/max sentinels | ||
| void testDateRange_date_null(); // invalid bounds fall back to min/max sentinels | ||
| void testDateRange_dateTime_featureAtLowerBound(); // >= is inclusive: feature exactly at from-bound is counted | ||
| void testDateRange_dateTime_midnightLowerBound(); // from=midnight; midnight feature is at the inclusive lower bound | ||
| void testDateRange_dateTime_zeroMsInsideRange(); // 0 ms feature inside range: range uses >= / <=, no double-expr needed | ||
|
|
||
| // Single select | ||
| void testSingleSelect_dateTime_nonZeroMs(); | ||
| void testSingleSelect_dateTime_zeroMs(); // edge case: 0 ms | ||
| void testSingleSelect_dateTime_null(); // null -> NULL OR '' | ||
| void testSingleSelect_date(); | ||
|
|
||
| // Multi select | ||
| void testMultiSelect_dateTime_nonZeroMs(); | ||
| void testMultiSelect_dateTime_zeroMs(); // edge case: 0 ms | ||
| void testMultiSelect_dateTime_mixed(); // mix of 0 ms and non-zero ms values | ||
| void testMultiSelect_dateTime_null(); // null -> NULL OR '' | ||
| void testMultiSelect_dateTime_empty(); // empty list -> no subset string | ||
| void testMultiSelect_date(); |
Contributor
There was a problem hiding this comment.
use camelCase or PascalCase, which is used in the rest of repo
Comment on lines
+70
to
+85
|
|
||
| //! Creates an in-memory layer with a single field of the given type and registers it in QgsProject::instance() | ||
| //! fieldType is the QGIS memory-provider type string: "datetime", "date", "string", "integer", "double", "bool", etc. | ||
| QgsVectorLayer *createFilterTestLayer( const QString &fieldName, | ||
| const QString &fieldType, | ||
| const QString &layerName = QStringLiteral( "FilterTestLayer" ) ); | ||
|
|
||
| //! Appends a single feature to layer via the data provider; value is stored in the named field. Returns false if addFeatures() fails. | ||
| bool addFeatureToLayer( QgsVectorLayer *layer, const QString &fieldName, const QVariant &value ); | ||
|
|
||
| //! Writes a single-filter config into the project and loads it; returns the assigned filterId | ||
| QString setupControllerWithFilter( FilterController *controller, | ||
| FieldFilter::FilterType filterType, | ||
| const QString &layerId, | ||
| const QString &fieldName, | ||
| const QString &sqlExpression ); |
Contributor
There was a problem hiding this comment.
Instead of doing this in the code create a QGIS project, which will have filters, layers, features already setup. That should also mitigate the filter definition duplication in testfiltercontroller.cpp. Place the project in test/test_data/ and load it before running the tests
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
GeoPackage can store DateTime as UTC with or without milliseconds.
The original code assumed that the DateTime entry for Single/Multi select contained milliseconds, which is not always the case if a point is added in QGIS compared to one saved with the mobile app.
Fix: check if the value contains milliseconds and change the format when creating the filter