explicitly call QgsDataSourceURI.connectionInfo() with appropriate pa…

…rameter
qgis · Jan 13, 2016 · ef91882 · ef91882
1 parent 93ab890
commit ef91882
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/python/plugins/db_manager/db_plugins/oracle/connector.py b/python/plugins/db_manager/db_plugins/oracle/connector.py
@@ -125,7 +125,7 @@ def __init__(self, uri, connName):
         self._checkGeometryColumnsTable()
 
     def _connectionInfo(self):
-        return unicode(self._uri.connectionInfo())
+        return unicode(self._uri.connectionInfo(True))
 
     def _checkSpatial(self):
         """Check whether Oracle Spatial is present in catalog."""

diff --git a/python/plugins/db_manager/db_plugins/oracle/plugin.py b/python/plugins/db_manager/db_plugins/oracle/plugin.py
@@ -129,7 +129,7 @@ def connect(self, parent=None):
         max_attempts = 3
         for i in range(max_attempts):
             (ok, username, password) = QgsCredentials.instance().get(
-                uri.connectionInfo(), username, password, err)
+                uri.connectionInfo(False), username, password, err)
 
             if not ok:
                 return False
@@ -145,7 +145,7 @@ def connect(self, parent=None):
                 continue
 
             QgsCredentials.instance().put(
-                uri.connectionInfo(), username, password)
+                uri.connectionInfo(False), username, password)
 
             return True
 

diff --git a/python/plugins/db_manager/db_plugins/postgis/connector.py b/python/plugins/db_manager/db_plugins/postgis/connector.py
@@ -56,7 +56,7 @@ def __init__(self, uri):
         except self.connection_error_types() as e:
             err = unicode(e)
             uri = self.uri()
-            conninfo = uri.connectionInfo()
+            conninfo = uri.connectionInfo(False)
 
             for i in range(3):
                 (ok, username, password) = QgsCredentials.instance().get(conninfo, username, password, err)
@@ -70,7 +70,7 @@ def __init__(self, uri):
                     uri.setPassword(password)
 
                 try:
-                    self.connection = psycopg2.connect(uri.connectionInfo().encode('utf-8'))
+                    self.connection = psycopg2.connect(uri.connectionInfo(True).encode('utf-8'))
                     QgsCredentials.instance().put(conninfo, username, password)
                 except self.connection_error_types() as e:
                     if i == 2:
@@ -90,7 +90,7 @@ def __init__(self, uri):
         self._checkRasterColumnsTable()
 
     def _connectionInfo(self):
-        return unicode(self.uri().connectionInfo())
+        return unicode(self.uri().connectionInfo(True))
 
     def _checkSpatial(self):
         """ check whether postgis_version is present in catalog """

diff --git a/python/plugins/db_manager/db_plugins/postgis/plugin.py b/python/plugins/db_manager/db_plugins/postgis/plugin.py
@@ -292,7 +292,7 @@ def toMapLayer(self):
         if not rl.isValid():
             err = rl.error().summary()
             uri = QgsDataSourceURI(self.database().uri())
-            conninfo = uri.connectionInfo()
+            conninfo = uri.connectionInfo(False)
             username = uri.username()
             password = uri.password()