Multiple nested queries in the FROM clause with parameters did not always work.

h2/src/main/org/h2/command/Parser.java

@@ -939,7 +939,7 @@ public class Parser {
                     s = session;
                 }
                 alias = session.getNextSystemIdentifier(sqlCommand);
-                table = TableView.createTempView(s, session.getUser(), alias, query);
+                table = TableView.createTempView(s, session.getUser(), alias, query, currentSelect);
             } else {
                 TableFilter top = readTableFilter(fromOuter);
                 top = readJoin(top, currentSelect, fromOuter);

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

@@ -140,7 +140,7 @@ public class ConditionInSelect extends Condition {
             return this;
         }
         String name = session.getNextSystemIdentifier(select.getSQL());
-        TableView view = TableView.createTempView(session, session.getUser(), name, query);
+        TableView view = TableView.createTempView(session, session.getUser(), name, query, select);
         TableFilter filter = new TableFilter(session, view, name, false, select);
         select.addTableFilter(filter, true);
         ExpressionColumn column = new ExpressionColumn(session.getDatabase(), null, view.getName(), alias);

h2/src/main/org/h2/index/ViewIndex.java

@@ -29,9 +29,10 @@ import org.h2.value.Value;
  */
 public class ViewIndex extends BaseIndex {
 
-    private String querySQL;
-    private ObjectArray originalParameters;
-    private SmallLRUCache costCache = new SmallLRUCache(Constants.VIEW_INDEX_CACHE_SIZE);
+    private final TableView view;
+    private final String querySQL;
+    private final ObjectArray originalParameters;
+    private final SmallLRUCache costCache = new SmallLRUCache(Constants.VIEW_INDEX_CACHE_SIZE);
     private boolean recursive;
     private int[] masks;
     private String planSQL;
@@ -40,6 +41,7 @@ public class ViewIndex extends BaseIndex {
 
     public ViewIndex(TableView view, String querySQL, ObjectArray originalParameters, boolean recursive) {
         initBaseIndex(view, 0, null, null, IndexType.createNonUnique(false));
+        this.view = view;
         this.querySQL = querySQL;
         this.originalParameters = originalParameters;
         this.recursive = recursive;
@@ -48,6 +50,7 @@ public class ViewIndex extends BaseIndex {
 
     public ViewIndex(TableView view, ViewIndex index, Session session, int[] masks) throws SQLException {
         initBaseIndex(view, 0, null, null, IndexType.createNonUnique(false));
+        this.view = view;
         this.querySQL = index.querySQL;
         this.originalParameters = index.originalParameters;
         this.recursive = index.recursive;
@@ -122,7 +125,7 @@ public class ViewIndex extends BaseIndex {
                 Column col = table.getColumn(idx);
                 columns[i] = col;
                 int mask = masks[idx];
-                int nextParamIndex = query.getParameters().size();
+                int nextParamIndex = query.getParameters().size() + view.getParameterOffset();
                 if ((mask & IndexCondition.EQUALITY) != 0) {
                     Parameter param = new Parameter(nextParamIndex);
                     query.addGlobalCondition(param, idx, Comparison.EQUAL);
@@ -172,6 +175,7 @@ public class ViewIndex extends BaseIndex {
             len = 0;
         }
         int idx = originalParameters == null ? 0 : originalParameters.size();
+        idx += view.getParameterOffset();
         for (int i = 0; i < len; i++) {
             if (first != null) {
                 Value v = first.getValue(i);
@@ -199,6 +203,7 @@ public class ViewIndex extends BaseIndex {
             return query;
         }
         int firstIndexParam = originalParameters == null ? 0 : originalParameters.size();
+        firstIndexParam += view.getParameterOffset();
         IntArray paramIndex = new IntArray();
         for (int i = 0; i < masks.length; i++) {
             int mask = masks[i];

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

@@ -44,6 +44,7 @@ public class TableView extends Table {
     private long lastModificationCheck;
     private long maxDataModificationId;
     private User owner;
+    private Query topQuery;
 
     public TableView(Schema schema, int id, String name, String querySQL, ObjectArray params, String[] columnNames,
             Session session, boolean recursive) throws SQLException {
@@ -342,13 +343,15 @@ public class TableView extends Table {
      * @param owner the owner of the query
      * @param name the view name
      * @param query the query
+     * @param topQuery the top level query
      * @return the view table
      */
-    public static TableView createTempView(Session session, User owner, String name, Query query) throws SQLException {
+    public static TableView createTempView(Session session, User owner, String name, Query query, Query topQuery) throws SQLException {
         Schema mainSchema = session.getDatabase().getSchema(Constants.SCHEMA_MAIN);
         String querySQL = query.getPlanSQL();
         TableView v = new TableView(mainSchema, 0, name, querySQL, query.getParameters(), null, session,
                 false);
+        v.setTopQuery(topQuery);
         if (v.createException != null) {
             throw v.createException;
         }
@@ -357,8 +360,16 @@ public class TableView extends Table {
         return v;
     }
 
+    private void setTopQuery(Query topQuery) {
+        this.topQuery = topQuery;
+    }
+
     public long getRowCountApproximation() {
         return ROW_COUNT_APPROXIMATION;
     }
 
+    public int getParameterOffset() {
+        return topQuery == null ? 0 : topQuery.getParameters().size();
+    }
+
 }

h2/src/test/org/h2/test/db/TestCases.java

@@ -36,6 +36,8 @@ public class TestCases extends TestBase {
     }
 
     public void test() throws Exception {
+        testJoinWithView();
+        testLobDecrypt();
         testInvalidDatabaseName();
         testReuseSpace();
         testDeleteGroup();
@@ -68,6 +70,43 @@ public class TestCases extends TestBase {
         deleteDb("cases");
     }
 
+    private void testJoinWithView() throws SQLException {
+        deleteDb("cases");
+        Connection conn = getConnection("cases");
+        conn.createStatement().execute(
+                "create table t(i identity, n varchar) as select 1, 'x'");
+        PreparedStatement prep = conn.prepareStatement(
+                "select 1 from dual " +
+                "inner join(select n from t where i=?) a on a.n='x' " +
+                "inner join(select n from t where i=?) b on b.n='x'");
+        prep.setInt(1, 1);
+        prep.setInt(2, 1);
+        prep.execute();
+        conn.close();
+    }
+
+    private void testLobDecrypt() throws SQLException {
+        Connection conn = getConnection("cases");
+        String key = "key";
+        String value = "Hello World";
+        PreparedStatement prep = conn.prepareStatement("CALL ENCRYPT('AES', RAWTOHEX(?), STRINGTOUTF8(?))");
+        prep.setCharacterStream(1, new StringReader(key), -1);
+        prep.setCharacterStream(2, new StringReader(value), -1);
+        ResultSet rs = prep.executeQuery();
+        rs.next();
+        String encrypted = rs.getString(1);
+        PreparedStatement prep2 = conn
+                .prepareStatement("CALL TRIM(CHAR(0) FROM UTF8TOSTRING(DECRYPT('AES', RAWTOHEX(?), ?)))");
+        prep2.setCharacterStream(1, new StringReader(key), -1);
+        prep2.setCharacterStream(2, new StringReader(encrypted), -1);
+        ResultSet rs2 = prep2.executeQuery();
+        rs2.first();
+        String decrypted = rs2.getString(1);
+        prep2.close();
+        assertEquals(value, decrypted);
+        conn.close();
+    }
+
     private void testReservedKeywordReconnect() throws SQLException {
         if (config.memory) {
             return;