Merge pull request #101 from devenbansod/fix_incorrect_error_in_union

Fix incorrect error in union queries

Author: nijel

src/Utils/Query.php

@@ -831,6 +831,8 @@ public static function getClauseStartOffset($statement, $list, $clause)
                     && ($clause === $token->value)
                 ) {
                     return $i;
+                } elseif ($token->value === 'UNION') {
+                    return -1;
                 }
             }
         }

tests/Parser/SelectStatementTest.php

@@ -61,6 +61,7 @@ public function testSelectProvider()
             array('parser/parseSelectEndOptions2'),
             array('parser/parseSelectEndOptionsErr'),
             array('parser/parseSelectUnion'),
+            array('parser/parseSelectUnion2'),
         );
     }
 }

tests/data/parser/parseSelectUnion2.in

@@ -0,0 +1 @@
+(SELECT DISTINCT `User`, `Host` FROM `mysql`.`user` ) UNION (SELECT DISTINCT `User`, `Host` FROM `mysql`.`db` ) UNION (SELECT DISTINCT `User`, `Host` FROM `mysql`.`tables_priv` ) UNION (SELECT DISTINCT `User`, `Host` FROM `mysql`.`columns_priv` ) UNION (SELECT DISTINCT `User`, `Host` FROM `mysql`.`procs_priv` ) ORDER BY `User` ASC, `Host` ASC