[joins] prevent joining an already joined layer

3nids · 3nids · commit 95ebf45ee858 · 2015-03-10T16:00:58.000+01:00
also fix crash when editing a join with all fields joined
diff --git a/src/app/qgsjoindialog.cpp b/src/app/qgsjoindialog.cpp
@@ -25,7 +25,7 @@
 
 #include <QStandardItemModel>
 
-QgsJoinDialog::QgsJoinDialog( QgsVectorLayer* layer, QWidget * parent, Qt::WindowFlags f )
+QgsJoinDialog::QgsJoinDialog( QgsVectorLayer* layer, QList<QgsMapLayer*> alreadyJoinedLayers, QWidget * parent, Qt::WindowFlags f )
     : QDialog( parent, f )
     , mLayer( layer )
 {
@@ -35,12 +35,13 @@ QgsJoinDialog::QgsJoinDialog( QgsVectorLayer* layer, QWidget * parent, Qt::Windo
   {
     return;
   }
+  // adds self layer to the joined layer (cannot join to itself)
+  alreadyJoinedLayers.append( layer );
 
   mTargetFieldComboBox->setLayer( mLayer );
-  mJoinLayerComboBox->setExceptedLayerList( QList<QgsMapLayer*>() << mLayer );
+  mJoinLayerComboBox->setExceptedLayerList( alreadyJoinedLayers );
   connect( mJoinLayerComboBox, SIGNAL( layerChanged( QgsMapLayer* ) ), mJoinFieldComboBox, SLOT( setLayer( QgsMapLayer* ) ) );
   connect( mJoinLayerComboBox, SIGNAL( layerChanged( QgsMapLayer* ) ), this, SLOT( joinedLayerChanged( QgsMapLayer* ) ) );
-  connect( mJoinFieldComboBox, SIGNAL( fieldChanged( QString ) ), this, SLOT( allowAttrIndexCreation() ) );
 
   mCacheInMemoryCheckBox->setChecked( true );
 }
@@ -66,14 +67,14 @@ void QgsJoinDialog::setJoinInfo( const QgsVectorJoinInfo& joinInfo )
   }
 
   QStringList* lst = joinInfo.joinFieldNamesSubset();
-  mUseJoinFieldsSubset->setChecked( lst->count() > 0 );
+  mUseJoinFieldsSubset->setChecked( lst && lst->count() > 0 );
   QAbstractItemModel* model = mJoinFieldsSubsetView->model();
   if ( model )
   {
     for ( int i = 0; i < model->rowCount(); ++i )
     {
       QModelIndex index = model->index( i, 0 );
-      if ( lst->contains( model->data( index, Qt::DisplayRole ).toString() ) )
+      if ( lst && lst->contains( model->data( index, Qt::DisplayRole ).toString() ) )
       {
         model->setData( index, Qt::Checked, Qt::CheckStateRole );
       }
diff --git a/src/app/qgsjoindialog.h b/src/app/qgsjoindialog.h
@@ -27,7 +27,7 @@ class APP_EXPORT QgsJoinDialog: public QDialog, private Ui::QgsJoinDialogBase
 {
     Q_OBJECT
   public:
-    QgsJoinDialog( QgsVectorLayer* layer, QWidget * parent = 0, Qt::WindowFlags f = 0 );
+    QgsJoinDialog( QgsVectorLayer* layer, QList<QgsMapLayer*> alreadyJoinedLayers, QWidget * parent = 0, Qt::WindowFlags f = 0 );
     ~QgsJoinDialog();
 
     /** Configure the dialog for an existing join */
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -1031,26 +1031,33 @@ void QgsVectorLayerProperties::showListOfStylesFromDatabase()
 
 void QgsVectorLayerProperties::on_mButtonAddJoin_clicked()
 {
-  QgsJoinDialog d( layer );
+  if ( !layer )
+    return;
+
+  QList<QgsMapLayer*> joinedLayers;
+  const QList< QgsVectorJoinInfo >& joins = layer->vectorJoins();
+  for ( int i = 0; i < joins.size(); ++i )
+  {
+    joinedLayers.append( QgsMapLayerRegistry::instance()->mapLayer( joins[i].joinLayerId ) );
+  }
+
+  QgsJoinDialog d( layer, joinedLayers );
   if ( d.exec() == QDialog::Accepted )
   {
     QgsVectorJoinInfo info = d.joinInfo();
-    if ( layer )
+    //create attribute index if possible
+    if ( d.createAttributeIndex() )
     {
-      //create attribute index if possible
-      if ( d.createAttributeIndex() )
+      QgsVectorLayer* joinLayer = qobject_cast<QgsVectorLayer*>( QgsMapLayerRegistry::instance()->mapLayer( info.joinLayerId ) );
+      if ( joinLayer )
       {
-        QgsVectorLayer* joinLayer = qobject_cast<QgsVectorLayer*>( QgsMapLayerRegistry::instance()->mapLayer( info.joinLayerId ) );
-        if ( joinLayer )
-        {
-          joinLayer->dataProvider()->createAttributeIndex( joinLayer->pendingFields().indexFromName( info.joinFieldName ) );
-        }
+        joinLayer->dataProvider()->createAttributeIndex( joinLayer->pendingFields().indexFromName( info.joinFieldName ) );
       }
-      layer->addJoin( info );
-      addJoinToTreeWidget( info );
-      pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() &&
-                                   !layer->isEditable() && layer->vectorJoins().size() < 1 );
     }
+    layer->addJoin( info );
+    addJoinToTreeWidget( info );
+    pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() &&
+                                 !layer->isEditable() && layer->vectorJoins().size() < 1 );
     mFieldsPropertiesDialog->init();
   }
 }
@@ -1063,6 +1070,7 @@ void QgsVectorLayerProperties::on_mButtonEditJoin_clicked()
     return;
   }
 
