Replaced PMA_RTN_parseOneParameter().

Updated sql-parser library. Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
phpmyadmin · Jul 10, 2015 · 02f6c7f · 02f6c7f
1 parent 1499963
commit 02f6c7f
Show file tree

Hide file tree

Showing 8 changed files with 93 additions and 13 deletions.
diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php
@@ -684,7 +684,7 @@ function PMA_RTN_getDataFromName($name, $type, $all = true)
             }
             $routine['DTD_IDENTIFIER'] = $dtd;
         }
-        $returnparam = PMA_RTN_parseOneParameter($routine['DTD_IDENTIFIER']);
+        $returnparam = SqlParser\Utils\Routine::getReturnType($routine['DTD_IDENTIFIER']);
         $retval['item_returntype']      = $returnparam[2];
         $retval['item_returnlength']    = $returnparam[3];
         $retval['item_returnopts_num']  = $returnparam[4];

diff --git a/libraries/sql-parser/src/Fragments/DataTypeFragment.php b/libraries/sql-parser/src/Fragments/DataTypeFragment.php
@@ -88,7 +88,9 @@ public static function parse(Parser $parser, TokensList $list, array $options =
             } elseif ($state === 1) {
                 if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) {
                     $size = ArrayFragment::parse($parser, $list);
-                    $ret->size = $size->array;
+                    foreach ($size->tokens as $token) {
+                        $ret->size[] = $token->token;
+                    }
                     $ret->tokens = array_merge($ret->tokens, $size->tokens);
                     ++$list->idx;
                 }

