Don't list join fields to facilitate 'save as' function (fixes #3857). Don't display the query builder if a layer has joins (#3858)

Marco Hugentobler · mhugent · commit db20ac280841 · 2011-06-10T08:48:07.000+02:00
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -296,7 +296,8 @@ void QgsVectorLayerProperties::toggleEditing()
 {
   emit toggleEditing( layer );
 
-  pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() && !layer->isEditable() );
+  pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() &&
+                               !layer->isEditable() && layer->vectorJoins().size() < 1 );
   if ( layer->isEditable() )
   {
     pbnQueryBuilder->setToolTip( tr( "Stop editing mode to enable this." ) );
@@ -474,7 +475,8 @@ void QgsVectorLayerProperties::reset( void )
   // on the builder. If the ability to enter a query directly into the box is required,
   // a mechanism to check it must be implemented.
   txtSubsetSQL->setEnabled( false );
-  pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() && !layer->isEditable() );
+  pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() &&
+                               !layer->isEditable() && layer->vectorJoins().size() < 1 );
   if ( layer->isEditable() )
   {
     pbnQueryBuilder->setToolTip( tr( "Stop editing mode to enable this." ) );
@@ -1079,6 +1081,8 @@ void QgsVectorLayerProperties::on_mButtonAddJoin_clicked()
       layer->addJoin( info );
       loadRows(); //update attribute tab
       addJoinToTreeWidget( info );
+      pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() &&
+                                   !layer->isEditable() && layer->vectorJoins().size() < 1 );
     }
   }
 }
@@ -1116,6 +1120,8 @@ void QgsVectorLayerProperties::on_mButtonRemoveJoin_clicked()
   layer->removeJoin( currentJoinItem->data( 0, Qt::UserRole ).toString() );
   loadRows();
   mJoinTreeWidget->takeTopLevelItem( mJoinTreeWidget->indexOfTopLevelItem( currentJoinItem ) );
+  pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() &&
+                               !layer->isEditable() && layer->vectorJoins().size() < 1 );
 }
 
 void QgsVectorLayerProperties::handleDiagramItemDoubleClick( QTreeWidgetItem * item, int column )
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2693,6 +2693,7 @@ bool QgsVectorLayer::readXml( const QDomNode& layer_node )
   mJoinBuffer->readXml( layer_node );
 
   updateFieldMap();
+  connect( QgsMapLayerRegistry::instance(), SIGNAL( layerWillBeRemoved( QString ) ), this, SLOT( checkJoinLayerRemove( QString ) ) );
 
   QString errorMsg;
   if ( !readSymbology( layer_node, errorMsg ) )
