Author: ralfbecker
New Revision: 52317
URL: http://svn.stylite.de/viewvc/egroupware?rev=52317&view=rev
Log:
quote order column in backup and always quote “index” as it seems to be one of very little names not automatic recogniced in MySQL
Modified:
branches/14.2/phpgwapi/ (props changed)
branches/14.2/phpgwapi/inc/class.db_backup.inc.php
branches/14.2/phpgwapi/inc/class.egw_db.inc.php
Propchange: branches/14.2/phpgwapi/
— svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 30 10:29:19 2015
@@ -1,1 +1,1 @@
-/trunk/phpgwapi:51366,51376,51419,51437,51453-51454,51479,51503,51512,51518,51521-51522,51526-51528,51530,51539,51556,51562,51577,51579,51588-51589,51612,51626,51701,51716-51717,51721,51758,51762-51763,51768,51775,51779,51785,51800,51810,51812,51817,51824,51839,51855,51870,51881-51882,51886,51905,51909,51918,51973,51975,51977,51988,52007,52016,52054,52057,52059,52062,52088,52099,52107-52108,52132,52147,52149,52165,52177,52179,52199,52220,52238,52241,52288-52289,52301,52310,52312,52314
+/trunk/phpgwapi:51366,51376,51419,51437,51453-51454,51479,51503,51512,51518,51521-51522,51526-51528,51530,51539,51556,51562,51577,51579,51588-51589,51612,51626,51701,51716-51717,51721,51758,51762-51763,51768,51775,51779,51785,51800,51810,51812,51817,51824,51839,51855,51870,51881-51882,51886,51905,51909,51918,51973,51975,51977,51988,52007,52016,52054,52057,52059,52062,52088,52099,52107-52108,52132,52147,52149,52165,52177,52179,52199,52220,52238,52241,52288-52289,52301,52310,52312,52314,52316
Modified: branches/14.2/phpgwapi/inc/class.db_backup.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/phpgwapi/inc/class.db_backup.inc.php?rev=52317&r1=52316&r2=52317&view=diff
— branches/14.2/phpgwapi/inc/class.db_backup.inc.php (original)
+++ branches/14.2/phpgwapi/inc/class.db_backup.inc.php Mon Mar 30 10:29:19 2015
@@ -945,7 +945,7 @@
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];
Modified: branches/14.2/phpgwapi/inc/class.egw_db.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/phpgwapi/inc/class.egw_db.inc.php?rev=52317&r1=52316&r2=52317&view=diff
— branches/14.2/phpgwapi/inc/class.egw_db.inc.php (original)
+++ branches/14.2/phpgwapi/inc/class.egw_db.inc.php Mon Mar 30 10:29:19 2015
@@ -1386,7 +1386,7 @@
{
// 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))
-
if (preg_match('/\W/', $name) || $type == 'pgsql' && preg_match('/[A-Z]+/', $name) || $name == 'index') { return $quote . $name . $quote; }
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs