sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

[postgres][db2] username and authcfg are not mutually exclusive (followup aae7a325)

Browse Source
This commit is contained in:
Juergen E. Fischer 2018-07-04 19:21:38 +02:00
parent 761cdaf30a
commit fba9982beb
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/providers/db2/qgsdb2dataitems.cpp
View File

@ -84,18 +84,18 @@ bool QgsDb2ConnectionItem::ConnInfoFromParameters(
{
connInfo += "authcfg='" + authcfg + "' ";
}
else // include user and password if authcfg is empty
{
if ( !username.isEmpty() )
{
connInfo += "user='" + username + "' ";
}
if ( !password.isEmpty() )
{
connInfo += "password='" + password + "' ";
}
if ( !password.isEmpty() )
{
// include password if authcfg is empty
connInfo += "password='" + password + "' ";
}
if ( !username.isEmpty() )
{
connInfo += "user='" + username + "' ";
}
QgsDebugMsg( "connInfo: '" + connInfo + "'" );
return true;
}

6
src/providers/postgres/qgspostgresconn.cpp
View File

@ -1788,12 +1788,6 @@ QgsDataSourceUri QgsPostgresConn::connUri( const QString &connName )
QString authcfg = settings.value( key + "/authcfg" ).toString();
if ( !authcfg.isEmpty() )
{
username.clear();
password.clear();
}
QgsDataSourceUri uri;
if ( !service.isEmpty() )
{