diff --git a/src/core/qgsvectorlayerjoinbuffer.cpp b/src/core/qgsvectorlayerjoinbuffer.cpp
@@ -96,7 +96,11 @@ void QgsVectorLayerJoinBuffer::updateFieldMap( QgsFieldMap& fields, int& maxInde
     QgsFieldMap::const_iterator fieldIt = joinFields.constBegin();
     for ( ; fieldIt != joinFields.constEnd(); ++fieldIt )
     {
-      fields.insert( maxIndex + 1 + fieldIt.key(), fieldIt.value() );
+      //skip the join field to avoid double field names (fields often have the same name)
+      if ( fieldIt.key() != joinIt->joinField )
+      {
+        fields.insert( maxIndex + 1 + fieldIt.key(), fieldIt.value() );
+      }
     }
 
     if ( maximumIndex( joinFields, currentMaxIndex ) )
@@ -217,6 +221,12 @@ void QgsVectorLayerJoinBuffer::addJoinedFeatureAttributes( QgsFeature& f, const
     QgsAttributeList::const_iterator attIt = attributes.constBegin();
     for ( ; attIt != attributes.constEnd(); ++attIt )
     {
+      //skip the join field to avoid double field names (fields often have the same name)
+      if ( *attIt == joinInfo.joinField )
+      {
+        continue;
+      }
+
       if ( found )
       {
         f.addAttribute( *attIt + attributeIndexOffset, featureAttributes.value( *attIt ) );
diff --git a/src/core/qgsvectorlayerjoinbuffer.h b/src/core/qgsvectorlayerjoinbuffer.h
@@ -24,7 +24,7 @@
 #include <QHash>
 #include <QString>
 
-/**Manages joined field for a vector layer*/
+/**Manages joined fields for a vector layer*/
 class CORE_EXPORT QgsVectorLayerJoinBuffer
 {
   public:

Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,8 @@ void QgsVectorLayerProperties::toggleEditing()`
`296`	`296`	`{`
`297`	`297`	`emit toggleEditing( layer );`
`298`	`298`
`299`		`- pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() && !layer->isEditable() );`
	`299`	`+ pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() &&`
	`300`	`+ !layer->isEditable() && layer->vectorJoins().size() < 1 );`
`300`	`301`	`if ( layer->isEditable() )`
`301`	`302`	`{`
`302`	`303`	`pbnQueryBuilder->setToolTip( tr( "Stop editing mode to enable this." ) );`
`@@ -474,7 +475,8 @@ void QgsVectorLayerProperties::reset( void )`
`474`	`475`	`// on the builder. If the ability to enter a query directly into the box is required,`
`475`	`476`	`// a mechanism to check it must be implemented.`
`476`	`477`	`txtSubsetSQL->setEnabled( false );`
`477`		`- pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() && !layer->isEditable() );`
	`478`	`+ pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() &&`
	`479`	`+ !layer->isEditable() && layer->vectorJoins().size() < 1 );`
`478`	`480`	`if ( layer->isEditable() )`
`479`	`481`	`{`
`480`	`482`	`pbnQueryBuilder->setToolTip( tr( "Stop editing mode to enable this." ) );`
`@@ -1079,6 +1081,8 @@ void QgsVectorLayerProperties::on_mButtonAddJoin_clicked()`
`1079`	`1081`	`layer->addJoin( info );`
`1080`	`1082`	`loadRows(); //update attribute tab`
`1081`	`1083`	`addJoinToTreeWidget( info );`
	`1084`	`+ pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() &&`
	`1085`	`+ !layer->isEditable() && layer->vectorJoins().size() < 1 );`
`1082`	`1086`	`}`
`1083`	`1087`	`}`
`1084`	`1088`	`}`
`@@ -1116,6 +1120,8 @@ void QgsVectorLayerProperties::on_mButtonRemoveJoin_clicked()`
`1116`	`1120`	`layer->removeJoin( currentJoinItem->data( 0, Qt::UserRole ).toString() );`
`1117`	`1121`	`loadRows();`
`1118`	`1122`	`mJoinTreeWidget->takeTopLevelItem( mJoinTreeWidget->indexOfTopLevelItem( currentJoinItem ) );`
	`1123`	`+ pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() &&`
	`1124`	`+ !layer->isEditable() && layer->vectorJoins().size() < 1 );`
`1119`	`1125`	`}`
`1120`	`1126`
`1121`	`1127`	`void QgsVectorLayerProperties::handleDiagramItemDoubleClick( QTreeWidgetItem * item, int column )`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,11 @@ void QgsVectorLayerJoinBuffer::updateFieldMap( QgsFieldMap& fields, int& maxInde`
`96`	`96`	`QgsFieldMap::const_iterator fieldIt = joinFields.constBegin();`
`97`	`97`	`for ( ; fieldIt != joinFields.constEnd(); ++fieldIt )`
`98`	`98`	`{`
`99`		`- fields.insert( maxIndex + 1 + fieldIt.key(), fieldIt.value() );`
	`99`	`+ //skip the join field to avoid double field names (fields often have the same name)`
	`100`	`+ if ( fieldIt.key() != joinIt->joinField )`
	`101`	`+ {`
	`102`	`+ fields.insert( maxIndex + 1 + fieldIt.key(), fieldIt.value() );`
	`103`	`+ }`
`100`	`104`	`}`
`101`	`105`
`102`	`106`	`if ( maximumIndex( joinFields, currentMaxIndex ) )`
`@@ -217,6 +221,12 @@ void QgsVectorLayerJoinBuffer::addJoinedFeatureAttributes( QgsFeature& f, const`
`217`	`221`	`QgsAttributeList::const_iterator attIt = attributes.constBegin();`
`218`	`222`	`for ( ; attIt != attributes.constEnd(); ++attIt )`
`219`	`223`	`{`
	`224`	`+ //skip the join field to avoid double field names (fields often have the same name)`
	`225`	`+ if ( *attIt == joinInfo.joinField )`
	`226`	`+ {`
	`227`	`+ continue;`
	`228`	`+ }`
	`229`	`+`
`220`	`230`	`if ( found )`
`221`	`231`	`{`
`222`	`232`	`f.addAttribute( attIt + attributeIndexOffset, featureAttributes.value( attIt ) );`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`#include <QHash>`
`25`	`25`	`#include <QString>`
`26`	`26`
`27`		`-/*Manages joined field for a vector layer/`
	`27`	`+/*Manages joined fields for a vector layer/`
`28`	`28`	`class CORE_EXPORT QgsVectorLayerJoinBuffer`
`29`	`29`	`{`
`30`	`30`	`public:`