From fe50327b282aee6dc28168f915bb695fa11020ee Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Thu, 30 Jul 2015 09:31:28 +0200 Subject: [PATCH] fix oracle provider (followup 5be0ee7) --- python/plugins/CMakeLists.txt | 1 + src/providers/oracle/qgsoraclefeatureiterator.cpp | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/python/plugins/CMakeLists.txt b/python/plugins/CMakeLists.txt index 46ad1e80bba..24e70760719 100644 --- a/python/plugins/CMakeLists.txt +++ b/python/plugins/CMakeLists.txt @@ -33,6 +33,7 @@ MACRO (PLUGIN_INSTALL plugin subdir ) ADD_DEPENDENCIES(staged-plugins zzz-${plugin}-stageinstall) ADD_CUSTOM_TARGET(staged-${plugin} DEPENDS zzz-${plugin}-stageinstall) + FILE(WRITE ${_cmake} "") ENDIF(NOT TARGET zzz-${plugin}-stageinstall) ADD_CUSTOM_TARGET(zzz-${plugin}-${n}-depend DEPENDS ${ARGN}) diff --git a/src/providers/oracle/qgsoraclefeatureiterator.cpp b/src/providers/oracle/qgsoraclefeatureiterator.cpp index 9fdd8bc10a1..8e2a07e1e9f 100644 --- a/src/providers/oracle/qgsoraclefeatureiterator.cpp +++ b/src/providers/oracle/qgsoraclefeatureiterator.cpp @@ -46,7 +46,7 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource* sour QString whereClause; - if ( !mRequest.filterRect().isNull && !mSource->mGeometryColumn.isNull() && mSource->mHasSpatialIndex ) + if ( !mRequest.filterRect().isNull() && !mSource->mGeometryColumn.isNull() && mSource->mHasSpatialIndex ) { QgsRectangle rect( mRequest.filterRect() ); QString bbox = QString( "mdsys.sdo_geometry(2003,%1,NULL," @@ -72,14 +72,18 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource* sour switch ( request.filterType() ) { case QgsFeatureRequest::FilterFid: + { QString fidWhereClause = QgsOracleUtils::whereClause( request.filterFid(), mSource->mFields, mSource->mPrimaryKeyType, mSource->mPrimaryKeyAttrs, mSource->mShared ); - whereClause = QgsPostgresUtils::andWhereClauses( whereClause, fidWhereClause ); - break; + whereClause = QgsOracleUtils::andWhereClauses( whereClause, fidWhereClause ); + } + break; case QgsFeatureRequest::FilterFids: + { QString fidsWhereClause = QgsOracleUtils::whereClause( request.filterFids(), mSource->mFields, mSource->mPrimaryKeyType, mSource->mPrimaryKeyAttrs, mSource->mShared ); - whereClause = QgsPostgresUtils::andWhereClauses( whereClause, fidsWhereClause ); - break; + whereClause = QgsOracleUtils::andWhereClauses( whereClause, fidsWhereClause ); + } + break; case QgsFeatureRequest::FilterNone: break;