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

Merge pull request #5250 from manisandro/ogr_orig_fid

Browse Source 
[OGR] orig_ogc_fid followups
This commit is contained in:
Sandro Mani 2017-09-25 15:21:41 +02:00 committed by GitHub
commit 7705179a6c
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/providers/ogr/qgsogrfeatureiterator.cpp
View File

@ -176,6 +176,7 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource *source, bool
OGR_L_SetAttributeFilter( ogrLayer, nullptr ); OGR_L_SetAttributeFilter( ogrLayer, nullptr );
} }
//start with first feature //start with first feature
rewind(); rewind();
} }
@ -346,7 +347,12 @@ bool QgsOgrFeatureIterator::readFeature( OGRFeatureH fet, QgsFeature &feature )
{ {
if ( mOrigFidAdded ) if ( mOrigFidAdded )
{ {
feature.setId( OGR_F_GetFieldAsInteger64( fet, 0 ) ); OGRFeatureDefnH fdef = OGR_L_GetLayerDefn( ogrLayer );
int lastField = OGR_FD_GetFieldCount( fdef ) - 1;
if ( lastField >= 0 )
feature.setId( OGR_F_GetFieldAsInteger64( fet, lastField ) );
else
feature.setId( OGR_F_GetFID( fet ) );
} }
else else
{ {

14
src/providers/ogr/qgsogrprovider.cpp
View File

@ -88,6 +88,8 @@ static const QString TEXT_PROVIDER_DESCRIPTION =
static OGRwkbGeometryType ogrWkbGeometryTypeFromName( const QString &typeName ); static OGRwkbGeometryType ogrWkbGeometryTypeFromName( const QString &typeName );
static const QByteArray ORIG_OGC_FID = "orig_ogc_fid";
bool QgsOgrProvider::convertField( QgsField &field, const QTextCodec &encoding ) bool QgsOgrProvider::convertField( QgsField &field, const QTextCodec &encoding )
{ {
@ -1023,7 +1025,11 @@ void QgsOgrProviderUtils::setRelevantFields( OGRLayerH ogrLayer, int fieldCount,
if ( !fetchAttributes.contains( i ) ) if ( !fetchAttributes.contains( i ) )
{ {
// add to ignored fields // add to ignored fields
ignoredFields.append( OGR_Fld_GetNameRef( OGR_FD_GetFieldDefn( featDefn, firstAttrIsFid ? i - 1 : i ) ) ); const char *fieldName = OGR_Fld_GetNameRef( OGR_FD_GetFieldDefn( featDefn, firstAttrIsFid ? i - 1 : i ) );
if ( qstrcmp( fieldName, ORIG_OGC_FID ) != 0 )
{
ignoredFields.append( fieldName );
}
} }
} }
@ -3567,7 +3573,7 @@ OGRLayerH QgsOgrProviderUtils::setSubsetString( OGRLayerH layer, GDALDatasetH ds
fidColumn = "FID"; fidColumn = "FID";
} }
QByteArray sql = sqlPart1 + ", " + fidColumn + " as orig_ogc_fid" + sqlPart3; QByteArray sql = sqlPart1 + ", " + fidColumn + " as " + ORIG_OGC_FID + sqlPart3;
QgsDebugMsg( QString( "SQL: %1" ).arg( encoding->toUnicode( sql ) ) ); QgsDebugMsg( QString( "SQL: %1" ).arg( encoding->toUnicode( sql ) ) );
subsetLayer = GDALDatasetExecuteSQL( ds, sql.constData(), nullptr, nullptr ); subsetLayer = GDALDatasetExecuteSQL( ds, sql.constData(), nullptr, nullptr );
@ -3575,7 +3581,7 @@ OGRLayerH QgsOgrProviderUtils::setSubsetString( OGRLayerH layer, GDALDatasetH ds
// If execute SQL fails because it did not find the fidColumn, retry with hardcoded FID // If execute SQL fails because it did not find the fidColumn, retry with hardcoded FID
if ( !subsetLayer ) if ( !subsetLayer )
{ {
QByteArray sql = sqlPart1 + ", " + "FID as orig_ogc_fid" + sqlPart3; QByteArray sql = sqlPart1 + ", " + "FID as " + ORIG_OGC_FID + sqlPart3;
QgsDebugMsg( QString( "SQL: %1" ).arg( encoding->toUnicode( sql ) ) ); QgsDebugMsg( QString( "SQL: %1" ).arg( encoding->toUnicode( sql ) ) );
subsetLayer = GDALDatasetExecuteSQL( ds, sql.constData(), nullptr, nullptr ); subsetLayer = GDALDatasetExecuteSQL( ds, sql.constData(), nullptr, nullptr );
} }
@ -3597,7 +3603,7 @@ OGRLayerH QgsOgrProviderUtils::setSubsetString( OGRLayerH layer, GDALDatasetH ds
if ( fieldCount > 0 ) if ( fieldCount > 0 )
{ {
OGRFieldDefnH fldDef = OGR_FD_GetFieldDefn( fdef, fieldCount - 1 ); OGRFieldDefnH fldDef = OGR_FD_GetFieldDefn( fdef, fieldCount - 1 );
origFidAdded = qstrcmp( OGR_Fld_GetNameRef( fldDef ), "orig_ogc_fid" ) == 0; origFidAdded = qstrcmp( OGR_Fld_GetNameRef( fldDef ), ORIG_OGC_FID ) == 0;
} }
} }

12
tests/src/python/test_provider_ogr_sqlite.py
View File

@ -254,6 +254,18 @@ class TestPyQgsOGRProviderSqlite(unittest.TestCase):
self.assertTrue(it.nextFeature(f)) self.assertTrue(it.nextFeature(f))
self.assertTrue(f.id() == 5) self.assertTrue(f.id() == 5)
# Ensure that orig_ogc_fid is still retrieved even if attribute subset is passed
req = QgsFeatureRequest()
req.setSubsetOfAttributes([])
it = vl.getFeatures(req)
ids = []
while it.nextFeature(f):
ids.append(f.id())
self.assertTrue(len(ids) == 3)
self.assertTrue(3 in ids)
self.assertTrue(4 in ids)
self.assertTrue(5 in ids)
# Check that subset string is correctly set on reload # Check that subset string is correctly set on reload
vl.reload() vl.reload()
self.assertTrue(vl.fields().at(vl.fields().count() - 1).name() == "orig_ogc_fid") self.assertTrue(vl.fields().at(vl.fields().count() - 1).name() == "orig_ogc_fid")