Skip to content

Commit

Permalink
Revert "Avoid type quotation errors in value exists check"
Browse files Browse the repository at this point in the history
This reverts commit 6ce4b60.
  • Loading branch information
m-kuhn committed Oct 20, 2017
1 parent fc016ec commit 08443c2
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/core/qgsvectorlayerutils.cpp
Expand Up @@ -22,12 +22,12 @@ bool QgsVectorLayerUtils::valueExists( const QgsVectorLayer *layer, int fieldInd
if ( !layer )
return false;

const QgsFields fields = layer->fields();
QgsFields fields = layer->fields();

if ( fieldIndex < 0 || fieldIndex >= fields.count() )
return false;

const QgsField field = fields.at( fieldIndex );
QString fieldName = fields.at( fieldIndex ).name();

// build up an optimised feature request
QgsFeatureRequest request;
Expand All @@ -38,8 +38,8 @@ bool QgsVectorLayerUtils::valueExists( const QgsVectorLayer *layer, int fieldInd
int limit = ignoreIds.size() + 1;
request.setLimit( limit );

request.setFilterExpression( QStringLiteral( "%1=%2" ).arg( QgsExpression::quotedColumnRef( field.name() ),
QgsExpression::quotedValue( value, field.type() ) ) );
request.setFilterExpression( QStringLiteral( "%1=%2" ).arg( QgsExpression::quotedColumnRef( fieldName ),
QgsExpression::quotedValue( value ) ) );

QgsFeature feat;
QgsFeatureIterator it = layer->getFeatures( request );
Expand Down

0 comments on commit 08443c2

Please sign in to comment.