processing: verify postgresql access and request credentials if neces…

…sary (fixes #12137)
qgis · Feb 12, 2015 · f540cd1 · f540cd1 · gioman · Feb 17, 2015
1 parent e96b204
commit f540cd1
Showing 1 changed file with 21 additions and 6 deletions.
diff --git a/python/plugins/processing/algs/gdal/OgrAlgorithm.py b/python/plugins/processing/algs/gdal/OgrAlgorithm.py
@@ -27,6 +27,7 @@
 
 import re
 import os
+import psycopg2
 
 from qgis.core import QgsDataSourceURI, QgsCredentials
 
@@ -54,14 +55,28 @@ def ogrConnectionString(self, uri):
             # key='gid' estimatedmetadata=true srid=4326 type=MULTIPOLYGON
             # table="t4" (geom) sql=
             dsUri = QgsDataSourceURI(layer.dataProvider().dataSourceUri())
-            connInfo = dsUri.connectionInfo()
-            (success, user, passwd ) = QgsCredentials.instance().get(connInfo, None, None)
-            if success:
-                QgsCredentials.instance().put(connInfo, user, passwd)
-            ogrstr = ("PG:dbname='%s' host='%s' port='%s' user='%s' password='%s'"
-                      % (dsUri.database(), dsUri.host(), dsUri.port(), user, passwd))
+            conninfo = dsUri.connectionInfo()
+
+            conn = None
+            while not conn:
+                try:
+                    conn = psycopg2.connect(dsUri.connectionInfo())
+                except psycopg2.OperationalError, e:
+                    (ok, user, passwd ) = QgsCredentials.instance().get(conninfo, dsUri.username(), dsUri.password())
+                    if not ok:
+                        break
+
+                    dsUri.setUsername( user )
+                    dsUri.setPassword( passwd )
+
+            if not conn:
+                raise RuntimeError('Could not connect to PostgreSQL database - check connection info')
+
+            QgsCredentials.instance().put(conninfo, user, passwd)
+            ogrstr = "PG:%s" % dsUri.connectionInfo()
         else:
             ogrstr = unicode(layer.source()).split("|")[0]
+
         return '"' + ogrstr + '"'
 
     def ogrLayerName(self, uri):