+  QList<QgsMapLayer*> joinedLayers;
   QString joinLayerId = currentJoinItem->data( 0, Qt::UserRole ).toString();
   const QList< QgsVectorJoinInfo >& joins = layer->vectorJoins();
   int j = -1;
@@ -1071,17 +1079,22 @@ void QgsVectorLayerProperties::on_mButtonEditJoin_clicked()
     if ( joins[i].joinLayerId == joinLayerId )
     {
       j = i;
-      break;
+    }
+    else
+    {
+      // remove already joined layers from possible list to be displayed in dialog
+      joinedLayers.append( QgsMapLayerRegistry::instance()->mapLayer( joins[i].joinLayerId ) );
     }
   }
   if ( j == -1 )
   {
     return;
   }
 
-  QgsJoinDialog d( layer );
+  QgsJoinDialog d( layer, joinedLayers );
   d.setJoinInfo( joins[j] );
 
+
   if ( d.exec() == QDialog::Accepted )
   {
     // remove old join
@@ -1090,24 +1103,22 @@ void QgsVectorLayerProperties::on_mButtonEditJoin_clicked()
 
     // add the new edited
     QgsVectorJoinInfo info = d.joinInfo();
-    if ( layer )
+
+    //create attribute index if possible
+    if ( d.createAttributeIndex() )
     {
-      //create attribute index if possible
-      if ( d.createAttributeIndex() )
+      QgsVectorLayer* joinLayer = qobject_cast<QgsVectorLayer*>( QgsMapLayerRegistry::instance()->mapLayer( info.joinLayerId ) );
+      if ( joinLayer )
       {
-        QgsVectorLayer* joinLayer = qobject_cast<QgsVectorLayer*>( QgsMapLayerRegistry::instance()->mapLayer( info.joinLayerId ) );
-        if ( joinLayer )
-        {
-          joinLayer->dataProvider()->createAttributeIndex( joinLayer->pendingFields().indexFromName( info.joinFieldName ) );
-        }
+        joinLayer->dataProvider()->createAttributeIndex( joinLayer->pendingFields().indexFromName( info.joinFieldName ) );
       }
-      layer->addJoin( info );
-      addJoinToTreeWidget( info );
-
-      pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() &&
-                                   !layer->isEditable() && layer->vectorJoins().size() < 1 );
-      mFieldsPropertiesDialog->init();
     }
