make database (aka SID) optional for OCI connections

git-svn-id: http://svn.osgeo.org/qgis/trunk@11906 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 3, 2009 · 8c91f1c · 8c91f1c
1 parent 6315e6e
commit 8c91f1c
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/src/app/ogr/qgsogrhelperfunctions.cpp b/src/app/ogr/qgsogrhelperfunctions.cpp
@@ -56,10 +56,22 @@ QString createDatabaseURI( QString connectionType, QString host, QString databas
   }
   else if ( connectionType == "Oracle Spatial" )
   {
-    uri = "OCI:" + user + "/" + password
-          + "@" + host;
-          //MH 091102: connection to orcale does not seem to work with database name in uri
-          //+ "/" + database;
+    uri = "OCI:" + user;
+
+    if (( !user.isEmpty() && !password.isEmpty() ) ||
+        ( user.isEmpty() && password.isEmpty() ) )
+    {
+      uri += "/";
+      if ( !password.isEmpty() )
+        uri += password;
+    }
+
+    if ( !host.isEmpty() )
+    {
+      uri += "@" + host;
+      if ( !database.isEmpty() )
+        uri += "/" + database;
+    }
   }
   else if ( connectionType == "ODBC" )
   {