The change to using long options for pg_dump and friends seem to have

broken it, at least on linux. But I assume it still worked on at least
osx *or* windows, since that's where Dave would've tested it :-)

It would more or less never work, since it tried to put a double-quote
in the actual filename *before* the / specifying the root directory..

Here's a patch that removes the = sign after the parameter names. That
makes it work on linux again. I would appreciate it if somebody can test
this patch on windows and/or osx as well to confirm it doesn't break
things there.

[Magnus Hagander]

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

diff --git a/pgadmin/frm/frmBackup.cpp b/pgadmin/frm/frmBackup.cpp
index 94eb09885e0acc4d9e6152818e254e2584903714..d71c4f7e36615914c734dcd5b1b60cd75eaab558 100644 (file)
--- a/pgadmin/frm/frmBackup.cpp
+++ b/pgadmin/frm/frmBackup.cpp
@@ -196,10 +196,10 @@ wxString frmBackup::getCmdPart1()
         cmd=pgBackupExecutable;
 
     if (!server->GetName().IsEmpty())
-        cmd += wxT(" --host=") + server->GetName();
+        cmd += wxT(" --host ") + server->GetName();
 
-    cmd +=  wxT(" --port=") + NumToStr((long)server->GetPort())
-         +  wxT(" --username=") + server->GetUsername();
+    cmd +=  wxT(" --port ") + NumToStr((long)server->GetPort())
+         +  wxT(" --username ") + server->GetUsername();
 
     if (object->GetConnection()->GetIsGreenplum())
         cmd += wxT(" --gp-syntax ");