+    layer->addJoin( info );
+    addJoinToTreeWidget( info );
+
+    pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() &&
+                                 !layer->isEditable() && layer->vectorJoins().size() < 1 );
+    mFieldsPropertiesDialog->init();
   }
 }
 
diff --git a/src/gui/qgsmaplayercombobox.h b/src/gui/qgsmaplayercombobox.h
@@ -41,13 +41,13 @@ class GUI_EXPORT QgsMapLayerComboBox : public QComboBox
     explicit QgsMapLayerComboBox( QWidget *parent = 0 );
 
     //! setFilters allows fitering according to layer type and/or geometry type.
-    void setFilters( QgsMapLayerProxyModel::Filters filters )    {      mProxyModel->setFilters( filters );    }
+    void setFilters( QgsMapLayerProxyModel::Filters filters ) { mProxyModel->setFilters( filters ); }
 
     //! currently used filter on list layers
     QgsMapLayerProxyModel::Filters filters() const { return mProxyModel->filters(); }
 
     //! except a list of layers not to be listed
-    void setExceptedLayerList( QList<QgsMapLayer*> layerList ) {      mProxyModel->setExceptedLayerList( layerList );    }
+    void setExceptedLayerList( QList<QgsMapLayer*> layerList ) { mProxyModel->setExceptedLayerList( layerList );}
 
     //! returns the list of excepted layers
     QList<QgsMapLayer*> exceptedLayerList() const {return mProxyModel->exceptedLayerList();}
diff --git a/src/ui/qgsjoindialogbase.ui b/src/ui/qgsjoindialogbase.ui
@@ -7,49 +7,48 @@
     <x>0</x>
     <y>0</y>
     <width>505</width>
-    <height>460</height>
+    <height>393</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Add vector join</string>
   </property>
-  <layout class="QFormLayout" name="formLayout">
-   <item row="1" column="0">
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
     <widget class="QLabel" name="mJoinLayerLabel">
      <property name="text">
       <string>Join layer</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="0">
+   <item row="0" column="1">
+    <widget class="QgsMapLayerComboBox" name="mJoinLayerComboBox">
+     <property name="filters">
+      <set>QgsMapLayerProxyModel::VectorLayer</set>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
     <widget class="QLabel" name="mJoinFieldLabel">
      <property name="text">
       <string>Join field</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
+   <item row="1" column="1">
+    <widget class="QgsFieldComboBox" name="mJoinFieldComboBox"/>
+   </item>
+   <item row="2" column="0">
     <widget class="QLabel" name="mTargetFieldLabel">
      <property name="text">
       <string>Target field</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="0">
-    <widget class="QCheckBox" name="mCacheInMemoryCheckBox">
-     <property name="text">
-      <string>Cache join layer in virtual memory</string>
-     </property>
-    </widget>
+   <item row="2" column="1">
+    <widget class="QgsFieldComboBox" name="mTargetFieldComboBox"/>
    </item>
    <item row="5" column="0" colspan="2">
-    <widget class="QCheckBox" name="mCreateIndexCheckBox">
-     <property name="text">
-      <string>Create attribute index on join field</string>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="0" colspan="2">
     <widget class="QgsCollapsibleGroupBox" name="mUseJoinFieldsSubset">
      <property name="title">
       <string>Choose which fields are joined</string>
@@ -70,7 +69,7 @@
      </layout>
     </widget>
    </item>
-   <item row="7" column="0" colspan="2">
+   <item row="6" column="0" colspan="2">
     <widget class="QgsCollapsibleGroupBox" name="mUseCustomPrefix">
      <property name="title">
       <string>Custom field name prefix</string>
@@ -91,21 +90,14 @@
      </layout>
     </widget>
    </item>
-   <item row="9" column="0" colspan="2">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="0">
+   <item row="7" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
@@ -114,18 +106,29 @@
      </property>
     </spacer>
    </item>
