From 6486f0f3da9c7efe2a6edf9b8648ec684b608ed6 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 23 May 2003 20:50:49 +0000
Subject: [PATCH] bug 653964

---
 ChangeLog                    | 4 ++++
 libraries/sqlparser.lib.php3 | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f828926a5..3fe90f749 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-05-23 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/sqlparser.lib.php3: bug 653964: wrong alias set by
+      the analyzer, bug analyzed thanks to Michal!
+
 2003-05-23 Michal Cihar  <nijel@users.sourceforge.net>
     * read_dump.php3, tbl_alter.php3: Tabs highlighting...
 
diff --git a/libraries/sqlparser.lib.php3 b/libraries/sqlparser.lib.php3
index 98edb2b17..e96bde190 100644
--- a/libraries/sqlparser.lib.php3
+++ b/libraries/sqlparser.lib.php3
@@ -875,8 +875,12 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
                              
                     if ($subresult['querytype'] == 'SELECT') {
                         if (!$seen_from) {
-                            if ($previous_was_identifier) {
+                            if ($previous_was_identifier && isset($chain)) {
                                 // found alias for this select_expr, save it
+                                // but only if we got something in $chain
+                                // (for example, SELECT COUNT(*) AS cnt
+                                // puts nothing in $chain, so we avoid
+                                // setting the alias)
                                 $alias_for_select_expr = $identifier;
                             } else {
                                 $chain[] = $identifier;