The wrong kind of exception (NullPointerException) was thrown in a UNION query…

The wrong kind of exception (NullPointerException) was thrown in a UNION query with an incorrect ORDER BY expression.

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,10 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>Browser: if no default browser is set, Google Chrome is now used if available.
+<ul><li>The wrong kind of exception (NullPointerException) was thrown in a UNION query
+    with an incorrect ORDER BY expression.
+</li><li>Issue 362: support LIMIT in UPDATE statements.
+</li><li>Browser: if no default browser is set, Google Chrome is now used if available.
     If not available, then Konqueror, Netscape, or Opera is used if available (as before).
 </li><li>CSV tool: new feature to preserve the case sensitivity of column names
     (option caseSensitiveColumnNames).

h2/src/main/org/h2/command/dml/Query.java

@@ -353,6 +353,7 @@ public abstract class Query extends Prepared {
                             String ca = c.getOriginalTableAliasName();
                             if (ca == null) {
                                 found = false;
+                                if (filters != null) {
                                     // select id from test order by test.id
                                     for (int i = 0, size = filters.size(); i < size; i++) {
                                         TableFilter f = filters.get(i);
@@ -361,6 +362,7 @@ public abstract class Query extends Prepared {
                                             break;
                                         }
                                     }
+                                }
                             } else {
                                 found = db.equalsIdentifiers(ca, tableAlias);
                             }

h2/src/test/org/h2/test/test-1.3.txt

@@ -5,6 +5,9 @@ call cast('null' as uuid);
 create table test(name varchar(255));
 > ok
 
+select * from test union select * from test order by test.name;
+> exception
+
 insert into test values('a'), ('b'), ('c');
 > update count: 3