-   <item row="1" column="1">
-    <widget class="QgsMapLayerComboBox" name="mJoinLayerComboBox">
-     <property name="filters">
-      <set>QgsMapLayerProxyModel::VectorLayer</set>
+   <item row="3" column="0" colspan="2">
+    <widget class="QCheckBox" name="mCacheInMemoryCheckBox">
+     <property name="text">
+      <string>Cache join layer in virtual memory</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="1">
-    <widget class="QgsFieldComboBox" name="mJoinFieldComboBox"/>
+   <item row="4" column="0" colspan="2">
+    <widget class="QCheckBox" name="mCreateIndexCheckBox">
+     <property name="text">
+      <string>Create attribute index on join field</string>
+     </property>
+    </widget>
    </item>
-   <item row="3" column="1">
-    <widget class="QgsFieldComboBox" name="mTargetFieldComboBox"/>
+   <item row="8" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`
`26`	`26`	`#include <QStandardItemModel>`
`27`	`27`
`28`		`-QgsJoinDialog::QgsJoinDialog( QgsVectorLayer* layer, QWidget * parent, Qt::WindowFlags f )`
	`28`	`+QgsJoinDialog::QgsJoinDialog( QgsVectorLayer* layer, QList<QgsMapLayer> alreadyJoinedLayers, QWidget parent, Qt::WindowFlags f )`
`29`	`29`	`: QDialog( parent, f )`
`30`	`30`	`, mLayer( layer )`
`31`	`31`	`{`
`@@ -35,12 +35,13 @@ QgsJoinDialog::QgsJoinDialog( QgsVectorLayer* layer, QWidget * parent, Qt::Windo`
`35`	`35`	`{`
`36`	`36`	`return;`
`37`	`37`	`}`
	`38`	`+ // adds self layer to the joined layer (cannot join to itself)`
	`39`	`+ alreadyJoinedLayers.append( layer );`
`38`	`40`
`39`	`41`	`mTargetFieldComboBox->setLayer( mLayer );`
`40`		`- mJoinLayerComboBox->setExceptedLayerList( QList<QgsMapLayer*>() << mLayer );`
	`42`	`+ mJoinLayerComboBox->setExceptedLayerList( alreadyJoinedLayers );`
`41`	`43`	`connect( mJoinLayerComboBox, SIGNAL( layerChanged( QgsMapLayer* ) ), mJoinFieldComboBox, SLOT( setLayer( QgsMapLayer* ) ) );`
`42`	`44`	`connect( mJoinLayerComboBox, SIGNAL( layerChanged( QgsMapLayer* ) ), this, SLOT( joinedLayerChanged( QgsMapLayer* ) ) );`
`43`		`- connect( mJoinFieldComboBox, SIGNAL( fieldChanged( QString ) ), this, SLOT( allowAttrIndexCreation() ) );`
`44`	`45`
`45`	`46`	`mCacheInMemoryCheckBox->setChecked( true );`
`46`	`47`	`}`
`@@ -66,14 +67,14 @@ void QgsJoinDialog::setJoinInfo( const QgsVectorJoinInfo& joinInfo )`
`66`	`67`	`}`
`67`	`68`
`68`	`69`	`QStringList* lst = joinInfo.joinFieldNamesSubset();`
`69`		`- mUseJoinFieldsSubset->setChecked( lst->count() > 0 );`
	`70`	`+ mUseJoinFieldsSubset->setChecked( lst && lst->count() > 0 );`
`70`	`71`	`QAbstractItemModel* model = mJoinFieldsSubsetView->model();`
`71`	`72`	`if ( model )`
`72`	`73`	`{`
`73`	`74`	`for ( int i = 0; i < model->rowCount(); ++i )`
`74`	`75`	`{`
`75`	`76`	`QModelIndex index = model->index( i, 0 );`
`76`		`- if ( lst->contains( model->data( index, Qt::DisplayRole ).toString() ) )`
	`77`	`+ if ( lst && lst->contains( model->data( index, Qt::DisplayRole ).toString() ) )`
