From 91fad78b7de5f0f32b3a0e6ea9d893294544effd Mon Sep 17 00:00:00 2001
From: Theodore Li <teddy@zenobiapay.com>
Date: Mon, 16 Mar 2026 22:21:27 -0700
Subject: [PATCH] Fix row_count context

---
 apps/sim/lib/table/service.ts | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/apps/sim/lib/table/service.ts b/apps/sim/lib/table/service.ts
index e4f25689f19..c00fac9856a 100644
--- a/apps/sim/lib/table/service.ts
+++ b/apps/sim/lib/table/service.ts
@@ -64,13 +64,28 @@ export async function getTableById(
 ): Promise<TableDefinition | null> {
   const { includeArchived = false } = options ?? {}
   const results = await db
-    .select()
+    .select({
+      id: userTableDefinitions.id,
+      name: userTableDefinitions.name,
+      description: userTableDefinitions.description,
+      schema: userTableDefinitions.schema,
+      metadata: userTableDefinitions.metadata,
+      maxRows: userTableDefinitions.maxRows,
+      workspaceId: userTableDefinitions.workspaceId,
+      createdBy: userTableDefinitions.createdBy,
+      archivedAt: userTableDefinitions.archivedAt,
+      createdAt: userTableDefinitions.createdAt,
+      updatedAt: userTableDefinitions.updatedAt,
+      rowCount: sql<number>`coalesce(${count(userTableRows.id)}, 0)`.mapWith(Number),
+    })
     .from(userTableDefinitions)
+    .leftJoin(userTableRows, eq(userTableRows.tableId, userTableDefinitions.id))
     .where(
       includeArchived
         ? eq(userTableDefinitions.id, tableId)
         : and(eq(userTableDefinitions.id, tableId), isNull(userTableDefinitions.archivedAt))
     )
+    .groupBy(userTableDefinitions.id)
     .limit(1)
 
   if (results.length === 0) return null