From 307aed4c4507aa3507b6bc5e5403eb7d31805cec Mon Sep 17 00:00:00 2001 From: Xavier Perseguers <typo3@perseguers.ch> Date: Sat, 1 May 2010 21:05:40 +0000 Subject: [PATCH] Fixed bug #2186: Error installing static_info_tables git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7499 709f56b5-9817-0410-a4d7-c38de5d9e867 --- ChangeLog | 4 ++++ t3lib/class.t3lib_sqlparser.php | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a9dd5cbbcbf6..60d8a29f6d3f 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-05-01 Xavier Perseguers <typo3@perseguers.ch> + + * Fixed bug #2186: Error installing static_info_tables + 2010-05-01 Benjamin Mack <benni@typo3.org> * Followup to #14064: Removed unused functions to detect GDlib/TTF() in the installer diff --git a/t3lib/class.t3lib_sqlparser.php b/t3lib/class.t3lib_sqlparser.php index 7a96cc479638..57b456cc4398 100644 --- a/t3lib/class.t3lib_sqlparser.php +++ b/t3lib/class.t3lib_sqlparser.php @@ -556,7 +556,7 @@ class t3lib_sqlparser { $result['TABLE'] = $this->nextPart($parseString, '^([[:alnum:]_]+)[[:space:]]+'); if ($result['TABLE']) { - if ($result['action'] = $this->nextPart($parseString, '^(CHANGE|DROP[[:space:]]+KEY|DROP[[:space:]]+PRIMARY[[:space:]]+KEY|ADD[[:space:]]+KEY|ADD[[:space:]]+PRIMARY[[:space:]]+KEY|DROP|ADD|RENAME)([[:space:]]+|\()')) { + if ($result['action'] = $this->nextPart($parseString, '^(CHANGE|DROP[[:space:]]+KEY|DROP[[:space:]]+PRIMARY[[:space:]]+KEY|ADD[[:space:]]+KEY|ADD[[:space:]]+PRIMARY[[:space:]]+KEY|ADD[[:space:]]+UNIQUE|DROP|ADD|RENAME)([[:space:]]+|\()')) { $actionKey = strtoupper(str_replace(array(' ',TAB,CR,LF),'',$result['action'])); // Getting field: @@ -582,6 +582,7 @@ class t3lib_sqlparser { case 'ADDKEY': case 'ADDPRIMARYKEY': + case 'ADDUNIQUE': $result['KEY'] = $fieldKey; $result['fields'] = $this->getValue($parseString, '_LIST', 'INDEX'); if ($this->parse_error) { return $this->parse_error; } @@ -1724,6 +1725,7 @@ class t3lib_sqlparser { break; case 'ADDKEY': case 'ADDPRIMARYKEY': + case 'ADDUNIQUE': $query.=' ('.implode(',',$components['fields']).')'; break; } -- GitLab