brand HEAD as 3.5-dev. fix export of mixed case tables for pre-7.4. this must be...

diff --git a/HISTORY b/HISTORY
index f2378541abde0543a94c742dadbfda07c3de0118..ad922196e2663ad69853faea6c6004afcbc777f2 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,12 @@
 phpPgAdmin History
 ------------------
 
+Version 3.5-dev
+-----------
+
+Bugs
+* Fix export of mixed case tables pre 7.4
+
 Version 3.4
 -----------
 

diff --git a/dbexport.php b/dbexport.php
index 4c3a3b72dac732850951d6208f6388539775d19d..a3a0908f11a5d3db2d3fffa9b957efabb4f4eb47 100644 (file)
--- a/dbexport.php
+++ b/dbexport.php
@@ -3,7 +3,7 @@
         * Does an export of a database or a table (via pg_dump)
         * to the screen or as a download.
         *
-        * $Id: dbexport.php,v 1.10 2004/03/29 02:05:31 chriskl Exp $
+        * $Id: dbexport.php,v 1.11 2004/06/06 06:34:28 chriskl Exp $
         */
 
        // Include application functions
@@ -47,13 +47,19 @@
                }
                
                // Check for a table specified
-               if (isset($_REQUEST['table'])) {
-                       $cmd .= " -t " . escapeshellarg($_REQUEST['table']);
+               if (isset($_REQUEST['table'])) {                        
                        // If we are 7.4 or higher, assume they are using 7.4 pg_dump and
-                       // set dump schema as well.
+                       // set dump schema as well.  Also, mixed case dumping has been fixed
+                       // then..
                        if ($data->hasSchemaDump()) {
+                               $cmd .= " -t " . escapeshellarg($_REQUEST['table']);
                                $cmd .= " -n " . escapeshellarg($_REQUEST['schema']);
-                       }                       
+                       }
+                       else {
+                               // This is an annoying hack needed to work around a bug in dumping
+                               // mixed case tables in pg_dump prior to 7.4
+                               $cmd .= " -t " . escapeshellarg('"' . $_REQUEST['table'] . '"');
+                       }
                }
 
                // Check for GZIP compression specified

diff --git a/libraries/lib.inc.php b/libraries/lib.inc.php
index 1137143132b041225ddf852f1eadbb01d9f2c5f3..6e89afbf18a1334c0f578da594bfc3bdb775c18b 100644 (file)
--- a/libraries/lib.inc.php
+++ b/libraries/lib.inc.php
@@ -3,7 +3,7 @@
        /**
         * Function library read in upon startup
         *
-        * $Id: lib.inc.php,v 1.77 2004/06/04 05:28:28 chriskl Exp $
+        * $Id: lib.inc.php,v 1.78 2004/06/06 06:34:28 chriskl Exp $
         */
        
        // Set error reporting level to max
@@ -13,7 +13,7 @@
        $appName = 'phpPgAdmin';
 
        // Application version
-       $appVersion = '3.4';
+       $appVersion = '3.5-dev';
 
 
        // Check to see if the configuration file exists, if not, explain