Better handling of invalid relations ...

- do not add them to the manager dialog - do not add relations to not existent layers (but keep relations to invalid layers)
qgis · Nov 5, 2018 · 7a259c6 · 7a259c6
1 parent 2d1a521
commit 7a259c6
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 0 deletions.
diff --git a/python/core/auto_generated/qgsrelation.sip.in b/python/core/auto_generated/qgsrelation.sip.in
@@ -273,6 +273,7 @@ Returns a list of attributes used to form the referencing fields
     bool isValid() const;
 %Docstring
 Returns the validity of this relation. Don't use the information if it's not valid.
+A relation is considered valid if both referenced and referencig layers are valid.
 
 :return: true if the relation is valid
 %End

diff --git a/python/core/auto_generated/qgsrelationmanager.sip.in b/python/core/auto_generated/qgsrelationmanager.sip.in
@@ -45,6 +45,8 @@ Gets access to the relations managed by this class.
     void addRelation( const QgsRelation &relation );
 %Docstring
 Add a relation.
+Invalid relations are added only if both referencing layer and referenced
+layer exist.
 
 :param relation: The relation to add.
 %End

diff --git a/src/app/qgsrelationmanagerdialog.cpp b/src/app/qgsrelationmanagerdialog.cpp
@@ -49,6 +49,9 @@ void QgsRelationManagerDialog::setLayers( const QList< QgsVectorLayer * > &layer
 
 void QgsRelationManagerDialog::addRelation( const QgsRelation &rel )
 {
+  if ( ! rel.isValid() )
+    return;
+
   mRelationsTable->setSortingEnabled( false );
   int row = mRelationsTable->rowCount();
   mRelationsTable->insertRow( row );

diff --git a/src/core/qgsrelation.h b/src/core/qgsrelation.h
@@ -338,6 +338,7 @@ class CORE_EXPORT QgsRelation
 
     /**
      * Returns the validity of this relation. Don't use the information if it's not valid.
+     * A relation is considered valid if both referenced and referencig layers are valid.
      *
      * \returns true if the relation is valid
      */

diff --git a/src/core/qgsrelationmanager.cpp b/src/core/qgsrelationmanager.cpp
@@ -50,6 +50,10 @@ QMap<QString, QgsRelation> QgsRelationManager::relations() const
 
 void QgsRelationManager::addRelation( const QgsRelation &relation )
 {
+  // Do not add relations to layers that do not exist
+  if ( !( relation.referencingLayer() && relation.referencedLayer() ) )
+    return;
+
   mRelations.insert( relation.id(), relation );
 
   if ( mProject )

diff --git a/src/core/qgsrelationmanager.h b/src/core/qgsrelationmanager.h
@@ -59,6 +59,8 @@ class CORE_EXPORT QgsRelationManager : public QObject
 
     /**
      * Add a relation.
+     * Invalid relations are added only if both referencing layer and referenced
+     * layer exist.
      *
      * \param relation The relation to add.
      */

diff --git a/tests/testdata/projects/bad_layers_test.gpkg b/tests/testdata/projects/bad_layers_test.gpkg