From b58b615d94333bb555aa2d53b9a05bcb5611bed9 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Fri, 10 Oct 2025 12:56:07 -0700
Subject: [PATCH 1/2] Replace marker NowTimestamp instances with Timestamp for
 default serialization

---
 api/src/org/labkey/api/data/Table.java | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/api/src/org/labkey/api/data/Table.java b/api/src/org/labkey/api/data/Table.java
index 5b3b76d7b44..2187d82db6d 100644
--- a/api/src/org/labkey/api/data/Table.java
+++ b/api/src/org/labkey/api/data/Table.java
@@ -736,7 +736,7 @@ protected static void _copyInsertSpecialFields(Object returnObject, Map<String,
         if (fields.containsKey(OWNER_COLUMN_NAME))
             _setProperty(returnObject, OWNER_COLUMN_NAME, fields.get(OWNER_COLUMN_NAME));
         if (fields.containsKey(CREATED_COLUMN_NAME))
-            _setProperty(returnObject, CREATED_COLUMN_NAME, fields.get(CREATED_COLUMN_NAME));
+            _setTimestampProperty(returnObject, CREATED_COLUMN_NAME, fields.get(CREATED_COLUMN_NAME));
         if (fields.containsKey(CREATED_BY_COLUMN_NAME))
             _setProperty(returnObject, CREATED_BY_COLUMN_NAME, fields.get(CREATED_BY_COLUMN_NAME));
     }
@@ -765,14 +765,21 @@ protected static void _copyUpdateSpecialFields(TableInfo table, Object returnObj
             _setProperty(returnObject, MODIFIED_BY_COLUMN_NAME, fields.get(MODIFIED_BY_COLUMN_NAME));
 
         if (fields.containsKey(MODIFIED_COLUMN_NAME))
-            _setProperty(returnObject, MODIFIED_COLUMN_NAME, fields.get(MODIFIED_COLUMN_NAME));
+            _setTimestampProperty(returnObject, MODIFIED_COLUMN_NAME, fields.get(MODIFIED_COLUMN_NAME));
 
         ColumnInfo colModified = table.getColumn(MODIFIED_COLUMN_NAME);
         ColumnInfo colVersion = table.getVersionColumn();
         if (null != colVersion && colVersion != colModified && colVersion.getJdbcType() == JdbcType.TIMESTAMP)
-            _setProperty(returnObject, colVersion.getName(), fields.get(colVersion.getName()));
+            _setTimestampProperty(returnObject, colVersion.getName(), fields.get(colVersion.getName()));
     }
 
+    static private void _setTimestampProperty(Object fields, String propName, Object value)
+    {
+        // Replace marker NowTimestamp instances with Timestamp for default serialization
+        if (value instanceof NowTimestamp now)
+            value = new java.sql.Timestamp(now.getTime());
+        _setProperty(fields, propName, value);
+    }
 
     static private void _setProperty(Object fields, String propName, Object value)
     {

From 91da1b6005006932be96a171df10de4f73972032 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Fri, 10 Oct 2025 13:03:35 -0700
Subject: [PATCH 2/2] Always do check

---
 api/src/org/labkey/api/data/Table.java | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/api/src/org/labkey/api/data/Table.java b/api/src/org/labkey/api/data/Table.java
index 2187d82db6d..ab70c00cfdb 100644
--- a/api/src/org/labkey/api/data/Table.java
+++ b/api/src/org/labkey/api/data/Table.java
@@ -736,7 +736,7 @@ protected static void _copyInsertSpecialFields(Object returnObject, Map<String,
         if (fields.containsKey(OWNER_COLUMN_NAME))
             _setProperty(returnObject, OWNER_COLUMN_NAME, fields.get(OWNER_COLUMN_NAME));
         if (fields.containsKey(CREATED_COLUMN_NAME))
-            _setTimestampProperty(returnObject, CREATED_COLUMN_NAME, fields.get(CREATED_COLUMN_NAME));
+            _setProperty(returnObject, CREATED_COLUMN_NAME, fields.get(CREATED_COLUMN_NAME));
         if (fields.containsKey(CREATED_BY_COLUMN_NAME))
             _setProperty(returnObject, CREATED_BY_COLUMN_NAME, fields.get(CREATED_BY_COLUMN_NAME));
     }
@@ -765,24 +765,20 @@ protected static void _copyUpdateSpecialFields(TableInfo table, Object returnObj
             _setProperty(returnObject, MODIFIED_BY_COLUMN_NAME, fields.get(MODIFIED_BY_COLUMN_NAME));
 
         if (fields.containsKey(MODIFIED_COLUMN_NAME))
-            _setTimestampProperty(returnObject, MODIFIED_COLUMN_NAME, fields.get(MODIFIED_COLUMN_NAME));
+            _setProperty(returnObject, MODIFIED_COLUMN_NAME, fields.get(MODIFIED_COLUMN_NAME));
 
         ColumnInfo colModified = table.getColumn(MODIFIED_COLUMN_NAME);
         ColumnInfo colVersion = table.getVersionColumn();
         if (null != colVersion && colVersion != colModified && colVersion.getJdbcType() == JdbcType.TIMESTAMP)
-            _setTimestampProperty(returnObject, colVersion.getName(), fields.get(colVersion.getName()));
+            _setProperty(returnObject, colVersion.getName(), fields.get(colVersion.getName()));
     }
 
-    static private void _setTimestampProperty(Object fields, String propName, Object value)
+    static private void _setProperty(Object fields, String propName, Object value)
     {
         // Replace marker NowTimestamp instances with Timestamp for default serialization
         if (value instanceof NowTimestamp now)
             value = new java.sql.Timestamp(now.getTime());
-        _setProperty(fields, propName, value);
-    }
 
-    static private void _setProperty(Object fields, String propName, Object value)
-    {
         if (fields instanceof Map)
         {
             ((Map<String, Object>) fields).put(propName, value);