Skip to content

Commit

Permalink
[oracle] Fix clazy warnings in iterator
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Apr 16, 2018
1 parent bd5b771 commit 99a2025
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 38 deletions.
4 changes: 2 additions & 2 deletions src/core/qgssqlexpressioncompiler.cpp
View file
Expand Up @@ -61,7 +61,7 @@ QString QgsSqlExpressionCompiler::quotedValue( const QVariant &value, bool &ok )
return value.toString();

case QVariant::Bool:
return value.toBool() ? "TRUE" : "FALSE";
return value.toBool() ? QStringLiteral( "TRUE" ) : QStringLiteral( "FALSE" );

default:
case QVariant::String:
Expand Down Expand Up @@ -344,7 +344,7 @@ QgsSqlExpressionCompiler::Result QgsSqlExpressionCompiler::compileNode( const Qg
if ( rn != Complete && rn != Partial )
return rn;

result = QStringLiteral( "%1 %2IN (%3)" ).arg( nd, n->isNotIn() ? "NOT " : "", list.join( QStringLiteral( "," ) ) );
result = QStringLiteral( "%1 %2IN (%3)" ).arg( nd, n->isNotIn() ? QStringLiteral( "NOT " ) : QString(), list.join( ',' ) );
return ( inResult == Partial || rn == Partial ) ? Partial : Complete;
}

Expand Down
69 changes: 34 additions & 35 deletions src/providers/oracle/qgsoraclefeatureiterator.cpp
View file
Expand Up @@ -109,7 +109,7 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource *sour
")" );

whereClause = QStringLiteral( "sdo_filter(%1,%2)='TRUE'" )
.arg( QgsOracleProvider::quotedIdentifier( mSource->mGeometryColumn ) ).arg( bbox );
.arg( QgsOracleProvider::quotedIdentifier( mSource->mGeometryColumn ), bbox );

args << ( mSource->mSrid < 1 ? QVariant( QVariant::Int ) : mSource->mSrid ) << mFilterRect.xMinimum() << mFilterRect.yMinimum() << mFilterRect.xMaximum() << mFilterRect.yMaximum();

Expand All @@ -118,9 +118,9 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource *sour
// sdo_relate requires Spatial
if ( mConnection->hasSpatial() )
{
whereClause += QString( " AND sdo_relate(%1,%2,'mask=ANYINTERACT')='TRUE'" )
.arg( QgsOracleProvider::quotedIdentifier( mSource->mGeometryColumn ) )
.arg( bbox );
whereClause += QStringLiteral( " AND sdo_relate(%1,%2,'mask=ANYINTERACT')='TRUE'" )
.arg( QgsOracleProvider::quotedIdentifier( mSource->mGeometryColumn ),
bbox );
args << ( mSource->mSrid < 1 ? QVariant( QVariant::Int ) : mSource->mSrid ) << mFilterRect.xMinimum() << mFilterRect.yMinimum() << mFilterRect.xMaximum() << mFilterRect.yMaximum();
}
else
Expand All @@ -139,7 +139,7 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource *sour
}
else if ( !mFilterRect.isNull() )
{
QgsDebugMsg( "filterRect without geometry ignored" );
QgsDebugMsg( QStringLiteral( "filterRect without geometry ignored" ) );
}

switch ( mRequest.filterType() )
Expand Down Expand Up @@ -170,16 +170,16 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource *sour
if ( mSource->mRequestedGeomType != QgsWkbTypes::Unknown && mSource->mRequestedGeomType != mSource->mDetectedGeomType )
{
if ( !whereClause.isEmpty() )
whereClause += " AND ";
whereClause += QStringLiteral( " AND " );

whereClause += QgsOracleConn::databaseTypeFilter( "FEATUREREQUEST", mSource->mGeometryColumn, mSource->mRequestedGeomType );
whereClause += QgsOracleConn::databaseTypeFilter( QStringLiteral( "FEATUREREQUEST" ), mSource->mGeometryColumn, mSource->mRequestedGeomType );
}

if ( !mSource->mSqlWhereClause.isEmpty() )
{
if ( !whereClause.isEmpty() )
whereClause += " AND ";
whereClause += "(" + mSource->mSqlWhereClause + ")";
whereClause += QStringLiteral( " AND " );
whereClause += '(' + mSource->mSqlWhereClause + ')';
}

