Better handling of invalid relations ...

elpaso · elpaso · commit 7a259c6ea5e6 · 2018-11-05T10:26:39.000+01:00
- do not add them to the manager dialog
- do not add relations to not existent layers (but keep relations to invalid layers)
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

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,9 @@ void QgsRelationManagerDialog::setLayers( const QList< QgsVectorLayer * > &layer`
`49`	`49`
`50`	`50`	`void QgsRelationManagerDialog::addRelation( const QgsRelation &rel )`
`51`	`51`	`{`
	`52`	`+ if ( ! rel.isValid() )`
	`53`	`+ return;`
	`54`	`+`
`52`	`55`	`mRelationsTable->setSortingEnabled( false );`
`53`	`56`	`int row = mRelationsTable->rowCount();`
`54`	`57`	`mRelationsTable->insertRow( row );`
Original file line number	Diff line number	Diff line change
`@@ -338,6 +338,7 @@ class CORE_EXPORT QgsRelation`
`338`	`338`
`339`	`339`	`/**`
`340`	`340`	`* Returns the validity of this relation. Don't use the information if it's not valid.`
	`341`	`+ * A relation is considered valid if both referenced and referencig layers are valid.`
`341`	`342`	`*`
`342`	`343`	`* \returns true if the relation is valid`
`343`	`344`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,10 @@ QMap<QString, QgsRelation> QgsRelationManager::relations() const`
`50`	`50`
`51`	`51`	`void QgsRelationManager::addRelation( const QgsRelation &relation )`
`52`	`52`	`{`
	`53`	`+ // Do not add relations to layers that do not exist`
	`54`	`+ if ( !( relation.referencingLayer() && relation.referencedLayer() ) )`
	`55`	`+ return;`
	`56`	`+`
`53`	`57`	`mRelations.insert( relation.id(), relation );`
`54`	`58`
`55`	`59`	`if ( mProject )`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,8 @@ class CORE_EXPORT QgsRelationManager : public QObject`
`59`	`59`
`60`	`60`	`/**`
`61`	`61`	`* Add a relation.`
	`62`	`+ * Invalid relations are added only if both referencing layer and referenced`
	`63`	`+ * layer exist.`
`62`	`64`	`*`
`63`	`65`	`* \param relation The relation to add.`
`64`	`66`	`*/`