CHG: the base_expr of a select-expression contains now an explicit alias (with "as"). Check your client code!

git-svn-id: https://php-sql-parser.googlecode.com/svn/trunk@1351 44dcfd11-89b7-3d55-2063-5c365055f77f

Author: phosco@gmx.de

src/PHPSQLParser/processors/SelectExpressionProcessor.php

@@ -104,6 +104,13 @@ public function process($expression) {
             $base_expr .= $token;
         }
 
+        if ($alias) {
+            // remove quotation from the alias
+            $alias['no_quotes'] = $this->revokeQuotation($alias['name']);
+            $alias['name'] = trim($alias['name']);
+            $alias['base_expr'] = trim($alias['base_expr']);
+        }    
+        
         $stripped = $this->processExpressionList($stripped);
 
         // TODO: the last part can also be a comment, don't use array_pop
@@ -127,26 +134,17 @@ public function process($expression) {
                                'base_expr' => trim($last['base_expr']));
                 // remove the last token
                 array_pop($tokens);
-                $base_expr = join("", $tokens);
             }
         }
 
-        if (!$alias) {
-            $base_expr = join("", $tokens);
-        } else {
-            /* remove escape from the alias */
-            $alias['no_quotes'] = $this->revokeQuotation($alias['name']);
-            $alias['name'] = trim($alias['name']);
-            $alias['base_expr'] = trim($alias['base_expr']);
-        }
-
+        $base_expr = $expression;
+        
         // TODO: this is always done with $stripped, how we do it twice?
         $processed = $this->processExpressionList($tokens);
 
         // if there is only one part, we copy the expr_type
-        // in all other cases we use "expression" as global type
+        // in all other cases we use "EXPRESSION" as global type
         $type = ExpressionType::EXPRESSION;
-
         if (count($processed) === 1) {
             if (!$this->isSubQuery($processed[0])) {
                 $type = $processed[0]['expr_type'];