db manager: show database name in postgis connection details (fixes #3489)

jef-n · jef-n · commit 4915d7671ce0 · 2016-06-26T22:44:59.000+02:00
(cherry picked from commit ecf3b37)
diff --git a/python/plugins/db_manager/db_plugins/postgis/connector.py b/python/plugins/db_manager/db_plugins/postgis/connector.py
@@ -125,8 +125,8 @@ def __init__(self, uri):
 
         self.connection.set_isolation_level(psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT)
 
-        c = self._execute(None, u"SELECT current_user")
-        self.user = self._fetchone(c)
+        c = self._execute(None, u"SELECT current_user,current_database()")
+        self.user, self.dbname = self._fetchone(c)
         self._close_cursor(c)
 
         self._checkSpatial()
diff --git a/python/plugins/db_manager/db_plugins/postgis/info_model.py b/python/plugins/db_manager/db_plugins/postgis/info_model.py
@@ -22,10 +22,21 @@
 
 from PyQt4.QtGui import QApplication
 
-from ..info_model import TableInfo, VectorTableInfo, RasterTableInfo
+from ..info_model import TableInfo, VectorTableInfo, RasterTableInfo, DatabaseInfo
 from ..html_elems import HtmlSection, HtmlParagraph, HtmlTable, HtmlTableHeader, HtmlTableCol
 
 
+class PGDatabaseInfo(DatabaseInfo):
+
+    def connectionDetails(self):
+        tbl = [
+            (QApplication.translate("DBManagerPlugin", "Host:"), self.db.connector.host),
+            (QApplication.translate("DBManagerPlugin", "User:"), self.db.connector.user),
+            (QApplication.translate("DBManagerPlugin", "Database:"), self.db.connector.dbname)
+        ]
+        return HtmlTable(tbl)
+
+
 class PGTableInfo(TableInfo):
 
     def __init__(self, table):
diff --git a/python/plugins/db_manager/db_plugins/postgis/plugin.py b/python/plugins/db_manager/db_plugins/postgis/plugin.py
@@ -111,6 +111,10 @@ def connectorsFactory(self, uri):
     def dataTablesFactory(self, row, db, schema=None):
         return PGTable(row, db, schema)
 
+    def info(self):
+        from .info_model import PGDatabaseInfo
+        return PGDatabaseInfo(self)
+
     def vectorTablesFactory(self, row, db, schema=None):
         return PGVectorTable(row, db, schema)
 
