Showing with 7 additions and 2 deletions.

+6 −1 src/providers/mssql/qgsmssqlnewconnection.cpp

+1 −1 src/providers/mssql/qgsmssqlprovider.cpp
diff --git a/src/providers/mssql/qgsmssqlnewconnection.cpp b/src/providers/mssql/qgsmssqlnewconnection.cpp
@@ -169,8 +169,13 @@ void QgsMssqlNewConnection::testConnection()
   }
   else
   {
+    QString dbName = txtDatabase->text();
+    if ( dbName.isEmpty() )
+    {
+      dbName = txtService->text();
+    }
     QMessageBox::information( this,
                               tr( "Test connection" ),
-                              tr( "Connection to %1 was successful" ).arg( txtDatabase->text() ) );
+                              tr( "Connection to %1 was successful" ).arg( dbName ) );
   }
 }
diff --git a/src/providers/mssql/qgsmssqlprovider.cpp b/src/providers/mssql/qgsmssqlprovider.cpp
@@ -520,7 +520,7 @@ bool QgsMssqlProvider::nextFeature( QgsFeature& feature )
 
     if ( mFidCol >= 0 )
     {
-      feature.setFeatureId( mQuery.value( col ).toInt() );
+      feature.setFeatureId( mQuery.value( col ).toLongLong() );
       col++;
     }