Merge pull request #201 from oohook/master

Update PositionCalculator.php
Thank you for your contribution.

Author: greenlion

src/PHPSQLParser/builders/GroupByBuilder.php

@@ -71,6 +71,11 @@ protected function buildGroupByAlias($parsed) {
         $builder = new GroupByAliasBuilder();
         return $builder->build($parsed);
     }
+    
+    protected function buildGroupByExpression($parsed) {
+    	$builder = new GroupByExpressionBuilder();
+        return $builder->build($parsed);
+    }
 
     public function build(array $parsed) {
         $sql = "";
@@ -79,8 +84,9 @@ public function build(array $parsed) {
             $sql .= $this->buildColRef($v);
             $sql .= $this->buildPosition($v);
             $sql .= $this->buildFunction($v);
+            $sql .= $this->buildGroupByExpression($v);
             $sql .= $this->buildGroupByAlias($v);
-
+            
             if ($len == strlen($sql)) {
                 throw new UnableToCreateSQLException('GROUP', $k, $v, 'expr_type');
             }

src/PHPSQLParser/positions/PositionCalculator.php

@@ -156,7 +156,7 @@ protected function findPositionWithinString($sql, $value, $expr_type) {
             // whitespace, comma, parenthesis, digit or letter, end_of_string
             // an operator should not be surrounded by another operator
 
-            if ($expr_type === 'operator') {
+            if (in_array($expr_type,array('operator','column-list'),true)) {
 
                 $ok = ($before === "" || in_array($before, self::$allowedOnOperator, true))
                     || (strtolower($before) >= 'a' && strtolower($before) <= 'z');