Fix AggregateDataEnvelope.getGeometryColumnIndex() for multiple indexes

h2/src/main/org/h2/expression/aggregate/AggregateDataEnvelope.java

@@ -46,7 +46,7 @@ class AggregateDataEnvelope extends AggregateData {
                     if (indexes != null) {
                         for (int i = 1, size = indexes.size(); i < size; i++) {
                             Index index = indexes.get(i);
-                            if (index instanceof MVSpatialIndex) {
+                            if (index instanceof MVSpatialIndex && index.isFirstColumn(column)) {
                                 return index;
                             }
                         }

h2/src/test/org/h2/test/scripts/functions/aggregate/envelope.sql

@@ -100,3 +100,19 @@ SELECT ENVELOPE(V) FROM TEST;
 
 DROP TABLE TEST;
 > ok
+
+-- Test for index selection
+CREATE TABLE TEST(G1 GEOMETRY, G2 GEOMETRY) AS (SELECT NULL, 'POINT (1 1)'::GEOMETRY);
+> ok
+
+CREATE SPATIAL INDEX G1IDX ON TEST(G1);
+> ok
+
+CREATE SPATIAL INDEX G2IDX ON TEST(G2);
+> ok
+
+SELECT ENVELOPE(G2) FROM TEST;
+>> POINT (1 1)
+
+DROP TABLE TEST;
+> ok