Fix another test

qgis · Mar 14, 2020 · 55d3761 · 55d3761
1 parent 3c11776
commit 55d3761
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/core/processing/qgsprocessingalgorithm.cpp b/src/core/processing/qgsprocessingalgorithm.cpp
@@ -603,7 +603,7 @@ QgsFeatureSink *QgsProcessingAlgorithm::parameterAsSink( const QVariantMap &para
   {
     return QgsProcessingParameters::parameterAsSink( parameterDefinition( name ), parameters, fields, geometryType, crs, context, destinationIdentifier, sinkFlags );
   }
-  catch ( QgsProcessingException )
+  catch ( QgsProcessingException & )
   {
     throw QgsProcessingException( QObject::tr( "No parameter definition for the sink '%1'" ).arg( name ) );
   }

diff --git a/src/gui/qgsdatabasetablecombobox.cpp b/src/gui/qgsdatabasetablecombobox.cpp
@@ -128,8 +128,14 @@ void QgsDatabaseTableComboBox::setConnectionName( const QString &connection, con
   const QString oldTable = currentTable();
   const QString oldSchema = currentSchema();
   QgsDatabaseTableModel *oldModel = mModel;
-  mModel = new QgsDatabaseTableModel( mProvider, mConnection, mSchema, this );
-  mModel->setAllowEmptyTable( mAllowEmpty );
+  if ( !mConnection.isEmpty() )
+  {
+    mModel = new QgsDatabaseTableModel( mProvider, mConnection, mSchema, this );
+    mModel->setAllowEmptyTable( mAllowEmpty );
+  }
+  else
+    mModel = nullptr;
+
   mSortModel->setSourceModel( mModel );
   if ( oldModel )
     oldModel->deleteLater();