sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-15 00:02:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

QgsAuthBasicMethod::updateDataSourceUriItems(): remove several useless checks

Browse Source
This commit is contained in:
Even Rouault 2020-05-29 01:00:12 +02:00
parent 0b2b78a149
commit f9610ea3bf
No known key found for this signature in database
GPG Key ID: 33EBBFC47B3DD87D
1 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/auth/basic/qgsauthbasicmethod.cpp
View File

@ -154,13 +154,8 @@ bool QgsAuthBasicMethod::updateDataSourceUriItems( QStringList &connectionItems,
uri.chop( 1 ); uri.chop( 1 );
chopped = true; chopped = true;
} }
if ( !username.isEmpty() ) uri += QStringLiteral( " user='%1'" ).arg( username );
{ uri += QStringLiteral( " password='%1'" ).arg( password );
uri += QStringLiteral( " user='%1'" ).arg( username );
if ( !password.isEmpty() )
uri += QStringLiteral( " password='%1'" ).arg( password );
}
// add extra CAs // add extra CAs
if ( ! caparam.isEmpty() ) if ( ! caparam.isEmpty() )
{ {
@ -182,30 +177,25 @@ bool QgsAuthBasicMethod::updateDataSourceUriItems( QStringList &connectionItems,
chopped = true; chopped = true;
} }
uri += QStringLiteral( " user=%1" ).arg( username ); uri += QStringLiteral( " user=%1" ).arg( username );
if ( !password.isEmpty() ) uri += QStringLiteral( " pass=%1" ).arg( password );
uri += QStringLiteral( " pass=%1" ).arg( password );
if ( chopped ) if ( chopped )
uri += '"'; uri += '"';
} }
else if ( uri.startsWith( QLatin1String( "@driver=ingres" ) ) ) else if ( uri.startsWith( QLatin1String( "@driver=ingres" ) ) )
{ {
uri += QStringLiteral( ",userid=%1" ).arg( username ); uri += QStringLiteral( ",userid=%1" ).arg( username );
if ( !password.isEmpty() ) uri += QStringLiteral( ",password=%1" ).arg( password );
uri += QStringLiteral( ",password=%1" ).arg( password );
} }
else if ( uri.startsWith( QLatin1String( "MySQL:" ) ) ) else if ( uri.startsWith( QLatin1String( "MySQL:" ) ) )
{ {
uri += QStringLiteral( ",user=%1" ).arg( username ); uri += QStringLiteral( ",user=%1" ).arg( username );
if ( !password.isEmpty() ) uri += QStringLiteral( ",password=%1" ).arg( password );
uri += QStringLiteral( ",password=%1" ).arg( password );
} }
else if ( uri.startsWith( QLatin1String( "MSSQL:" ) ) ) else if ( uri.startsWith( QLatin1String( "MSSQL:" ) ) )
{ {
uri += QStringLiteral( ";uid=%1" ).arg( username ); uri += QStringLiteral( ";uid=%1" ).arg( username );
uri = uri.replace( QLatin1String( ";trusted_connection=yes" ), QString() ); uri = uri.replace( QLatin1String( ";trusted_connection=yes" ), QString() );
uri += QStringLiteral( ";pwd=%1" ).arg( password );
if ( !password.isEmpty() )
uri += QStringLiteral( ";pwd=%1" ).arg( password );
} }
else if ( uri.startsWith( QLatin1String( "OCI:" ) ) ) else if ( uri.startsWith( QLatin1String( "OCI:" ) ) )
{ {
@ -214,14 +204,7 @@ bool QgsAuthBasicMethod::updateDataSourceUriItems( QStringList &connectionItems,
} }
else if ( uri.startsWith( QLatin1String( "ODBC:" ) ) ) else if ( uri.startsWith( QLatin1String( "ODBC:" ) ) )
{ {
if ( password.isEmpty() ) uri = uri.replace( QRegExp( "^ODBC:@?" ), "ODBC:" + username + '/' + password + '@' );
{
uri = uri.replace( QRegExp( "^ODBC:@?" ), "ODBC:" + username + '@' );
}
else
{
uri = uri.replace( QRegExp( "^ODBC:@?" ), "ODBC:" + username + '/' + password + '@' );
}
} }
else if ( uri.startsWith( QLatin1String( "couchdb" ) ) else if ( uri.startsWith( QLatin1String( "couchdb" ) )
|| uri.startsWith( QLatin1String( "DODS" ) ) || uri.startsWith( QLatin1String( "DODS" ) )