diff options
author | Dan Ungureanu <udan1107@gmail.com> | 2015-06-21 22:25:04 +0300 |
---|---|---|
committer | Dan Ungureanu <udan1107@gmail.com> | 2015-07-10 23:18:12 +0300 |
commit | 105a1275e50091486a826ac40aaa1d7b9f4a2569 (patch) | |
tree | 7f7e5926c1dec05f1af3f65672d16f8b349740dd | |
parent | 2c341191e6f96a444e65115b43347280cd4ff80a (diff) |
Fixed failing test.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
-rw-r--r-- | libraries/Util.class.php | 2 | ||||
-rw-r--r-- | test/libraries/common/PMA_quoting_slashing_test.php | 19 |
2 files changed, 13 insertions, 8 deletions
diff --git a/libraries/Util.class.php b/libraries/Util.class.php index 97a5e5322e..3bbdee123f 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -907,7 +907,7 @@ class PMA_Util } if (! $do_it) { - if (!SqlParser\Context::isKeyword($a_name)) { + if (!(SqlParser\Context::isKeyword($a_name) & SqlParser\Token::FLAG_KEYWORD_RESERVED)) { return $a_name; } } diff --git a/test/libraries/common/PMA_quoting_slashing_test.php b/test/libraries/common/PMA_quoting_slashing_test.php index 2710946b89..b5d837a9e0 100644 --- a/test/libraries/common/PMA_quoting_slashing_test.php +++ b/test/libraries/common/PMA_quoting_slashing_test.php @@ -214,13 +214,18 @@ class PMA_QuotingSlashing_Test extends PHPUnit_Framework_TestCase */ public function testBackquoteForbidenWords() { - global $PMA_SQPdata_forbidden_word; - - foreach ($PMA_SQPdata_forbidden_word as $forbidden) { - $this->assertEquals( - "`" . $forbidden . "`", - PMA_Util::backquote($forbidden, false) - ); + foreach (SqlParser\Context::$KEYWORDS as $keyword => $type) { + if ($type & SqlParser\Token::FLAG_KEYWORD_RESERVED) { + $this->assertEquals( + "`" . $keyword . "`", + PMA_Util::backquote($keyword, false) + ); + } else { + $this->assertEquals( + $keyword, + PMA_Util::backquote($keyword, false) + ); + } } } } |