Merge pull request #221 from szekerest/master

Specify port 1433 for FreeTDS by default. Allow to specify server/database/uid/password when the driver setting is present
qgis · Sep 3, 2012 · 7870603 · 7870603
2 parents 70fc079 + c322cd5
commit 7870603
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/src/providers/mssql/qgsmssqlprovider.cpp b/src/providers/mssql/qgsmssqlprovider.cpp
@@ -214,19 +214,20 @@ QSqlDatabase QgsMssqlProvider::GetDatabase( QString driver, QString host, QStrin
 #ifdef WIN32
     connectionString = "driver={SQL Server}";
 #else
-    connectionString = "driver={FreeTDS}";
+    connectionString = "driver={FreeTDS};port=1433";
 #endif
-    if ( !host.isEmpty() )
-      connectionString += ";server=" + host;
+  }
 
-    if ( !database.isEmpty() )
-      connectionString += ";database=" + database;
+  if ( !host.isEmpty() )
+    connectionString += ";server=" + host;
 
-    if ( password.isEmpty() )
-      connectionString += ";trusted_connection=yes";
-    else
-      connectionString += ";uid=" + username + ";pwd=" + password;
-  }
+  if ( !database.isEmpty() )
+    connectionString += ";database=" + database;
+
+  if ( password.isEmpty() )
+    connectionString += ";trusted_connection=yes";
+  else
+    connectionString += ";uid=" + username + ";pwd=" + password;
 
   if ( !username.isEmpty() )
     db.setUserName( username );