From c92fda9bd436aa8eab65e09f2d7544905da01347 Mon Sep 17 00:00:00 2001
From: labkey-jeckels <jeckels@labkey.com>
Date: Tue, 20 Dec 2022 10:52:42 -0800
Subject: [PATCH] Issue 46985: Unable to update extensible table row that
 predates custom fields

---
 .../org/labkey/api/query/DefaultQueryUpdateService.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/api/src/org/labkey/api/query/DefaultQueryUpdateService.java b/api/src/org/labkey/api/query/DefaultQueryUpdateService.java
index 04a036037e1..ae5f42bccb9 100644
--- a/api/src/org/labkey/api/query/DefaultQueryUpdateService.java
+++ b/api/src/org/labkey/api/query/DefaultQueryUpdateService.java
@@ -255,9 +255,12 @@ protected Map<String, Object> _select(Container container, Object[] keys) throws
                     }
                 }
             }
-            else
+            // Issue 46985: Be tolerant of a row not having an LSID value (as the row may have been
+            // inserted before the table was made extensible), but make sure that we got an LSID field
+            // when fetching the row
+            else if (!row.containsKey(objectUriCol.getName()))
             {
-                throw new IllegalStateException("LSID value not found in table - " + table.getName());
+                throw new IllegalStateException("LSID value not returned when querying table - " + table.getName());
             }
         }