fix #2026

jef · jef · commit 2700a3d0d953 · 2010-02-11T12:36:37.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12927 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/ogr/qgsogrhelperfunctions.cpp b/src/app/ogr/qgsogrhelperfunctions.cpp
@@ -97,11 +97,23 @@ QString createDatabaseURI( QString connectionType, QString host, QString databas
         uri += password;
     }
 
-    if ( !host.isEmpty() )
+    if ( !host.isEmpty() || !database.isEmpty() )
     {
-      uri += "@" + host;
+      uri += "@";
+
+      if ( !host.isEmpty() )
+      {
+        uri += host;
+        if ( !port.isEmpty() )
+          uri += ":" + port;
+      }
+
       if ( !database.isEmpty() )
-        uri += "/" + database;
+      {
+        if ( !host.isEmpty() )
+          uri += "/";
+        uri += database;
+      }
     }
   }
   else if ( connectionType == "ODBC" )