diff --git a/libraries/sql-parser/src/Fragments/ParamDefFragment.php b/libraries/sql-parser/src/Fragments/ParamDefFragment.php
@@ -91,7 +91,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                 if (($token->value === 'IN') || ($token->value === 'OUT') || ($token->value === 'INOUT')) {
                     $expr->inOut = $token->value;
                     ++$list->idx;
-                } else if ($token->value === ')') {
+                } elseif ($token->value === ')') {
                     ++$list->idx;
                     break;
                 } else {

diff --git a/libraries/sql-parser/src/Lexer.php b/libraries/sql-parser/src/Lexer.php
@@ -135,7 +135,7 @@ public function lex()
         // Another example is `parseComment`.
 
         $tokens = new TokensList();
-        $lastToken = NULL;
+        $lastToken = null;
 
         for ($this->last = 0, $lastIdx = 0; $this->last < $this->len; $lastIdx = ++$this->last) {
             /** @var Token The new token. */
@@ -153,8 +153,8 @@ public function lex()
                 if ($this->delimiter !== $this->str[$this->last]) {
                     $this->error('Unexpected character.', $this->str[$this->last], $this->last);
                 }
-            } else if (($token->type === Token::TYPE_SYMBOL) && ($token->flags & Token::FLAG_SYMBOL_VARIABLE) &&
-                    ($lastToken !== NULL)) {
+            } elseif (($token->type === Token::TYPE_SYMBOL) && ($token->flags & Token::FLAG_SYMBOL_VARIABLE) &&
+                    ($lastToken !== null)) {
                 // Handles ```... FROM 'user'@'%' ...```.
                 if ((($lastToken->type === Token::TYPE_SYMBOL) && ($lastToken->flags & Token::FLAG_SYMBOL_BACKTICK)) ||
                        ($lastToken->type === Token::TYPE_STRING)) {

diff --git a/libraries/sql-parser/src/Parser.php b/libraries/sql-parser/src/Parser.php
@@ -122,16 +122,20 @@ class Parser
      * @param mixed $list
      * @param bool $strict
      */
-    public function __construct($list, $strict = false)
+    public function __construct($list = null, $strict = false)
     {
         if ((is_string($list)) || ($list instanceof UtfString)) {
             $lexer = new Lexer($list, $strict);
             $this->list = $lexer->tokens;
         } elseif ($list instanceof TokensList) {
             $this->list = $list;
         }
+
         $this->strict = $strict;
-        $this->parse();
+
+        if ($list !== null) {
+            $this->parse();
+        }
     }
 
     /**

diff --git a/libraries/sql-parser/src/Token.php b/libraries/sql-parser/src/Token.php
@@ -223,13 +223,17 @@ public function extract()
                 }
                 return $ret;
             case Token::TYPE_STRING:
-                return mb_substr($this->token, 1, -1); // trims quotes
+                $quote = $this->token[0];
+                $str = str_replace($quote . $quote, $quote, $this->token);
+                return mb_substr($str, 1, -1); // trims quotes
             case Token::TYPE_SYMBOL:
                 $str = $this->token;
                 if ((isset($str[0])) && ($str[0] === '@')) {
                     $str = mb_substr($str, 1);
                 }
                 if ((isset($str[0])) && (($str[0] === '`') || ($str[0] === '"') || ($str[0] === '\''))) {
+                    $quote = $str[0];
+                    $str = str_replace($quote . $quote, $quote, $str);
                     $str = mb_substr($str, 1, -1);
                 }
                 return $str;

diff --git a/libraries/sql-parser/src/Utils/Misc.php b/libraries/sql-parser/src/Utils/Misc.php
@@ -68,7 +68,7 @@ public static function getAliases($tree, $db)
         }
 
         foreach ($tree->expr as $expr) {
-            if ((empty($expr->column)) || (empty($expr->alias)) ){
+            if ((empty($expr->column)) || (empty($expr->alias))) {
                 continue;
             }
 
@@ -87,5 +87,4 @@ public static function getAliases($tree, $db)
 
         return $retval;
     }
-
 }
diff --git a/libraries/sql-parser/src/Utils/Routine.php b/libraries/sql-parser/src/Utils/Routine.php
@@ -2,17 +2,89 @@
 
 namespace SqlParser\Utils;
 
+use SqlParser\Lexer;
+use SqlParser\Parser;
+use SqlParser\Statement;
+use SqlParser\Fragments\DataTypeFragment;
+use SqlParser\Fragments\ParamDefFragment;
+
 class Routine
 {
 
+    /**
+     * Parses a parameter of a routine.
+     *
+     * @param string $param Parameter's definition.
+     *
+     * @return array
+     */
+    public function getReturnType($param)
+    {
+        $lexer = new Lexer($param);
+
+        // A dummy parser is used for error reporting.
+        $param = DataTypeFragment::parse(new Parser(), $lexer->tokens);
+
+        if ($param === null) {
+            return array('', '', '', '', '');
+        }
+
+        $options = array();
+        foreach ($param->options->options as $opt) {
+            $options[] = is_string($opt) ? $opt : $opt['value'];
+        }
+
+        return array(
+            '',
+            '',
+            $param->name,
+            implode(',', $param->size),
+            implode(' ', $options)
+        );
+    }
+
+    /**
+     * Parses a parameter of a routine.
+     *
+     * @param string $param Parameter's definition.
+     *
+     * @return array
+     */
+    public function getParameter($param)
+    {
+        $lexer = new Lexer('(' . $param . ')');
+
+        // A dummy parser is used for error reporting.
+        $param = ParamDefFragment::parse(new Parser(), $lexer->tokens);
+
+        if (empty($param[0])) {
+            return array('', '', '', '', '');
+        }
+
+        $param = $param[0];
+
+        $options = array();
+        foreach ($param->type->options->options as $opt) {
+            $options[] = is_string($opt) ? $opt : $opt['value'];
+        }
+
+        return array(
+            empty($param->inOut) ? '' : $param->inOut,
+            $param->name,
+            $param->type->name,
+            implode(',', $param->type->size),
+            implode(' ', $options)
+        );
+    }
+
     /**
      * Gets the parameters of a routine from the parse tree.
      *
      * @param Statement $tree
      *
      * @return array
      */
-    public static function getParameters($tree)
+    public static function getParameters(Statement $tree)
     {
         $retval = array(
             'num' => 0,
@@ -42,5 +114,4 @@ public static function getParameters($tree)
 
         return $retval;
     }
-
 }