Fix index info meta

polypheny · Mar 20, 2024 · fa5842a · fa5842a
1 parent 5a682a7
commit fa5842a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/src/main/java/org/polypheny/jdbc/meta/MetaResultSetComparators.java b/src/main/java/org/polypheny/jdbc/meta/MetaResultSetComparators.java
@@ -14,9 +14,10 @@ public class MetaResultSetComparators {
     public static final Comparator<GenericMetaContainer> PRIMARY_KEY_COMPARATOR = Comparator
             .comparing( g -> (String) (g.getValue( 2 )) );
     public static final Comparator<GenericMetaContainer> INDEX_COMPARATOR = Comparator
-            .comparing( ( GenericMetaContainer g ) -> (Boolean) (g.getValue( 3 )) )
-            .thenComparing( ( GenericMetaContainer g ) -> (String) (g.getValue( 4 )) )
-            .thenComparing( ( GenericMetaContainer g ) -> (Integer) (g.getValue( 5 )) );
+            .comparing( ( GenericMetaContainer g ) -> (Boolean) (g.getValue( 2 )) )
+            .thenComparing( (GenericMetaContainer g) -> (int) (g.getValue( 7 )) )
+            .thenComparing( ( GenericMetaContainer g ) -> (String) (g.getValue( 3 )) )
+            .thenComparing( ( GenericMetaContainer g ) -> (Integer) (g.getValue( 4 )) );
     public static final Comparator<GenericMetaContainer> IMPORTED_KEYS_COMPARATOR = Comparator
             .comparing( ( GenericMetaContainer g ) -> (String) (g.getValue( 0 )) )
             .thenComparing( ( GenericMetaContainer g ) -> (String) (g.getValue( 1 )) )

diff --git a/src/main/java/org/polypheny/jdbc/meta/MetaResultSetSignatures.java b/src/main/java/org/polypheny/jdbc/meta/MetaResultSetSignatures.java
@@ -130,21 +130,21 @@ public class MetaResultSetSignatures {
     );
 
     public static final List<MetaResultSetParameter<GenericMetaContainer>> INDEX_GMC_SIGNATURE = Arrays.asList(
-            new MetaResultSetParameter<>( "TABLE_CAT", Types.VARCHAR, p -> p.getValue( 0 ) ),
-            new MetaResultSetParameter<>( "TABLE_SCHEM", Types.VARCHAR, p -> p.getValue( 1 ) ),
-            new MetaResultSetParameter<>( "TABLE_NAME", Types.VARCHAR, p -> p.getValue( 2 ) ),
-            new MetaResultSetParameter<>( "NON_UNIQUE", Types.BOOLEAN, p -> p.getValue( 3 ) ),
+            new MetaResultSetParameter<>( "TABLE_CAT", Types.VARCHAR, p -> null ),
+            new MetaResultSetParameter<>( "TABLE_SCHEM", Types.VARCHAR, p -> p.getValue( 0 ) ),
+            new MetaResultSetParameter<>( "TABLE_NAME", Types.VARCHAR, p -> p.getValue( 1 ) ),
+            new MetaResultSetParameter<>( "NON_UNIQUE", Types.BOOLEAN, p -> p.getValue( 2 ) ),
             new MetaResultSetParameter<>( "INDEX_QUALIFIER", Types.VARCHAR, p -> null ),
-            new MetaResultSetParameter<>( "INDEX_NAME", Types.VARCHAR, p -> p.getValue( 4 ) ),
+            new MetaResultSetParameter<>( "INDEX_NAME", Types.VARCHAR, p -> p.getValue( 3 ) ),
             new MetaResultSetParameter<>( "TYPE", Types.TINYINT, p -> 0 ),
-            new MetaResultSetParameter<>( "ORDINAL_POSITION", Types.TINYINT, integerAsShort( p -> p.getValue( 5 ) ) ),
-            new MetaResultSetParameter<>( "COLUMN_NAME", Types.VARCHAR, p -> p.getValue( 6 ) ),
+            new MetaResultSetParameter<>( "ORDINAL_POSITION", Types.TINYINT, integerAsShort( p -> p.getValue( 4 ) ) ),
+            new MetaResultSetParameter<>( "COLUMN_NAME", Types.VARCHAR, p -> p.getValue( 5 ) ),
             new MetaResultSetParameter<>( "ASC_OR_DESC", Types.VARCHAR, p -> null ),
             new MetaResultSetParameter<>( "CARDINALITY", Types.BIGINT, p -> (long) -1 ),
             new MetaResultSetParameter<>( "PAGES", Types.BIGINT, p -> null ),
             new MetaResultSetParameter<>( "FILTER_CONDITION", Types.VARCHAR, p -> null ),
-            new MetaResultSetParameter<>( "LOCATION", Types.INTEGER, p -> p.getValue( 7 ) ),
-            new MetaResultSetParameter<>( "INDEX_TYPE", Types.INTEGER, p -> p.getValue( 8 ) )
+            new MetaResultSetParameter<>( "LOCATION", Types.INTEGER, p -> p.getValue( 6 ) ),
+            new MetaResultSetParameter<>( "INDEX_TYPE", Types.INTEGER, p -> p.getValue( 7 ) )
     );
 
     public static final List<MetaResultSetParameter<Procedure>> PROCEDURE_SIGNATURE = Arrays.asList(