processing: fix interpretation of oracle layers (fixes #12590)

Funded by norbit.de
qgis · Apr 20, 2015 · f0daab9 · f0daab9
1 parent 085d0ad
commit f0daab9
Showing 1 changed file with 31 additions and 2 deletions.
diff --git a/python/plugins/processing/algs/gdal/OgrAlgorithm.py b/python/plugins/processing/algs/gdal/OgrAlgorithm.py
@@ -66,8 +66,8 @@ def ogrConnectionString(self, uri):
                     if not ok:
                         break
 
-                    dsUri.setUsername( user )
-                    dsUri.setPassword( passwd )
+                    dsUri.setUsername(user)
+                    dsUri.setPassword(passwd)
 
             if not conn:
                 raise RuntimeError('Could not connect to PostgreSQL database - check connection info')
@@ -76,6 +76,35 @@ def ogrConnectionString(self, uri):
                 QgsCredentials.instance().put(conninfo, user, passwd)
 
             ogrstr = "PG:%s" % dsUri.connectionInfo()
+        elif provider == "oracle":
+            # OCI:user/password@host:port/service:table
+            dsUri = QgsDataSourceURI(layer.dataProvider().dataSourceUri())
+            ogrstr = "OCI:"
+            if dsUri.username() != "":
+                ogrstr += dsUri.username()
+                if dsUri.password() != "":
+                    ogr += "/" + dsUri.password()
+                delim = "@"
+
+            if dsUri.host() != "":
+                ogrstr += delim + dsUri.host()
+                delim = ""
+                if dsUri.port() != "" and dsUri.port() != 1521:
+                    ogrstr += ":%d" % dsUri.port()
+                ogrstr += "/"
+                if dsUri.database() != "":
+                    ogrstr += dsUri.database()
+            elif dsUri.database() != "":
+                ogrstr += delim + dsUri.database()
+
+            if ogrstr == "OCI:":
+                raise RuntimeError('Invalid oracle data source - check connection info')
+
+            ogrstr += ":"
+            if dsUri.schema() != "":
+                ogrstr += dsUri.schema() + "."
+
+            ogrstr += dsUri.table()
         else:
             ogrstr = unicode(layer.source()).split("|")[0]