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

Author: jef-n

src/providers/db2/qgsdb2dataitems.cpp

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

src/providers/postgres/qgspostgresconn.cpp

@@ -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() )
   {