Implements deleteCascade option

This commit is contained in:
Blottiere Paul 2017-07-21 08:59:58 +01:00
parent f92c23fdfb
commit 293f0f41ba
2 changed files with 27 additions and 0 deletions

View File

@ -2438,6 +2438,9 @@ bool QgsVectorLayer::deleteFeature( QgsFeatureId fid )
if ( !mEditBuffer )
return false;
if ( mJoinBuffer->containsJoins() )
deleteFeaturesFromJoinedLayers( QgsFeatureIds() << fid );
bool res = mEditBuffer->deleteFeature( fid );
if ( res )
{
@ -2456,6 +2459,9 @@ bool QgsVectorLayer::deleteFeatures( const QgsFeatureIds &fids )
return false;
}
if ( mJoinBuffer->containsJoins() )
deleteFeaturesFromJoinedLayers( fids );
bool res = mEditBuffer->deleteFeatures( fids );
if ( res )
@ -2467,6 +2473,26 @@ bool QgsVectorLayer::deleteFeatures( const QgsFeatureIds &fids )
return res;
}
bool QgsVectorLayer::deleteFeaturesFromJoinedLayers( QgsFeatureIds fids )
{
bool rc = false;
Q_FOREACH ( const QgsFeatureId &fid, fids )
{
Q_FOREACH ( const QgsVectorLayerJoinInfo &info, vectorJoins() )
{
if ( info.isEditable() && info.isDeleteCascade() )
{
QgsFeature joinFeature = mJoinBuffer->joinedFeatureOf( &info, getFeature( fid ) );
if ( joinFeature.isValid() )
info.joinLayer()->deleteFeature( joinFeature.id() );
}
}
}
return rc;
}
QgsAttributeList QgsVectorLayer::pkAttributeList() const
{
QgsAttributeList pkAttributesList;

View File

@ -1933,6 +1933,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
QgsAbstractVectorLayerLabeling *readLabelingFromCustomProperties();
bool addFeaturesToJoinedLayers( QgsFeatureList &features, Flags flags = 0 );
bool deleteFeaturesFromJoinedLayers( QgsFeatureIds fids );
#ifdef SIP_RUN
QgsVectorLayer( const QgsVectorLayer &rhs );