Merge #346 - Fix #339 - Fixing the issue of not handling the procedures and functions's options

Fixes: #339
Pull-request: #346

Signed-off-by: William Desportes <[email protected]>

Author: williamdes

src/Statements/CreateStatement.php

@@ -219,21 +219,50 @@ class CreateStatement extends Statement
      * @var array
      */
     public static $FUNC_OPTIONS = array(
-        'COMMENT' => array(
-            1,
+        'NOT' =>  array(
+            2,
+            'var',
+        ),
+        'FUNCTION' =>  array(
+            3,
             'var=',
         ),
-        'LANGUAGE SQL' => 2,
-        'DETERMINISTIC' => 3,
-        'NOT DETERMINISTIC' => 3,
-        'CONTAINS SQL' => 4,
-        'NO SQL' => 4,
-        'READS SQL DATA' => 4,
-        'MODIFIES SQL DATA' => 4,
-        'SQL SECURITY DEFINER' => array(
-            5,
+        'PROCEDURE' =>  array(
+            3,
+            'var=',
+        ),
+        'CONTAINS' =>  array(
+            4,
+            'expr',
+        ),
+        'NO' =>  array(
+            4,
             'var',
-        )
+        ),
+        'READS' =>  array(
+            4,
+            'var',
+        ),
+        'MODIFIES' =>  array(
+            4,
+            'expr',
+        ),
+        'SQL SECURITY' =>  array(
+            6,
+            'var',
+        ),
+        'LANGUAGE' =>  array(
+            7,
+            'var',
+        ),
+        'COMMENT' =>  array(
+            8,
+            'var',
+        ),
+
+        'CREATE' => 1,
+        'DETERMINISTIC' => 2,
+        'DATA' =>  5,
     );
 
     /**
@@ -451,7 +480,8 @@ public function build()
                 . OptionsArray::build($this->options) . ' '
                 . Expression::build($this->name) . ' '
                 . ParameterDefinition::build($this->parameters) . ' '
-                . $tmp . ' ' . TokensList::build($this->body);
+                . $tmp . ' ' .  OptionsArray::build($this->entityOptions) . ' '
+                . TokensList::build($this->body);
         }
 
         return 'CREATE '

tests/Builder/CreateStatementTest.php

@@ -412,9 +412,8 @@ public function testBuilderCreateProcedure()
             $stmt->build()
         );
 
-        $this->assertTrue($stmt->entityOptions->isEmpty());
+        $this->assertFalse($stmt->entityOptions->isEmpty());
         $this->assertFalse($stmt->options->isEmpty());
-
         $this->assertSame(
             'DEFINER=`root`@`%` PROCEDURE',
             $stmt->options->__toString()
@@ -431,12 +430,12 @@ public function testBuilderCreateProcedure()
         );
 
         $this->assertSame(
-            '',
+            'NOT DETERMINISTIC NO SQL SQL SECURITY INVOKER NO SQL SQL SECURITY INVOKER',
             $stmt->entityOptions->__toString()
         );
 
         $this->assertSame(
-            'NOT DETERMINISTIC NO SQL SQL SECURITY INVOKER NO SQL SQL SECURITY INVOKER SELECT _var',
+            'SELECT _var',
             TokensList::build($stmt->body)
         );
     }
@@ -446,9 +445,9 @@ public function testBuilderCreateFunction()
         $parser = new Parser(
             'CREATE DEFINER=`root`@`localhost`'
             . ' FUNCTION `inventory_in_stock`(`p_inventory_id` INT) RETURNS tinyint(1)'
-            . ' READS SQL DATA' . "\n"
-            . ' COMMENT \'My best function written by a friend\'\'s friend' . "\n"
-            . 'BEGIN' . "\n"
+            . ' READS SQL DATA'
+            . ' COMMENT \'My best function written by a friend\'\'s friend\''
+            . ' BEGIN' . "\n"
             . '    DECLARE v_rentals INT;' . "\n"
             . '    DECLARE v_out     INT;' . "\n"
             . "\n"
@@ -482,9 +481,9 @@ public function testBuilderCreateFunction()
         $this->assertSame(
             'CREATE DEFINER=`root`@`localhost`'
             . ' FUNCTION `inventory_in_stock` (`p_inventory_id` INT) RETURNS TINYINT(1)'
-            . ' READS SQL DATA' . "\n"
-            . ' COMMENT \'My best function written by a friend\'\'s friend' . "\n"
-            . 'BEGIN' . "\n"
+            . ' READS SQL DATA'
+            . ' COMMENT \'My best function written by a friend\'\'s friend\''
+            . ' BEGIN' . "\n"
             . '    DECLARE v_rentals INT;' . "\n"
             . '    DECLARE v_out     INT;' . "\n"
             . "\n"
@@ -513,7 +512,7 @@ public function testBuilderCreateFunction()
             $stmt->build()
         );
 
-        $this->assertTrue($stmt->entityOptions->isEmpty());
+        $this->assertFalse($stmt->entityOptions->isEmpty());
         $this->assertFalse($stmt->options->isEmpty());
 
         $this->assertSame(
@@ -532,14 +531,12 @@ public function testBuilderCreateFunction()
         );
 
         $this->assertSame(
-            '',
+            'READS SQL DATA COMMENT \'My best function written by a friend\'\'s friend\'',
             $stmt->entityOptions->__toString()
         );
 
         $this->assertSame(
-            'READS SQL DATA' . "\n"
-            . ' COMMENT \'My best function written by a friend\'\'s friend' . "\n"
-            . 'BEGIN' . "\n"
+            'BEGIN' . "\n"
             . '    DECLARE v_rentals INT;' . "\n"
             . '    DECLARE v_out     INT;' . "\n"
             . "\n"
@@ -600,7 +597,7 @@ public function testBuilderRoutine()
 
         $this->assertEquals(
             'CREATE FUNCTION test (IN `i` INT) RETURNS VARCHAR ' .
-            'BEGIN ' .
+            ' BEGIN ' .
             'DECLARE name VARCHAR DEFAULT ""; ' .
             'SELECT name INTO name FROM employees WHERE id = i; ' .
             'RETURN name; ' .

tests/data/parser/parseCreateProcedure1.in

@@ -1 +1 @@
-CREATE DEFINER=`root`@`%` PROCEDURE `test2`(IN `_var` INT) NOT DETERMINISTIC NO SQL SQL SECURITY INVOKER NO SQL SQL SECURITY INVOKER SELECT _var
+CREATE DEFINER=`root`@`%` PROCEDURE `test2`(IN `_var` INT) NOT DETERMINISTIC NO SQL SQL SECURITY INVOKER SELECT _var