Skip to content

Commit

Permalink
Also fix quotedValue in OGR, Oracle, Spatialite compilers
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Jan 18, 2016
1 parent ed54e3c commit 1e3172e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
3 changes: 2 additions & 1 deletion src/providers/ogr/qgsogrexpressioncompiler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ QString QgsOgrExpressionCompiler::quotedIdentifier( const QString& identifier )
return mSource->mProvider->quotedIdentifier( identifier.toUtf8() );
}

QString QgsOgrExpressionCompiler::quotedValue( const QVariant& value, bool& )
QString QgsOgrExpressionCompiler::quotedValue( const QVariant& value, bool& ok )
{
ok = true;
return QgsOgrUtils::quotedValue( value );
}
3 changes: 2 additions & 1 deletion src/providers/oracle/qgsoracleexpressioncompiler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ QString QgsOracleExpressionCompiler::quotedIdentifier( const QString& identifier
return QgsOracleConn::quotedIdentifier( identifier );
}

QString QgsOracleExpressionCompiler::quotedValue( const QVariant& value, bool& )
QString QgsOracleExpressionCompiler::quotedValue( const QVariant& value, bool& ok )
{
ok = true;
return QgsOracleConn::quotedValue( value );
}
4 changes: 3 additions & 1 deletion src/providers/spatialite/qgsspatialiteexpressioncompiler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,10 @@ QString QgsSpatiaLiteExpressionCompiler::quotedIdentifier( const QString& identi
return QgsSpatiaLiteProvider::quotedIdentifier( identifier );
}

QString QgsSpatiaLiteExpressionCompiler::quotedValue( const QVariant& value, bool& )
QString QgsSpatiaLiteExpressionCompiler::quotedValue( const QVariant& value, bool& ok )
{
ok = true;

if ( value.isNull() )
return "NULL";

Expand Down

0 comments on commit 1e3172e

Please sign in to comment.