Merge pull request #1773 from katzyn/npe

Fix NPE in TableFilter.createIndexConditions()

h2/src/docsrc/html/changelog.html

@@ -21,6 +21,10 @@ Change Log
 
 <h2>Next Version (unreleased)</h2>
 <ul>
+<li>Issue #1771: NPE in Comparison.createIndexConditions
+</li>
+<li>PR #1772: Fix newlines in test scripts
+</li>
 <li>Issue #1762: NullPointerException in Parser. Introduced in 1.4.198
 </li>
 <li>PR #1768: Add more context-sensitive keywords

h2/src/main/org/h2/table/TableFilter.java

@@ -721,6 +721,7 @@ public class TableFilter implements ColumnResolver {
 
     public void createIndexConditions() {
         if (joinCondition != null) {
+            joinCondition = joinCondition.optimize(session);
             joinCondition.createIndexConditions(session, this);
             if (nestedJoin != null) {
                 joinCondition.createIndexConditions(session, nestedJoin);

h2/src/test/org/h2/test/scripts/joins.sql

@@ -815,3 +815,14 @@ SELECT A.X FROM A JOIN B ON A.X = B.Y AND B.Y >= COALESCE((SELECT Z FROM C FETCH
 
 DROP TABLE A, B, C;
 > ok
+
+CREATE TABLE TEST(A INT PRIMARY KEY);
+> ok
+
+SELECT * FROM TEST X LEFT OUTER JOIN TEST Y ON Y.A = X.A || '1';
+> A A
+> - -
+> rows: 0
+
+DROP TABLE TEST;
+> ok