fix(athena): address PR review comments

- Fix variable shadowing: rename inner `data` to `rowData` in row mapper
- Fix first-page maxResults off-by-one: request maxResults+1 to compensate for header row
- Add missing runtime guard for queryString in create_named_query
- Move athena registry entries to correct alphabetical position

Author: waleedlatif1

apps/sim/app/api/tools/athena/get-query-results/route.ts

@@ -35,9 +35,13 @@ export async function POST(request: NextRequest) {
       secretAccessKey: data.secretAccessKey,
     })
 
+    const isFirstPage = !data.nextToken
+    const adjustedMaxResults =
+      data.maxResults !== undefined && isFirstPage ? data.maxResults + 1 : data.maxResults
+
     const command = new GetQueryResultsCommand({
       QueryExecutionId: data.queryExecutionId,
-      ...(data.maxResults !== undefined && { MaxResults: data.maxResults }),
+      ...(adjustedMaxResults !== undefined && { MaxResults: adjustedMaxResults }),
       ...(data.nextToken && { NextToken: data.nextToken }),
     })
 
@@ -53,9 +57,9 @@ export async function POST(request: NextRequest) {
     const dataRows = data.nextToken ? rawRows : rawRows.slice(1)
     const rows = dataRows.map((row) => {
       const record: Record<string, string> = {}
-      const data = row.Data ?? []
+      const rowData = row.Data ?? []
       for (let i = 0; i < columns.length; i++) {
-        record[columns[i].name] = data[i]?.VarCharValue ?? ''
+        record[columns[i].name] = rowData[i]?.VarCharValue ?? ''
       }
       return record
     })

apps/sim/blocks/blocks/athena.ts

@@ -297,6 +297,9 @@ Return ONLY the SQL query — no explanations, no markdown code blocks.`,
             if (!rest.database) {
               throw new Error('Database is required')
             }
+            if (!rest.queryString) {
+              throw new Error('SQL query string is required')
+            }
             return {
               awsRegion,
               awsAccessKeyId,

apps/sim/tools/registry.ts

@@ -2840,6 +2840,14 @@ export const tools: Record<string, ToolConfig> = {
   ashby_remove_candidate_tag: ashbyRemoveCandidateTagTool,
   ashby_search_candidates: ashbySearchCandidatesTool,
   ashby_update_candidate: ashbyUpdateCandidateTool,
+  athena_start_query: athenaStartQueryTool,
+  athena_get_query_execution: athenaGetQueryExecutionTool,
+  athena_get_query_results: athenaGetQueryResultsTool,
+  athena_stop_query: athenaStopQueryTool,
+  athena_list_query_executions: athenaListQueryExecutionsTool,
+  athena_create_named_query: athenaCreateNamedQueryTool,
+  athena_get_named_query: athenaGetNamedQueryTool,
+  athena_list_named_queries: athenaListNamedQueriesTool,
   brandfetch_get_brand: brandfetchGetBrandTool,
   brandfetch_search: brandfetchSearchTool,
   box_copy_file: boxCopyFileTool,
@@ -3434,14 +3442,6 @@ export const tools: Record<string, ToolConfig> = {
   rds_delete: rdsDeleteTool,
   rds_execute: rdsExecuteTool,
   rds_introspect: rdsIntrospectTool,
-  athena_start_query: athenaStartQueryTool,
-  athena_get_query_execution: athenaGetQueryExecutionTool,
-  athena_get_query_results: athenaGetQueryResultsTool,
-  athena_stop_query: athenaStopQueryTool,
-  athena_list_query_executions: athenaListQueryExecutionsTool,
-  athena_create_named_query: athenaCreateNamedQueryTool,
-  athena_get_named_query: athenaGetNamedQueryTool,
-  athena_list_named_queries: athenaListNamedQueriesTool,
   cloudformation_describe_stacks: cloudformationDescribeStacksTool,
   cloudformation_list_stack_resources: cloudformationListStackResourcesTool,
   cloudformation_detect_stack_drift: cloudformationDetectStackDriftTool,