run ttl processing before schema:process_auto_fields()

Kong · Sep 7, 2023 · 91f1294 · 91f1294
1 parent f971ef7
commit 91f1294
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/kong/db/strategies/off/init.lua b/kong/db/strategies/off/init.lua
@@ -208,14 +208,12 @@ local function page_for_key(self, key, size, offset, options)
       return nil, "stale data detected while paginating"
     end
 
-    item = schema:process_auto_fields(item, "select", true, PROCESS_AUTO_FIELDS_OPTS)
-
     if schema.ttl then
       item = process_ttl_field(item)
     end
 
     if item then
-      ret[ret_idx] = item
+      ret[ret_idx] = schema:process_auto_fields(item, "select", true, PROCESS_AUTO_FIELDS_OPTS)
       ret_idx = ret_idx + 1
     end
   end
@@ -234,12 +232,15 @@ local function select_by_key(schema, key)
     return nil, err
   end
 
-  entity = schema:process_auto_fields(entity, "select", true, PROCESS_AUTO_FIELDS_OPTS)
-
   if schema.ttl then
     entity = process_ttl_field(entity)
+    if not entity then
+      return nil
+    end
   end
 
+  entity = schema:process_auto_fields(entity, "select", true, PROCESS_AUTO_FIELDS_OPTS)
+
   return entity
 end