@@ -223,21 +223,21 @@ wxString frmBackup::getCmdPart2()
     {
         case 0: // compressed
         {
-            cmd.Append(wxT(" --format=custom"));
+            cmd.Append(wxT(" --format custom"));
             if (chkBlobs->GetValue())
                 cmd.Append(wxT(" --blobs"));
             break;
         }
         case 1: // tar
         {
-            cmd.Append(wxT(" --format=tar"));
+            cmd.Append(wxT(" --format tar"));
             if (chkBlobs->GetValue())
                 cmd.Append(wxT(" --blobs"));
             break;
         }
         case 2:
         {
-            cmd.Append(wxT(" --format=plain"));
+            cmd.Append(wxT(" --format plain"));
             if (chkOnlyData->GetValue())
             {
                 cmd.Append(wxT(" --data-only"));
@@ -270,13 +270,13 @@ wxString frmBackup::getCmdPart2()
     if (chkVerbose->GetValue())
         cmd.Append(wxT(" --verbose"));
 
-    cmd.Append(wxT(" --file=\"") + txtFilename->GetValue() + wxT("\""));
+    cmd.Append(wxT(" --file \"") + txtFilename->GetValue() + wxT("\""));
 
     if (object->GetMetaType() == PGM_SCHEMA)
 #ifdef WIN32
-        cmd.Append(wxT(" --schema=\\\"") + ((pgSchema*)object)->GetIdentifier() + wxT("\\\""));
+        cmd.Append(wxT(" --schema \\\"") + ((pgSchema*)object)->GetIdentifier() + wxT("\\\""));
 #else
-        cmd.Append(wxT(" --schema='") + ((pgSchema*)object)->GetQuotedIdentifier() + wxT("'"));
+        cmd.Append(wxT(" --schema '") + ((pgSchema*)object)->GetQuotedIdentifier() + wxT("'"));
 #endif
 
     else if (object->GetMetaType() == PGM_TABLE || object->GetMetaType() == GP_PARTITION) 
@@ -285,17 +285,17 @@ wxString frmBackup::getCmdPart2()
         if (pgAppMinimumVersion(backupExecutable, 8, 2))
         {
 #ifdef WIN32
-            cmd.Append(wxT(" --table=\"\\\"") + ((pgTable*)object)->GetSchema()->GetIdentifier() + 
+            cmd.Append(wxT(" --table \"\\\"") + ((pgTable*)object)->GetSchema()->GetIdentifier() + 
                        wxT("\\\".\\\"") + ((pgTable*)object)->GetIdentifier() + wxT("\\\"\""));
 #else
-            cmd.Append(wxT(" --table='") + ((pgTable*)object)->GetSchema()->GetQuotedIdentifier() + 
+            cmd.Append(wxT(" --table '") + ((pgTable*)object)->GetSchema()->GetQuotedIdentifier() + 
                        wxT(".") + ((pgTable*)object)->GetQuotedIdentifier() + wxT("'"));
 #endif
         }
         else
         {
-            cmd.Append(wxT(" --table=") + ((pgTable*)object)->GetQuotedIdentifier());
-            cmd.Append(wxT(" --schema=") + ((pgTable*)object)->GetSchema()->GetQuotedIdentifier());
+            cmd.Append(wxT(" --table ") + ((pgTable*)object)->GetQuotedIdentifier());
+            cmd.Append(wxT(" --schema ") + ((pgTable*)object)->GetSchema()->GetQuotedIdentifier());
         }
     }
 

diff --git a/pgadmin/frm/frmBackupGlobals.cpp b/pgadmin/frm/frmBackupGlobals.cpp
index 44463189189464da4c3b08d42042c57a4538fc17..3b02a5653458571ac8b862f23fb27bdf01b278ba 100644 (file)
--- a/pgadmin/frm/frmBackupGlobals.cpp
+++ b/pgadmin/frm/frmBackupGlobals.cpp
@@ -157,10 +157,10 @@ wxString frmBackupGlobals::getCmdPart1()
         cmd=pgBackupAllExecutable;\r
 \r
     if (!server->GetName().IsEmpty())\r
-        cmd += wxT(" --host=") + server->GetName();\r
+        cmd += wxT(" --host ") + server->GetName();\r
 \r
-    cmd +=  wxT(" --port=") + NumToStr((long)server->GetPort())\r
-         +  wxT(" --username=") + server->GetUsername();\r
+    cmd +=  wxT(" --port ") + NumToStr((long)server->GetPort())\r
+         +  wxT(" --username ") + server->GetUsername();\r
     return cmd;\r
 }\r
 \r
@@ -174,7 +174,7 @@ wxString frmBackupGlobals::getCmdPart2()
     if (chkVerbose->GetValue())\r
         cmd.Append(wxT(" --verbose"));\r
 \r
-    cmd.Append(wxT(" --file=\"") + txtFilename->GetValue() + wxT("\""));\r
+    cmd.Append(wxT(" --file \"") + txtFilename->GetValue() + wxT("\""));\r
 \r
     cmd.Append(wxT(" --globals-only"));\r
 \r

diff --git a/pgadmin/frm/frmBackupServer.cpp b/pgadmin/frm/frmBackupServer.cpp
index 163a6d126cc95e32a1f2e2a712120c6ff290bd01..e6a4d05e2a36d3eaec2945bd36b6c1659c36e54b 100644 (file)
--- a/pgadmin/frm/frmBackupServer.cpp
+++ b/pgadmin/frm/frmBackupServer.cpp
@@ -141,10 +141,10 @@ wxString frmBackupServer::getCmdPart1()
         cmd=pgBackupAllExecutable;\r
 \r
     if (!server->GetName().IsEmpty())\r
-        cmd += wxT(" --host=") + server->GetName();\r
+        cmd += wxT(" --host ") + server->GetName();\r
 \r
-    cmd +=  wxT(" --port=") + NumToStr((long)server->GetPort())\r
-         +  wxT(" --username=") + server->GetUsername();\r
+    cmd +=  wxT(" --port ") + NumToStr((long)server->GetPort())\r
+         +  wxT(" --username ") + server->GetUsername();\r
     return cmd;\r
 }\r
 \r
@@ -158,7 +158,7 @@ wxString frmBackupServer::getCmdPart2()
     if (chkVerbose->GetValue())\r
         cmd.Append(wxT(" --verbose"));\r
 \r
-    cmd.Append(wxT(" --file=\"") + txtFilename->GetValue() + wxT("\""));\r
+    cmd.Append(wxT(" --file \"") + txtFilename->GetValue() + wxT("\""));\r
 \r
     return cmd;\r
 }\r

diff --git a/pgadmin/frm/frmRestore.cpp b/pgadmin/frm/frmRestore.cpp
index fcda79ddfa4aa118a2b734d954b6175a45fefae4..62e7eee5374ad078403b10eed015cc99c405061f 100644 (file)
--- a/pgadmin/frm/frmRestore.cpp
+++ b/pgadmin/frm/frmRestore.cpp
@@ -290,11 +290,11 @@ wxString frmRestore::getCmdPart1()
         cmd=pgRestoreExecutable;
 
     if (!server->GetName().IsEmpty())
-        cmd += wxT(" --host=") + server->GetName();
+        cmd += wxT(" --host ") + server->GetName();
 
-    cmd += wxT(" --port=") + NumToStr((long)server->GetPort())
-         + wxT(" --username=") + qtIdent(server->GetUsername())
-         + wxT(" --dbname=") + commandLineCleanOption(object->GetDatabase()->GetQuotedIdentifier());
+    cmd += wxT(" --port ") + NumToStr((long)server->GetPort())
+         + wxT(" --username ") + qtIdent(server->GetUsername())
+         + wxT(" --dbname ") + commandLineCleanOption(object->GetDatabase()->GetQuotedIdentifier());
     return cmd;
 }
 
@@ -339,19 +339,19 @@ wxString frmRestore::getCmdPart2(int step)
                 {
                     int sel=lstContents->GetSelection();
                     if (lstContents->GetText(sel, 0).Lower() == wxString(_("Function")).Lower())
-                        cmd.Append(wxT(" --function=") + qtIdent(lstContents->GetText(sel, 1).BeforeLast('(')));
+                        cmd.Append(wxT(" --function ") + qtIdent(lstContents->GetText(sel, 1).BeforeLast('(')));
                     else if (lstContents->GetText(sel, 0).Lower() == wxString(_("Table")).Lower())
-                        cmd.Append(wxT(" --table=") + qtIdent(lstContents->GetText(sel, 1)));
+                        cmd.Append(wxT(" --table ") + qtIdent(lstContents->GetText(sel, 1)));
                     else
                         return wxT("restore: internal pgadmin error.");   // shouldn't happen!
 
                     break;
                 }
                 case PGM_TABLE:
-                    cmd.Append(wxT(" --table=") + object->GetQuotedIdentifier());
+                    cmd.Append(wxT(" --table ") + object->GetQuotedIdentifier());
                     break;
                 case PGM_FUNCTION:
-                    cmd.Append(wxT(" --function=") + object->GetQuotedIdentifier());
+                    cmd.Append(wxT(" --function ") + object->GetQuotedIdentifier());
                     break;
                 default:
                     break;