From bfe9e404dd840c20779935207ae8d29f14494d9b Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 30 Mar 2015 08:38:03 +0000
Subject: [PATCH] quote order column in backup and always quote "index" as it
 seems to be one of very little names not automatic recogniced in MySQL,
 backported current name_quote from trunk

---
 phpgwapi/inc/class.db_backup.inc.php |  2 +-
 phpgwapi/inc/class.egw_db.inc.php    | 39 ++++++++++++++++------------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/phpgwapi/inc/class.db_backup.inc.php b/phpgwapi/inc/class.db_backup.inc.php
index 3e75b6d87a..d43e36766b 100644
--- a/phpgwapi/inc/class.db_backup.inc.php
+++ b/phpgwapi/inc/class.db_backup.inc.php
@@ -847,7 +847,7 @@ class db_backup
 					empty($pk) || !$max ? false : $pk.' > '.$this->db->quote($max, $schema['fd'][$pk]['type']),
 					__LINE__, __FILE__,
 					empty($pk) ? false : 0,					// if no primary key, query all rows
-					empty($pk) ? '' : 'ORDER BY '.$pk.' ASC',	// order by primary key
+					empty($pk) ? '' : 'ORDER BY '.$this->db->name_quote($pk).' ASC',	// order by primary key
 					false, self::ROW_CHUNK) as $row)
 				{
 					if (!empty($pk)) $max = $row[$pk];
diff --git a/phpgwapi/inc/class.egw_db.inc.php b/phpgwapi/inc/class.egw_db.inc.php
index 2fa8823ce5..039da9a536 100644
--- a/phpgwapi/inc/class.egw_db.inc.php
+++ b/phpgwapi/inc/class.egw_db.inc.php
@@ -1351,37 +1351,44 @@ class egw_db
 	* Correctly Quote Identifiers like table- or colmnnames for use in SQL-statements
 	*
 	* This is mostly copy & paste from adodb's datadict class
-	* @param $name string
+	* @param string $_name
 	* @return string quoted string
 	*/
-	function name_quote($name = NULL)
+	function name_quote($_name = NULL)
 	{
-		if (!is_string($name)) {
-			return FALSE;
+		if (!is_string($_name))
+		{
+			return false;
 		}
 
-		$name = trim($name);
+		$name = trim($_name);
 
 		if (!$this->Link_ID && !$this->connect())
 		{
-			return False;
+			return false;
 		}
 
 		$quote = $this->Link_ID->nameQuote;
+		$type = $this->Type;
 
-		// if name is of the form `name`, quote it
-		if ( preg_match('/^`(.+)`$/', $name, $matches) ) {
-			return $quote . $matches[1] . $quote;
-		}
-
-		// if name contains special characters, quote it
-		// always quote for postgreSQL, as this is the only way to support mixed case names
-		if (preg_match('/\W/', $name) || $this->Type == 'pgsql' && preg_match('/[A-Z]+/', $name))
+		// if name is of the form `name`, remove MySQL quotes and leave it to automatic below
+		if ($name[0] === '`' && substr($name, -1) === '`')
 		{
-			return $quote . $name . $quote;
+			$name = substr($name, 1, -1);
 		}
 
-		return $name;
+		$quoted = array_map(function($name) use ($quote, $type)
+		{
+			// if name contains special characters, quote it
+			// always quote for postgreSQL, as this is the only way to support mixed case names
+			if (preg_match('/\W/', $name) || $type == 'pgsql' && preg_match('/[A-Z]+/', $name) || $name == 'index')
+			{
+				return $quote . $name . $quote;
+			}
+			return $name;
+		}, explode('.', $name));
+
+		return implode('.', $quoted);
 	}
 
 	/**