sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix oracle provider (followup 5be0ee7)

Browse Source
This commit is contained in:
Juergen E. Fischer 2015-07-30 09:31:28 +02:00
parent 2887a4ae57
commit fe50327b28
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
python/plugins/CMakeLists.txt
View File

@ -33,6 +33,7 @@ MACRO (PLUGIN_INSTALL plugin subdir )
ADD_DEPENDENCIES(staged-plugins zzz-${plugin}-stageinstall) ADD_DEPENDENCIES(staged-plugins zzz-${plugin}-stageinstall)
ADD_CUSTOM_TARGET(staged-${plugin} DEPENDS zzz-${plugin}-stageinstall) ADD_CUSTOM_TARGET(staged-${plugin} DEPENDS zzz-${plugin}-stageinstall)
FILE(WRITE ${_cmake} "")
ENDIF(NOT TARGET zzz-${plugin}-stageinstall) ENDIF(NOT TARGET zzz-${plugin}-stageinstall)
ADD_CUSTOM_TARGET(zzz-${plugin}-${n}-depend DEPENDS ${ARGN}) ADD_CUSTOM_TARGET(zzz-${plugin}-${n}-depend DEPENDS ${ARGN})

14
src/providers/oracle/qgsoraclefeatureiterator.cpp
View File

@ -46,7 +46,7 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource* sour
QString whereClause; QString whereClause;
if ( !mRequest.filterRect().isNull && !mSource->mGeometryColumn.isNull() && mSource->mHasSpatialIndex ) if ( !mRequest.filterRect().isNull() && !mSource->mGeometryColumn.isNull() && mSource->mHasSpatialIndex )
{ {
QgsRectangle rect( mRequest.filterRect() ); QgsRectangle rect( mRequest.filterRect() );
QString bbox = QString( "mdsys.sdo_geometry(2003,%1,NULL," QString bbox = QString( "mdsys.sdo_geometry(2003,%1,NULL,"
@ -72,14 +72,18 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource* sour
switch ( request.filterType() ) switch ( request.filterType() )
{ {
case QgsFeatureRequest::FilterFid: case QgsFeatureRequest::FilterFid:
{
QString fidWhereClause = QgsOracleUtils::whereClause( request.filterFid(), mSource->mFields, mSource->mPrimaryKeyType, mSource->mPrimaryKeyAttrs, mSource->mShared ); QString fidWhereClause = QgsOracleUtils::whereClause( request.filterFid(), mSource->mFields, mSource->mPrimaryKeyType, mSource->mPrimaryKeyAttrs, mSource->mShared );
whereClause = QgsPostgresUtils::andWhereClauses( whereClause, fidWhereClause ); whereClause = QgsOracleUtils::andWhereClauses( whereClause, fidWhereClause );
break; }
break;
case QgsFeatureRequest::FilterFids: case QgsFeatureRequest::FilterFids:
{
QString fidsWhereClause = QgsOracleUtils::whereClause( request.filterFids(), mSource->mFields, mSource->mPrimaryKeyType, mSource->mPrimaryKeyAttrs, mSource->mShared ); QString fidsWhereClause = QgsOracleUtils::whereClause( request.filterFids(), mSource->mFields, mSource->mPrimaryKeyType, mSource->mPrimaryKeyAttrs, mSource->mShared );
whereClause = QgsPostgresUtils::andWhereClauses( whereClause, fidsWhereClause ); whereClause = QgsOracleUtils::andWhereClauses( whereClause, fidsWhereClause );
break; }
break;
case QgsFeatureRequest::FilterNone: case QgsFeatureRequest::FilterNone:
break; break;