Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #46476 from qgis/backport-46470-to-release-3_22
  • Loading branch information
m-kuhn committed Dec 14, 2021
2 parents 393bbf7 + b050ce9 commit bb2df72
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/core/providers/ogr/qgsogrproviderutils.cpp
Expand Up @@ -2579,9 +2579,9 @@ bool QgsOgrProviderUtils::saveConnection( const QString &path, const QString &og
if ( ok && ! connName.isEmpty() )
{
QgsProviderMetadata *providerMetadata = QgsProviderRegistry::instance()->providerMetadata( QStringLiteral( "ogr" ) );
QgsGeoPackageProviderConnection *providerConnection = static_cast<QgsGeoPackageProviderConnection *>( providerMetadata->createConnection( connName ) );
std::unique_ptr< QgsGeoPackageProviderConnection > providerConnection( qgis::down_cast<QgsGeoPackageProviderConnection *>( providerMetadata->createConnection( connName ) ) );
providerConnection->setUri( path );
providerMetadata->saveConnection( providerConnection, connName );
providerMetadata->saveConnection( providerConnection.get(), connName );
return true;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/providers/postgres/qgspgnewconnection.cpp
Expand Up @@ -189,10 +189,10 @@ void QgsPgNewConnection::accept()
configuration.insert( "projectsInDatabase", cb_projectsInDatabase->isChecked() );

QgsProviderMetadata *providerMetadata = QgsProviderRegistry::instance()->providerMetadata( QStringLiteral( "postgres" ) );
QgsPostgresProviderConnection *providerConnection = static_cast<QgsPostgresProviderConnection *>( providerMetadata->createConnection( txtName->text() ) );
std::unique_ptr< QgsPostgresProviderConnection > providerConnection( qgis::down_cast<QgsPostgresProviderConnection *>( providerMetadata->createConnection( txtName->text() ) ) );
providerConnection->setUri( QgsPostgresConn::connUri( txtName->text() ).uri( false ) );
providerConnection->setConfiguration( configuration );
providerMetadata->saveConnection( providerConnection, txtName->text() );
providerMetadata->saveConnection( providerConnection.get(), txtName->text() );

QDialog::accept();
}
Expand Down
4 changes: 2 additions & 2 deletions src/providers/spatialite/qgsspatialitesourceselect.cpp
Expand Up @@ -317,8 +317,8 @@ bool QgsSpatiaLiteSourceSelect::newConnection( QWidget *parent )

// inserting this SQLite DB path
QgsProviderMetadata *providerMetadata = QgsProviderRegistry::instance()->providerMetadata( QStringLiteral( "spatialite" ) );
QgsSpatiaLiteProviderConnection *providerConnection = static_cast<QgsSpatiaLiteProviderConnection *>( providerMetadata->createConnection( dsUri.uri(), QVariantMap() ) );
providerMetadata->saveConnection( providerConnection, savedName );
std::unique_ptr< QgsSpatiaLiteProviderConnection > providerConnection( qgis::down_cast<QgsSpatiaLiteProviderConnection *>( providerMetadata->createConnection( dsUri.uri(), QVariantMap() ) ) );
providerMetadata->saveConnection( providerConnection.get(), savedName );
return true;
}

Expand Down

0 comments on commit bb2df72

Please sign in to comment.