Merge remote branch 'origin/master'

2010-06-03 22:34:52 +05:30
parent 3bb4dbd0ac 5dfe98a378
commit 160f4314eb
120 changed files with 40225 additions and 32460 deletions
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -2220,6 +2220,10 @@ if (! defined('PMA_MINIMUM_COMMON')) {
                        $after      = '';
                        $before     = '';
                    }
+                    // for example SELECT 1 somealias
+                    if ($typearr[1] == 'digit_integer') {
+                        $before     = ' ';
+                    }
                    if (($typearr[3] == 'alpha_columnType') || ($typearr[3] == 'alpha_identifier')) {
                        $after      .= ' ';
                    }