Skip to content
Permalink
Browse files

Fix another test

  • Loading branch information
nyalldawson committed Mar 14, 2020
1 parent 3c11776 commit 55d37614cb07893d948899a4a970a6b907fc2d0b
Showing with 9 additions and 3 deletions.
  1. +1 −1 src/core/processing/qgsprocessingalgorithm.cpp
  2. +8 −2 src/gui/qgsdatabasetablecombobox.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 ) );
}
@@ -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();

0 comments on commit 55d3761

Please sign in to comment.
You can’t perform that action at this time.