From 129c0091ff93653e3d85eccf2fef94539c1eb10e Mon Sep 17 00:00:00 2001
From: Adam Rauch <adam@labkey.com>
Date: Tue, 23 Sep 2025 06:49:59 -0700
Subject: [PATCH 1/3] Track and report index information via proper objects

---
 .../org/labkey/dbutils/api/schema/DecoratedTableInfo.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DBUtils/api-src/org/labkey/dbutils/api/schema/DecoratedTableInfo.java b/DBUtils/api-src/org/labkey/dbutils/api/schema/DecoratedTableInfo.java
index 782a112df..596afbc07 100644
--- a/DBUtils/api-src/org/labkey/dbutils/api/schema/DecoratedTableInfo.java
+++ b/DBUtils/api-src/org/labkey/dbutils/api/schema/DecoratedTableInfo.java
@@ -135,13 +135,13 @@ public List<ColumnInfo> getPkColumns() {
 
     @NotNull
     @Override
-    public Map<String, Pair<IndexType, List<ColumnInfo>>> getUniqueIndices() {
+    public Map<String, IndexDef> getUniqueIndices() {
         return _tableInfo.getUniqueIndices();
     }
 
     @NotNull
     @Override
-    public Map<String, Pair<IndexType, List<ColumnInfo>>> getAllIndices() {
+    public Map<String, IndexDef> getAllIndices() {
         return _tableInfo.getAllIndices();
     }
 

From faa7bb2ce5de544f915e75187f6440dee2f3faad Mon Sep 17 00:00:00 2001
From: Adam Rauch <adam@labkey.com>
Date: Tue, 23 Sep 2025 23:07:32 -0700
Subject: [PATCH 2/3] IndexDef -> IndexDefinition. Drop exp indices.

---
 .../org/labkey/dbutils/api/schema/DecoratedTableInfo.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DBUtils/api-src/org/labkey/dbutils/api/schema/DecoratedTableInfo.java b/DBUtils/api-src/org/labkey/dbutils/api/schema/DecoratedTableInfo.java
index 596afbc07..5032e8e8e 100644
--- a/DBUtils/api-src/org/labkey/dbutils/api/schema/DecoratedTableInfo.java
+++ b/DBUtils/api-src/org/labkey/dbutils/api/schema/DecoratedTableInfo.java
@@ -135,13 +135,13 @@ public List<ColumnInfo> getPkColumns() {
 
     @NotNull
     @Override
-    public Map<String, IndexDef> getUniqueIndices() {
+    public Map<String, IndexDefinition> getUniqueIndices() {
         return _tableInfo.getUniqueIndices();
     }
 
     @NotNull
     @Override
-    public Map<String, IndexDef> getAllIndices() {
+    public Map<String, IndexDefinition> getAllIndices() {
         return _tableInfo.getAllIndices();
     }
 

From 2698159994645a74594d057e9f0eb05aa1248de0 Mon Sep 17 00:00:00 2001
From: Adam Rauch <adam@labkey.com>
Date: Fri, 26 Sep 2025 07:13:12 -0700
Subject: [PATCH 3/3] Simplify further: return List<IndexDefinition> instead of
 a map

---
 .../org/labkey/dbutils/api/schema/DecoratedTableInfo.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DBUtils/api-src/org/labkey/dbutils/api/schema/DecoratedTableInfo.java b/DBUtils/api-src/org/labkey/dbutils/api/schema/DecoratedTableInfo.java
index 5032e8e8e..403ae70fe 100644
--- a/DBUtils/api-src/org/labkey/dbutils/api/schema/DecoratedTableInfo.java
+++ b/DBUtils/api-src/org/labkey/dbutils/api/schema/DecoratedTableInfo.java
@@ -135,13 +135,13 @@ public List<ColumnInfo> getPkColumns() {
 
     @NotNull
     @Override
-    public Map<String, IndexDefinition> getUniqueIndices() {
+    public List<IndexDefinition> getUniqueIndices() {
         return _tableInfo.getUniqueIndices();
     }
 
     @NotNull
     @Override
-    public Map<String, IndexDefinition> getAllIndices() {
+    public List<IndexDefinition> getAllIndices() {
         return _tableInfo.getAllIndices();
     }