--no commit message

--no commit message

h2/src/docsrc/html/changelog.html

@@ -16,7 +16,8 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>The build target 'build jarSmall' now includes the embedded database.
+<ul><li>The H2 Console replaced an empty user name with a single space. 
+</li><li>The build target 'build jarSmall' now includes the embedded database.
 </li><li>JdbcDataSource now keeps the password in a char array where possible.
 </li><li>ResultSet.absolute did not always work with large result sets.
 </li><li>Column aliases can now be used in GROUP BY and HAVING.

h2/src/main/org/h2/expression/ExpressionColumn.java

@@ -11,6 +11,7 @@ import java.util.HashMap;
 
 import org.h2.command.Parser;
 import org.h2.command.dml.Select;
+import org.h2.command.dml.SelectListColumnResolver;
 import org.h2.constant.ErrorCode;
 import org.h2.engine.Database;
 import org.h2.engine.Session;
@@ -101,9 +102,13 @@ public class ExpressionColumn extends Expression {
             column = col;
             this.resolver = resolver;
         } else if (queryLevel == level && this.resolver != resolver) {
+            if (resolver instanceof SelectListColumnResolver) {
+                // ignore - already mapped, that's ok
+            } else {
                 throw Message.getSQLException(ErrorCode.AMBIGUOUS_COLUMN_NAME_1, columnName);
             }
         }
+    }
 
     public Expression optimize(Session session) throws SQLException {
         if (resolver == null) {

h2/src/test/org/h2/test/testSimple.in.txt

+SELECT X FROM dual GROUP BY X HAVING X=AVG(X);
+> 1;
 create view test_view(id,) as select * from dual; 
 drop view test_view;
 create table test(id int,);