extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-24 08:53:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

quote order column in backup and always quote "index" as it seems to be one of very little names not automatic recogniced in MySQL

Browse Source
This commit is contained in:
Ralf Becker 2015-03-30 08:29:40 +00:00
parent 5cc84ffe50
commit 4e3723fd68
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpgwapi/inc/class.db_backup.inc.php
View File

@ -944,7 +944,7 @@ class db_backup
empty($pk) || !$max ? false : $pk.' > '.$this->db->quote($max, $schema['fd'][$pk]['type']), empty($pk) || !$max ? false : $pk.' > '.$this->db->quote($max, $schema['fd'][$pk]['type']),
__LINE__, __FILE__, __LINE__, __FILE__,
empty($pk) ? false : 0, // if no primary key, query all rows 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) false, self::ROW_CHUNK) as $row)
{ {
if (!empty($pk)) $max = $row[$pk]; if (!empty($pk)) $max = $row[$pk];

2
phpgwapi/inc/class.egw_db.inc.php
View File

@ -1366,7 +1366,7 @@ class egw_db
{ {
// if name contains special characters, quote it // if name contains special characters, quote it
// always quote for postgreSQL, as this is the only way to support mixed case names // 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)) if (preg_match('/\W/', $name) || $type == 'pgsql' && preg_match('/[A-Z]+/', $name) || $name == 'index')
{ {
return $quote . $name . $quote; return $quote . $name . $quote;
} }