Don't include the -h option when calling pg_dump or pg_restore if there is no hostnam...

git-svn-id: svn://svn.pgadmin.org/trunk/pgadmin3@7175 a7884b65-44f6-0310-8a51-81a127f17b15

diff --git a/CHANGELOG b/CHANGELOG
index b409ac29e1b4a74c1ae485dbc89051907feb2b4b..81d61113450481574d1797041e931e828cc77e3c 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -36,6 +36,8 @@ Changes
 
 Date       Dev Ver    Change details
 ---------- --- -----  --------------
+2008-03-19 DP  1.8.3  Don't include the -h option when calling pg_dump or 
+                      pg_restore if there is no hostname to specify.
 2008-03-18 DP  1.8.3  Convert setting names to lower case so we don't end up
                       with DateStyle and datestyle for example.
 2008-03-11 DP  1.8.3  Construct SQL used to add columns such that the entire

diff --git a/pgadmin/frm/frmBackup.cpp b/pgadmin/frm/frmBackup.cpp
index 5055ae9c43a2f36a3495fafba743c30bc614b20e..47804c891c7baa75742ee3da74fe680934c75c13 100644 (file)
--- a/pgadmin/frm/frmBackup.cpp
+++ b/pgadmin/frm/frmBackup.cpp
@@ -192,8 +192,10 @@ wxString frmBackup::getCmdPart1()
     else
         cmd=pgBackupExecutable;
 
-    cmd +=  wxT(" -h ") + server->GetName()
-         +  wxT(" -p ") + NumToStr((long)server->GetPort())
+    if (!server->GetName().IsEmpty())
+        cmd += wxT(" -h ") + server->GetName();
+
+    cmd +=  wxT(" -p ") + NumToStr((long)server->GetPort())
          +  wxT(" -U ") + server->GetUsername();
     return cmd;
 }

diff --git a/pgadmin/frm/frmBackupGlobals.cpp b/pgadmin/frm/frmBackupGlobals.cpp
index 0e225d21fd42617c2e12e7fd2d1238045c4d3fce..a5660ca8a862300d4b9f45799b0faa82b535c77d 100644 (file)
--- a/pgadmin/frm/frmBackupGlobals.cpp
+++ b/pgadmin/frm/frmBackupGlobals.cpp
@@ -148,9 +148,10 @@ wxString frmBackupGlobals::getCmdPart1()
     else\r
         cmd=pgBackupAllExecutable;\r
 \r
-    cmd +=  wxT(" -i")\r
-            wxT(" -h ") + server->GetName()\r
-         +  wxT(" -p ") + NumToStr((long)server->GetPort())\r
+    if (!server->GetName().IsEmpty())\r
+        cmd += wxT(" -h ") + server->GetName();\r
+\r
+    cmd +=  wxT(" -p ") + NumToStr((long)server->GetPort())\r
          +  wxT(" -U ") + server->GetUsername();\r
     return cmd;\r
 }\r

diff --git a/pgadmin/frm/frmBackupServer.cpp b/pgadmin/frm/frmBackupServer.cpp
index e872b8a21c372e32ee9dbd3549e72c15c7fe0621..344a594ce45380ddc6b51d6ba11f9e458d38c5c9 100644 (file)
--- a/pgadmin/frm/frmBackupServer.cpp
+++ b/pgadmin/frm/frmBackupServer.cpp
@@ -136,9 +136,10 @@ wxString frmBackupServer::getCmdPart1()
     else\r
         cmd=pgBackupAllExecutable;\r
 \r
-    cmd +=  wxT(" -i")\r
-            wxT(" -h ") + server->GetName()\r
-         +  wxT(" -p ") + NumToStr((long)server->GetPort())\r
+    if (!server->GetName().IsEmpty())\r
+        cmd += wxT(" -h ") + server->GetName();\r
+\r
+    cmd +=  wxT(" -p ") + NumToStr((long)server->GetPort())\r
          +  wxT(" -U ") + server->GetUsername();\r
     return cmd;\r
 }\r

diff --git a/pgadmin/frm/frmRestore.cpp b/pgadmin/frm/frmRestore.cpp
index aa57b7a8de46d245aa12ce0757e498a891f0e2b5..0fc9938e88edc52339871ef212054f5058bdecde 100644 (file)
--- a/pgadmin/frm/frmRestore.cpp
+++ b/pgadmin/frm/frmRestore.cpp
@@ -276,8 +276,10 @@ wxString frmRestore::getCmdPart1()
     else
         cmd=pgRestoreExecutable;
 
-    cmd += wxT(" -h ") + server->GetName()
-         + wxT(" -p ") + NumToStr((long)server->GetPort())
+    if (!server->GetName().IsEmpty())
+        cmd += wxT(" -h ") + server->GetName();
+
+    cmd += wxT(" -p ") + NumToStr((long)server->GetPort())
          + wxT(" -U ") + qtIdent(server->GetUsername())
          + wxT(" -d ") + commandLineCleanOption(object->GetDatabase()->GetQuotedIdentifier());
     return cmd;