//NOTE - must be last added!
Expand All @@ -189,7 +189,7 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource *sour
bool useFallback = false;
if ( request.filterType() == QgsFeatureRequest::FilterExpression )
{
if ( QgsSettings().value( "qgis/compileExpressions", true ).toBool() )
if ( QgsSettings().value( QStringLiteral( "qgis/compileExpressions" ), true ).toBool() )
{
QgsOracleExpressionCompiler compiler( mSource );
QgsSqlExpressionCompiler::Result result = compiler.compile( mRequest.filterExpression() );
Expand Down Expand Up @@ -223,7 +223,7 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource *sour
if ( mRequest.limit() >= 0 && limitAtProvider )
{
if ( !whereClause.isEmpty() )
whereClause += " AND ";
whereClause += QStringLiteral( " AND " );

whereClause += QStringLiteral( "rownum<=?" );
fallbackStatement += QStringLiteral( "rownum<=?" );
Expand Down Expand Up @@ -274,8 +274,8 @@ bool QgsOracleFeatureIterator::fetchFeature( QgsFeature &feature )
if ( !QgsOracleProvider::exec( mQry, mSql, mArgs ) )
{
QgsMessageLog::logMessage( QObject::tr( "Fetching features failed.\nSQL: %1\nError: %2" )
.arg( mQry.lastQuery() )
.arg( mQry.lastError().text() ),
.arg( mQry.lastQuery(),
mQry.lastError().text() ),
QObject::tr( "Oracle" ) );
return false;
}
Expand Down Expand Up @@ -305,7 +305,7 @@ bool QgsOracleFeatureIterator::fetchFeature( QgsFeature &feature )
{
if ( !feature.hasGeometry() )
{
QgsDebugMsg( "no geometry to intersect" );
QgsDebugMsg( QStringLiteral( "no geometry to intersect" ) );
continue;
}

Expand All @@ -318,7 +318,7 @@ bool QgsOracleFeatureIterator::fetchFeature( QgsFeature &feature )
if ( !feature.geometry().boundingBox().intersects( mFilterRect ) )
{
// skip feature that don't intersect with our rectangle
QgsDebugMsg( "no bbox intersect" );
QgsDebugMsg( QStringLiteral( "no bbox intersect" ) );
continue;
}
}
Expand All @@ -329,7 +329,7 @@ bool QgsOracleFeatureIterator::fetchFeature( QgsFeature &feature )
if ( !feature.geometry().intersects( mFilterRect ) )
{
// skip feature that don't intersect with our rectangle
QgsDebugMsg( "no exact intersect" );
QgsDebugMsg( QStringLiteral( "no exact intersect" ) );
continue;
}
}
Expand All @@ -343,15 +343,14 @@ bool QgsOracleFeatureIterator::fetchFeature( QgsFeature &feature )
case PktInt:
// get 64bit integer from result
fid = mQry.value( col++ ).toLongLong();
if ( mAttributeList.contains( mSource->mPrimaryKeyAttrs[0] ) )
feature.setAttribute( mSource->mPrimaryKeyAttrs[0], fid );
if ( mAttributeList.contains( mSource->mPrimaryKeyAttrs.value( 0 ) ) )
feature.setAttribute( mSource->mPrimaryKeyAttrs.value( 0 ), fid );
break;

case PktRowId:
case PktFidMap:
{
QVariantList primaryKeyVals;

if ( mSource->mPrimaryKeyType == PktFidMap )
{
Q_FOREACH ( int idx, mSource->mPrimaryKeyAttrs )
Expand Down Expand Up @@ -384,7 +383,7 @@ bool QgsOracleFeatureIterator::fetchFeature( QgsFeature &feature )
}

feature.setId( fid );
QgsDebugMsgLevel( QString( "fid=%1" ).arg( fid ), 5 );
QgsDebugMsgLevel( QStringLiteral( "fid=%1" ).arg( fid ), 5 );

// iterate attributes
Q_FOREACH ( int idx, mAttributeList )
Expand All @@ -395,7 +394,7 @@ bool QgsOracleFeatureIterator::fetchFeature( QgsFeature &feature )
QgsField fld = mSource->mFields.at( idx );

QVariant v = mQry.value( col );
if ( fld.type() == QVariant::ByteArray && fld.typeName().endsWith( ".SDO_GEOMETRY" ) )
if ( fld.type() == QVariant::ByteArray && fld.typeName().endsWith( QStringLiteral( ".SDO_GEOMETRY" ) ) )
{
QByteArray ba( v.toByteArray() );
if ( ba.size() > 0 )
Expand Down Expand Up @@ -449,42 +448,42 @@ bool QgsOracleFeatureIterator::close()
return true;
}

bool QgsOracleFeatureIterator::openQuery( QString whereClause, QVariantList args, bool showLog )
bool QgsOracleFeatureIterator::openQuery( const QString &whereClause, const QVariantList &args, bool showLog )
{
try
{
QString query = "SELECT ", delim = "";
QString query = QStringLiteral( "SELECT " );
QString delim;

if ( mFetchGeometry )
{
query += QgsOracleProvider::quotedIdentifier( mSource->mGeometryColumn );
delim = ",";
delim = ',';
}

switch ( mSource->mPrimaryKeyType )
{
case PktRowId:
query += delim + QgsOracleProvider::quotedIdentifier( "ROWID" );
delim = ",";
query += delim + QgsOracleProvider::quotedIdentifier( QStringLiteral( "ROWID" ) );
delim = ',';
break;

case PktInt:
query += delim + QgsOracleProvider::quotedIdentifier( mSource->mFields.at( mSource->mPrimaryKeyAttrs[0] ).name() );
delim = ",";
delim = ',';
break;

case PktFidMap:
Q_FOREACH ( int idx, mSource->mPrimaryKeyAttrs )
{
query += delim + mConnection->fieldExpression( mSource->mFields.at( idx ) );
delim = ",";
delim = ',';
}
break;

case PktUnknown:
QgsDebugMsg( "Cannot query without primary key." );
QgsDebugMsg( QStringLiteral( "Cannot query without primary key." ) );
return false;
break;
}

Q_FOREACH ( int idx, mAttributeList )
Expand All @@ -495,21 +494,21 @@ bool QgsOracleFeatureIterator::openQuery( QString whereClause, QVariantList args
query += delim + mConnection->fieldExpression( mSource->mFields.at( idx ) );
}

query += QString( " FROM %1 \"FEATUREREQUEST\"" ).arg( mSource->mQuery );
query += QStringLiteral( " FROM %1 \"FEATUREREQUEST\"" ).arg( mSource->mQuery );

if ( !whereClause.isEmpty() )
query += QString( " WHERE %1" ).arg( whereClause );
query += QStringLiteral( " WHERE %1" ).arg( whereClause );

QgsDebugMsg( QString( "Fetch features: %1" ).arg( query ) );
QgsDebugMsg( QStringLiteral( "Fetch features: %1" ).arg( query ) );
mSql = query;
mArgs = args;
if ( !QgsOracleProvider::exec( mQry, query, args ) )
{
if ( showLog )
{
QgsMessageLog::logMessage( QObject::tr( "Fetching features failed.\nSQL: %1\nError: %2" )
.arg( mQry.lastQuery() )
.arg( mQry.lastError().text() ),
.arg( mQry.lastQuery(),
mQry.lastError().text() ),
QObject::tr( "Oracle" ) );
}
return false;
Expand Down
2 changes: 1 addition & 1 deletion src/providers/oracle/qgsoraclefeatureiterator.h
View file
Expand Up @@ -71,7 +71,7 @@ class QgsOracleFeatureIterator : public QgsAbstractFeatureIteratorFromSource<Qgs
virtual bool fetchFeature( QgsFeature &feature ) override;
bool nextFeatureFilterExpression( QgsFeature &f ) override;

bool openQuery( QString whereClause, QVariantList args, bool showLog = true );
bool openQuery( const QString &whereClause, const QVariantList &args, bool showLog = true );

QgsOracleConn *mConnection = nullptr;
QSqlQuery mQry;
Expand Down

0 comments on commit 99a2025

Please sign in to comment.