`77`	`78`	`{`
`78`	`79`	`model->setData( index, Qt::Checked, Qt::CheckStateRole );`
`79`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class APP_EXPORT QgsJoinDialog: public QDialog, private Ui::QgsJoinDialogBase`
`27`	`27`	`{`
`28`	`28`	`Q_OBJECT`
`29`	`29`	`public:`
`30`		`- QgsJoinDialog( QgsVectorLayer* layer, QWidget * parent = 0, Qt::WindowFlags f = 0 );`
	`30`	`+ QgsJoinDialog( QgsVectorLayer* layer, QList<QgsMapLayer> alreadyJoinedLayers, QWidget parent = 0, Qt::WindowFlags f = 0 );`
`31`	`31`	`~QgsJoinDialog();`
`32`	`32`
`33`	`33`	`/** Configure the dialog for an existing join */`
Original file line number	Diff line number	Diff line change
`@@ -1031,26 +1031,33 @@ void QgsVectorLayerProperties::showListOfStylesFromDatabase()`
`1031`	`1031`
`1032`	`1032`	`void QgsVectorLayerProperties::on_mButtonAddJoin_clicked()`
`1033`	`1033`	`{`
`1034`		`- QgsJoinDialog d( layer );`
	`1034`	`+ if ( !layer )`
	`1035`	`+ return;`
	`1036`	`+`
	`1037`	`+ QList<QgsMapLayer*> joinedLayers;`
	`1038`	`+ const QList< QgsVectorJoinInfo >& joins = layer->vectorJoins();`
	`1039`	`+ for ( int i = 0; i < joins.size(); ++i )`
	`1040`	`+ {`
	`1041`	`+ joinedLayers.append( QgsMapLayerRegistry::instance()->mapLayer( joins[i].joinLayerId ) );`
	`1042`	`+ }`
	`1043`	`+`
	`1044`	`+ QgsJoinDialog d( layer, joinedLayers );`
`1035`	`1045`	`if ( d.exec() == QDialog::Accepted )`
`1036`	`1046`	`{`
`1037`	`1047`	`QgsVectorJoinInfo info = d.joinInfo();`
`1038`		`- if ( layer )`
	`1048`	`+ //create attribute index if possible`
	`1049`	`+ if ( d.createAttributeIndex() )`
`1039`	`1050`	`{`
`1040`		`- //create attribute index if possible`
`1041`		`- if ( d.createAttributeIndex() )`
	`1051`	`+ QgsVectorLayer* joinLayer = qobject_cast<QgsVectorLayer*>( QgsMapLayerRegistry::instance()->mapLayer( info.joinLayerId ) );`
	`1052`	`+ if ( joinLayer )`
`1042`	`1053`	`{`
`1043`		`- QgsVectorLayer* joinLayer = qobject_cast<QgsVectorLayer*>( QgsMapLayerRegistry::instance()->mapLayer( info.joinLayerId ) );`
`1044`		`- if ( joinLayer )`
`1045`		`- {`
`1046`		`- joinLayer->dataProvider()->createAttributeIndex( joinLayer->pendingFields().indexFromName( info.joinFieldName ) );`
`1047`		`- }`
	`1054`	`+ joinLayer->dataProvider()->createAttributeIndex( joinLayer->pendingFields().indexFromName( info.joinFieldName ) );`
`1048`	`1055`	`}`
`1049`		`- layer->addJoin( info );`
`1050`		`- addJoinToTreeWidget( info );`
`1051`		`- pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() &&`
`1052`		`- !layer->isEditable() && layer->vectorJoins().size() < 1 );`
`1053`	`1056`	`}`
	`1057`	`+ layer->addJoin( info );`
	`1058`	`+ addJoinToTreeWidget( info );`
	`1059`	`+ pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() &&`
	`1060`	`+ !layer->isEditable() && layer->vectorJoins().size() < 1 );`
`1054`	`1061`	`mFieldsPropertiesDialog->init();`
`1055`	`1062`	`}`
`1056`	`1063`	`}`
`@@ -1063,6 +1070,7 @@ void QgsVectorLayerProperties::on_mButtonEditJoin_clicked()`
`1063`	`1070`	`return;`
`1064`	`1071`	`}`
`1065`	`1072`
	`1073`	`+ QList<QgsMapLayer*> joinedLayers;`
`1066`	`1074`	`QString joinLayerId = currentJoinItem->data( 0, Qt::UserRole ).toString();`
`1067`	`1075`	`const QList< QgsVectorJoinInfo >& joins = layer->vectorJoins();`
`1068`	`1076`	`int j = -1;`
`@@ -1071,17 +1079,22 @@ void QgsVectorLayerProperties::on_mButtonEditJoin_clicked()`
`1071`	`1079`	`if ( joins[i].joinLayerId == joinLayerId )`
`1072`	`1080`	`{`
`1073`	`1081`	`j = i;`
`1074`		`- break;`
	`1082`	`+ }`
	`1083`	`+ else`
	`1084`	`+ {`
	`1085`	`+ // remove already joined layers from possible list to be displayed in dialog`
	`1086`	`+ joinedLayers.append( QgsMapLayerRegistry::instance()->mapLayer( joins[i].joinLayerId ) );`
`1075`	`1087`	`}`
`1076`	`1088`	`}`
`1077`	`1089`	`if ( j == -1 )`
`1078`	`1090`	`{`
`1079`	`1091`	`return;`
`1080`	`1092`	`}`
`1081`	`1093`
`1082`		`- QgsJoinDialog d( layer );`
	`1094`	`+ QgsJoinDialog d( layer, joinedLayers );`
`1083`	`1095`	`d.setJoinInfo( joins[j] );`
`1084`	`1096`
	`1097`	`+`
`1085`	`1098`	`if ( d.exec() == QDialog::Accepted )`
`1086`	`1099`	`{`
`1087`	`1100`	`// remove old join`
`@@ -1090,24 +1103,22 @@ void QgsVectorLayerProperties::on_mButtonEditJoin_clicked()`
`1090`	`1103`
`1091`	`1104`	`// add the new edited`
`1092`	`1105`	`QgsVectorJoinInfo info = d.joinInfo();`
`1093`		`- if ( layer )`
	`1106`	`+`
	`1107`	`+ //create attribute index if possible`
	`1108`	`+ if ( d.createAttributeIndex() )`
`1094`	`1109`	`{`
`1095`		`- //create attribute index if possible`
`1096`		`- if ( d.createAttributeIndex() )`
	`1110`	`+ QgsVectorLayer* joinLayer = qobject_cast<QgsVectorLayer*>( QgsMapLayerRegistry::instance()->mapLayer( info.joinLayerId ) );`
	`1111`	`+ if ( joinLayer )`
`1097`	`1112`	`{`
`1098`		`- QgsVectorLayer* joinLayer = qobject_cast<QgsVectorLayer*>( QgsMapLayerRegistry::instance()->mapLayer( info.joinLayerId ) );`
`1099`		`- if ( joinLayer )`
`1100`		`- {`
`1101`		`- joinLayer->dataProvider()->createAttributeIndex( joinLayer->pendingFields().indexFromName( info.joinFieldName ) );`
`1102`		`- }`
	`1113`	`+ joinLayer->dataProvider()->createAttributeIndex( joinLayer->pendingFields().indexFromName( info.joinFieldName ) );`
`1103`	`1114`	`}`
`1104`		`- layer->addJoin( info );`
`1105`		`- addJoinToTreeWidget( info );`
`1106`		`-`
`1107`		`- pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() &&`
`1108`		`- !layer->isEditable() && layer->vectorJoins().size() < 1 );`
`1109`		`- mFieldsPropertiesDialog->init();`
`1110`	`1115`	`}`
	`1116`	`+ layer->addJoin( info );`
	`1117`	`+ addJoinToTreeWidget( info );`
	`1118`	`+`
	`1119`	`+ pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() &&`
	`1120`	`+ !layer->isEditable() && layer->vectorJoins().size() < 1 );`
	`1121`	`+ mFieldsPropertiesDialog->init();`
`1111`	`1122`	`}`
`1112`	`1123`	`}`
`1113`	`1124`