db provider: Use connection name instead of potentially empty database name when reporting connection success

jef-n · jef-n · commit 761cdaf30af1 · 2018-07-04T18:56:13.000+02:00
diff --git a/src/providers/db2/qgsdb2newconnection.cpp b/src/providers/db2/qgsdb2newconnection.cpp
@@ -176,7 +176,7 @@ bool QgsDb2NewConnection::testConnection()
   if ( errMsg.isEmpty() )
   {
     QgsDebugMsg( "connection open succeeded " + connInfo );
-    bar->pushMessage( tr( "Connection to %1 was successful." ).arg( txtDatabase->text() ),
+    bar->pushMessage( tr( "Connection to %1 was successful." ).arg( txtName->text() ),
                       Qgis::Info );
     return true;
   }
diff --git a/src/providers/oracle/qgsoraclenewconnection.cpp b/src/providers/oracle/qgsoraclenewconnection.cpp
@@ -159,7 +159,7 @@ void QgsOracleNewConnection::testConnection()
   if ( conn )
   {
     // Database successfully opened; we can now issue SQL commands.
-    bar->pushMessage( tr( "Connection to %1 was successful." ).arg( txtDatabase->text() ),
+    bar->pushMessage( tr( "Connection to %1 was successful." ).arg( txtName->text() ),
                       Qgis::Info );
     // free connection resources
     QgsOracleConnPool::instance()->releaseConnection( conn );
diff --git a/src/providers/postgres/qgspgnewconnection.cpp b/src/providers/postgres/qgspgnewconnection.cpp
@@ -205,7 +205,7 @@ void QgsPgNewConnection::testConnection()
   if ( conn )
   {
     // Database successfully opened; we can now issue SQL commands.
-    bar->pushMessage( tr( "Connection to %1 was successful." ).arg( txtDatabase->text() ),
+    bar->pushMessage( tr( "Connection to %1 was successful." ).arg( txtName->text() ),
                       Qgis::Info );
 
     // free pg connection resources

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ bool QgsDb2NewConnection::testConnection()`
`176`	`176`	`if ( errMsg.isEmpty() )`
`177`	`177`	`{`
`178`	`178`	`QgsDebugMsg( "connection open succeeded " + connInfo );`
`179`		`- bar->pushMessage( tr( "Connection to %1 was successful." ).arg( txtDatabase->text() ),`
	`179`	`+ bar->pushMessage( tr( "Connection to %1 was successful." ).arg( txtName->text() ),`
`180`	`180`	`Qgis::Info );`
`181`	`181`	`return true;`
`182`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ void QgsOracleNewConnection::testConnection()`
`159`	`159`	`if ( conn )`
`160`	`160`	`{`
`161`	`161`	`// Database successfully opened; we can now issue SQL commands.`
`162`		`- bar->pushMessage( tr( "Connection to %1 was successful." ).arg( txtDatabase->text() ),`
	`162`	`+ bar->pushMessage( tr( "Connection to %1 was successful." ).arg( txtName->text() ),`
`163`	`163`	`Qgis::Info );`
`164`	`164`	`// free connection resources`
`165`	`165`	`QgsOracleConnPool::instance()->releaseConnection( conn );`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ void QgsPgNewConnection::testConnection()`
`205`	`205`	`if ( conn )`
`206`	`206`	`{`
`207`	`207`	`// Database successfully opened; we can now issue SQL commands.`
`208`		`- bar->pushMessage( tr( "Connection to %1 was successful." ).arg( txtDatabase->text() ),`
	`208`	`+ bar->pushMessage( tr( "Connection to %1 was successful." ).arg( txtName->text() ),`
`209`	`209`	`Qgis::Info );`
`210`	`210`
`211`	`211`	`// free pg connection resources`