[mssql] Always use connection method with full QgsDataSourceUri

Remove the older method which took explicit host/database/service/...
arguments, and ensure we always use the method which takes a full
QgsDataSourceUri argument. This ensures that the db connection
always has access to ALL the properties of the original data source
uri, including any additional parameters set on it.

src/providers/mssql/qgsmssqlconnection.cpp

@@ -107,7 +107,7 @@ bool QgsMssqlConnection::dropView( const QString &uri, QString *errorMessage )
   const QgsDataSourceUri dsUri( uri );
 
   // connect to database
-  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( dsUri.service(), dsUri.host(), dsUri.database(), dsUri.username(), dsUri.password() );
+  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( dsUri );
   const QString schema = dsUri.schema();
   const QString table = dsUri.table();
 
@@ -134,7 +134,7 @@ bool QgsMssqlConnection::dropTable( const QString &uri, QString *errorMessage )
   const QgsDataSourceUri dsUri( uri );
 
   // connect to database
-  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( dsUri.service(), dsUri.host(), dsUri.database(), dsUri.username(), dsUri.password() );
+  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( dsUri );
   const QString schema = dsUri.schema();
   const QString table = dsUri.table();
 
@@ -165,7 +165,7 @@ bool QgsMssqlConnection::truncateTable( const QString &uri, QString *errorMessag
   const QgsDataSourceUri dsUri( uri );
 
   // connect to database
-  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( dsUri.service(), dsUri.host(), dsUri.database(), dsUri.username(), dsUri.password() );
+  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( dsUri );
   const QString schema = dsUri.schema();
   const QString table = dsUri.table();
 
@@ -194,7 +194,7 @@ bool QgsMssqlConnection::createSchema( const QString &uri, const QString &schema
   const QgsDataSourceUri dsUri( uri );
 
   // connect to database
-  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( dsUri.service(), dsUri.host(), dsUri.database(), dsUri.username(), dsUri.password() );
+  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( dsUri );
 
   if ( !db->isValid() )
   {
@@ -221,7 +221,7 @@ QStringList QgsMssqlConnection::schemas( const QString &uri, QString *errorMessa
   const QgsDataSourceUri dsUri( uri );
 
   // connect to database
-  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( dsUri.service(), dsUri.host(), dsUri.database(), dsUri.username(), dsUri.password() );
+  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( dsUri );
 
   return schemas( std::move( db ), errorMessage );
 }

src/providers/mssql/qgsmssqldatabase.cpp

@@ -69,17 +69,6 @@ std::shared_ptr<QgsMssqlDatabase> QgsMssqlDatabase::connectDb( const QString &ur
   return connectDb( dsUri, transaction );
 }
 
-std::shared_ptr<QgsMssqlDatabase> QgsMssqlDatabase::connectDb( const QString &service, const QString &host, const QString &database, const QString &username, const QString &password, bool transaction )
-{
-  QgsDataSourceUri uri;
-  uri.setService( service );
-  uri.setHost( host );
-  uri.setDatabase( database );
-  uri.setUsername( username );
-  uri.setPassword( password );
-  return connectDb( uri, transaction );
-}
-
 std::shared_ptr<QgsMssqlDatabase> QgsMssqlDatabase::connectDb( const QgsDataSourceUri &uri, bool transaction )
 {
   // try to use existing conn or create a new one

src/providers/mssql/qgsmssqldatabase.h

@@ -63,7 +63,6 @@ class QgsMssqlDatabase
      * \note The function is thread-safe
      */
     static std::shared_ptr<QgsMssqlDatabase> connectDb( const QString &uri, bool transaction = false );
-    static std::shared_ptr<QgsMssqlDatabase> connectDb( const QString &service, const QString &host, const QString &database, const QString &username, const QString &password, bool transaction = false );
     static std::shared_ptr<QgsMssqlDatabase> connectDb( const QgsDataSourceUri &uri, bool transaction = false );
 
     /////

src/providers/mssql/qgsmssqldataitems.cpp

@@ -133,7 +133,13 @@ QVector<QgsDataItem *> QgsMssqlConnectionItem::createChildren()
 
   readConnectionSettings();
 
-  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( mService, mHost, mDatabase, mUsername, mPassword );
+  QgsDataSourceUri uri;
+  uri.setService( mService );
+  uri.setHost( mHost );
+  uri.setDatabase( mDatabase );
+  uri.setUsername( mUsername );
+  uri.setPassword( mPassword );
+  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( uri );
 
   if ( !db->isValid() )
   {

src/providers/mssql/qgsmssqlfeatureiterator.cpp

@@ -454,7 +454,7 @@ bool QgsMssqlFeatureIterator::fetchFeature( QgsFeature &feature )
     {
       // No existing connection, so set it up now. It's safe to do here as we're now in
       // the thread were iteration is actually occurring.
-      mDatabase = QgsMssqlDatabase::connectDb( mSource->mService, mSource->mHost, mSource->mDatabaseName, mSource->mUserName, mSource->mPassword );
+      mDatabase = QgsMssqlDatabase::connectDb( mSource->mUri );
     }
 
     if ( !mDatabase->isValid() )
@@ -710,11 +710,7 @@ QgsMssqlFeatureSource::QgsMssqlFeatureSource( const QgsMssqlProvider *p )
   , mSchemaName( p->mSchemaName )
   , mTableName( p->mTableName )
   , mQuery( p->mQuery )
-  , mUserName( p->mUserName )
+  , mUri( p->mUri )
-  , mPassword( p->mPassword )
-  , mService( p->mService )
-  , mDatabaseName( p->mDatabaseName )
-  , mHost( p->mHost )
   , mSqlWhereClause( p->mSqlWhereClause )
   , mDisableInvalidGeometryHandling( p->mDisableInvalidGeometryHandling )
   , mCrs( p->crs() )

src/providers/mssql/qgsmssqlfeatureiterator.h

@@ -59,13 +59,7 @@ class QgsMssqlFeatureSource final : public QgsAbstractFeatureSource
     QString mQuery;
 
     // login
-    QString mUserName;
+    QgsDataSourceUri mUri;
-    QString mPassword;
-
-    // server access
-    QString mService;
-    QString mDatabaseName;
-    QString mHost;
 
     // SQL statement used to limit the features retrieved
     QString mSqlWhereClause;

src/providers/mssql/qgsmssqlgeomcolumntypethread.cpp

@@ -48,7 +48,14 @@ void QgsMssqlGeomColumnTypeThread::run()
 {
   mStopped = false;
 
-  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( mService, mHost, mDatabase, mUsername, mPassword );
+  QgsDataSourceUri uri;
+  uri.setService( mService );
+  uri.setHost( mHost );
+  uri.setDatabase( mDatabase );
+  uri.setUsername( mUsername );
+  uri.setPassword( mPassword );
+
+  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( uri );
   if ( !db->isValid() )
   {
     QgsDebugError( db->errorText() );

src/providers/mssql/qgsmssqlnewconnection.cpp

@@ -293,7 +293,13 @@ std::shared_ptr<QgsMssqlDatabase> QgsMssqlNewConnection::getDatabase( const QStr
     database = item->text();
   }
 
-  return QgsMssqlDatabase::connectDb( txtService->text().trimmed(), txtHost->text().trimmed(), database, txtUsername->text().trimmed(), txtPassword->text().trimmed() );
+  QgsDataSourceUri uri;
+  uri.setService( txtService->text().trimmed() );
+  uri.setHost( txtHost->text().trimmed() );
+  uri.setDatabase( database );
+  uri.setUsername( txtUsername->text().trimmed() );
+  uri.setPassword( txtPassword->text().trimmed() );
+  return QgsMssqlDatabase::connectDb( uri );
 }
 
 

src/providers/mssql/qgsmssqlprovider.cpp

@@ -71,42 +71,35 @@ int QgsMssqlProvider::sConnectionId = 0;
 
 QgsMssqlProvider::QgsMssqlProvider( const QString &uri, const ProviderOptions &options, Qgis::DataProviderReadFlags flags )
   : QgsVectorDataProvider( uri, options, flags )
+  , mUri( uri )
   , mShared( new QgsMssqlSharedData )
 {
-  const QgsDataSourceUri anUri = QgsDataSourceUri( uri );
+  if ( !mUri.srid().isEmpty() )
-
+    mSRId = mUri.srid().toInt();
-  if ( !anUri.srid().isEmpty() )
-    mSRId = anUri.srid().toInt();
   else
     mSRId = -1;
 
-  mWkbType = anUri.wkbType();
+  mWkbType = mUri.wkbType();
 
   mValid = true;
 
-  mUserName = anUri.username();
+  mUseEstimatedMetadata = mUri.useEstimatedMetadata();
-  mPassword = anUri.password();
-  mService = anUri.service();
-  mDatabaseName = anUri.database();
-  mHost = anUri.host();
-
-  mUseEstimatedMetadata = anUri.useEstimatedMetadata();
   if ( mReadFlags & Qgis::DataProviderReadFlag::TrustDataSource )
   {
     mUseEstimatedMetadata = true;
   }
 
-  mDisableInvalidGeometryHandling = anUri.hasParam( QStringLiteral( "disableInvalidGeometryHandling" ) )
+  mDisableInvalidGeometryHandling = mUri.hasParam( QStringLiteral( "disableInvalidGeometryHandling" ) )
-                                      ? anUri.param( QStringLiteral( "disableInvalidGeometryHandling" ) ).toInt()
+                                      ? mUri.param( QStringLiteral( "disableInvalidGeometryHandling" ) ).toInt()
                                       : false;
 
-  mUseGeometryColumnsTableForExtent = anUri.hasParam( QStringLiteral( "extentInGeometryColumns" ) )
+  mUseGeometryColumnsTableForExtent = mUri.hasParam( QStringLiteral( "extentInGeometryColumns" ) )
-                                        ? anUri.param( QStringLiteral( "extentInGeometryColumns" ) ).toInt()
+                                        ? mUri.param( QStringLiteral( "extentInGeometryColumns" ) ).toInt()
                                         : false;
 
-  mSqlWhereClause = anUri.sql();
+  mSqlWhereClause = mUri.sql();
 
-  mConn = QgsMssqlDatabase::connectDb( mService, mHost, mDatabaseName, mUserName, mPassword, false );
+  mConn = QgsMssqlDatabase::connectDb( mUri, false );
   if ( !mConn )
   {
     mValid = false;
@@ -124,23 +117,23 @@ QgsMssqlProvider::QgsMssqlProvider( const QString &uri, const ProviderOptions &o
 
   // Database successfully opened; we can now issue SQL commands.
 
-  if ( mSchemaName.isEmpty() && anUri.table().startsWith( '(' ) && anUri.table().endsWith( ')' ) )
+  if ( mSchemaName.isEmpty() && mUri.table().startsWith( '(' ) && mUri.table().endsWith( ')' ) )
   {
     mIsQuery = true;
-    mQuery = anUri.table();
+    mQuery = mUri.table();
   }
   else
   {
     mIsQuery = false;
-    if ( !anUri.schema().isEmpty() )
+    if ( !mUri.schema().isEmpty() )
-      mSchemaName = anUri.schema();
+      mSchemaName = mUri.schema();
     else
       mSchemaName = QStringLiteral( "dbo" );
 
-    if ( !anUri.table().isEmpty() )
+    if ( !mUri.table().isEmpty() )
     {
       // the layer name has been specified
-      mTableName = anUri.table();
+      mTableName = mUri.table();
       QStringList sl = mTableName.split( '.' );
       if ( sl.length() == 2 )
       {
@@ -162,8 +155,8 @@ QgsMssqlProvider::QgsMssqlProvider( const QString &uri, const ProviderOptions &o
 
   if ( mValid )
   {
-    if ( !anUri.geometryColumn().isEmpty() )
+    if ( !mUri.geometryColumn().isEmpty() )
-      mGeometryColName = anUri.geometryColumn();
+      mGeometryColName = mUri.geometryColumn();
 
     if ( !mIsQuery )
     {
@@ -181,8 +174,8 @@ QgsMssqlProvider::QgsMssqlProvider( const QString &uri, const ProviderOptions &o
     UpdateStatistics( mUseEstimatedMetadata );
 
     //only for views, defined in layer data when loading layer for first time
-    bool primaryKeyFromGeometryColumnsTable = anUri.hasParam( QStringLiteral( "primaryKeyInGeometryColumns" ) )
+    bool primaryKeyFromGeometryColumnsTable = mUri.hasParam( QStringLiteral( "primaryKeyInGeometryColumns" ) )
-                                                ? anUri.param( QStringLiteral( "primaryKeyInGeometryColumns" ) ).toInt()
+                                                ? mUri.param( QStringLiteral( "primaryKeyInGeometryColumns" ) ).toInt()
                                                 : false;
 
     QStringList cols;
@@ -192,12 +185,12 @@ QgsMssqlProvider::QgsMssqlProvider( const QString &uri, const ProviderOptions &o
       mPrimaryKeyAttrs.clear();
       primaryKeyFromGeometryColumnsTable = getPrimaryKeyFromGeometryColumns( cols );
       if ( !primaryKeyFromGeometryColumnsTable )
-        QgsMessageLog::logMessage( tr( "Invalid primary key from geometry_columns table for layer '%1', get primary key from the layer." ).arg( anUri.table() ), tr( "MS SQL Server" ) );
+        QgsMessageLog::logMessage( tr( "Invalid primary key from geometry_columns table for layer '%1', get primary key from the layer." ).arg( mUri.table() ), tr( "MS SQL Server" ) );
     }
 
     if ( !primaryKeyFromGeometryColumnsTable )
     {
-      const QString primaryKey = anUri.keyColumn();
+      const QString primaryKey = mUri.keyColumn();
       if ( !primaryKey.isEmpty() )
       {
         mPrimaryKeyAttrs.clear();
@@ -2357,7 +2350,7 @@ bool QgsMssqlProviderMetadata::styleExists( const QString &uri, const QString &s
   errorCause.clear();
   const QgsDataSourceUri dsUri( uri );
   // connect to database
-  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( dsUri.service(), dsUri.host(), dsUri.database(), dsUri.username(), dsUri.password() );
+  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( dsUri );
 
   if ( !db->isValid() )
   {
@@ -2416,7 +2409,7 @@ bool QgsMssqlProviderMetadata::saveStyle( const QString &uri, const QString &qml
 {
   const QgsDataSourceUri dsUri( uri );
   // connect to database
-  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( dsUri.service(), dsUri.host(), dsUri.database(), dsUri.username(), dsUri.password() );
+  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( dsUri );
 
   if ( !db->isValid() )
   {
@@ -2580,7 +2573,7 @@ QString QgsMssqlProviderMetadata::loadStoredStyle( const QString &uri, QString &
   errCause.clear();
   const QgsDataSourceUri dsUri( uri );
   // connect to database
-  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( dsUri.service(), dsUri.host(), dsUri.database(), dsUri.username(), dsUri.password() );
+  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( dsUri );
 
   if ( !db->isValid() )
   {
@@ -2645,7 +2638,7 @@ int QgsMssqlProviderMetadata::listStyles( const QString &uri, QStringList &ids,
 {
   const QgsDataSourceUri dsUri( uri );
   // connect to database
-  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( dsUri.service(), dsUri.host(), dsUri.database(), dsUri.username(), dsUri.password() );
+  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( dsUri );
 
   if ( !db->isValid() )
   {
@@ -2742,7 +2735,7 @@ QString QgsMssqlProviderMetadata::getStyleById( const QString &uri, const QStrin
 {
   const QgsDataSourceUri dsUri( uri );
   // connect to database
-  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( dsUri.service(), dsUri.host(), dsUri.database(), dsUri.username(), dsUri.password() );
+  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( dsUri );
 
   if ( !db->isValid() )
   {

src/providers/mssql/qgsmssqlprovider.h

@@ -213,19 +213,12 @@ class QgsMssqlProvider final : public QgsVectorDataProvider
 
     mutable Qgis::WkbType mWkbType = Qgis::WkbType::Unknown;
 
+    QgsDataSourceUri mUri;
+
     // current layer name
     QString mSchemaName;
     QString mTableName;
 
-    // login
-    QString mUserName;
-    QString mPassword;
-
-    // server access
-    QString mService;
-    QString mDatabaseName;
-    QString mHost;
-
     // available tables
     QStringList mTables;
 

src/providers/mssql/qgsmssqlproviderconnection.cpp

@@ -256,7 +256,7 @@ QgsAbstractDatabaseProviderConnection::QueryResult QgsMssqlProviderConnection::e
   const QgsDataSourceUri dsUri { uri() };
 
   // connect to database
-  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( dsUri.service(), dsUri.host(), dsUri.database(), dsUri.username(), dsUri.password() );
+  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( dsUri );
 
   if ( !db->isValid() )
   {

src/providers/mssql/qgsmssqlsourceselect.cpp

@@ -404,7 +404,14 @@ void QgsMssqlSourceSelect::btnConnect_clicked()
     mConnInfo += " service='" + service + '\'';
 
   QgsDebugMsgLevel( QStringLiteral( "GetDatabase" ), 2 );
-  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( service, host, database, username, password );
+
+  QgsDataSourceUri uri;
+  uri.setService( service );
+  uri.setHost( host );
+  uri.setDatabase( database );
+  uri.setUsername( username );
+  uri.setPassword( password );
+  std::shared_ptr<QgsMssqlDatabase> db = QgsMssqlDatabase::connectDb( uri );
 
   if ( !db->isValid() )
   {