From: chriskl <chriskl>
Date: Sun, 6 Jun 2004 06:34:28 +0000 (+0000)
Subject: brand HEAD as 3.5-dev.  fix export of mixed case tables for pre-7.4.  this must be... 
X-Git-Tag: REL_3-4-1~9
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=3e4060fe9c207004aecac900a02b859d85dce84d;p=phppgadmin.git

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

diff --git a/HISTORY b/HISTORY
index f2378541..ad922196 100644
--- 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 4c3a3b72..a3a0908f 100644
--- 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 11371431..6e89afbf 100644
--- 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