aws-athena-mcp

Instructions

Implementation Reference

• src/index.ts:107-135 (registration)

  Registration of the 'run_saved_query' tool, including its description and input schema in the ListTools response.

  {
    name: "run_saved_query",
    description: "Execute a saved (named) Athena query by its query ID.",
    inputSchema: {
      type: "object",
      properties: {
        namedQueryId: {
          type: "string",
          description: "Athena NamedQueryId",
        },
        databaseOverride: {
          type: "string",
          description: "Optional database override",
        },
        maxRows: {
          type: "number",
          description: "Maximum number of rows to return (default: 1000)",
          minimum: 1,
          maximum: 10000,
        },
        timeoutMs: {
          type: "number",
          description: "Timeout in milliseconds (default: 60000)",
          minimum: 1000,
        },
      },
      required: ["namedQueryId"],
    },
  },

• src/index.ts:226-250 (handler)

  MCP tool handler for 'run_saved_query': validates input, calls AthenaService.executeNamedQuery, and formats response.

  case "run_saved_query": {
    const args = request.params.arguments;
    if (!args || typeof args.namedQueryId !== 'string') {
      throw new McpError(
        ErrorCode.InvalidParams,
        "Missing required parameter: namedQueryId (string)"
      );
    }
  
    const result = await this.athenaService.executeNamedQuery(
      args.namedQueryId,
      typeof args.databaseOverride === 'string' ? args.databaseOverride : undefined,
      typeof args.maxRows === 'number' ? args.maxRows : undefined,
      typeof args.timeoutMs === 'number' ? args.timeoutMs : undefined,
    );
  
    return {
      content: [
        {
          type: "text",
          text: JSON.stringify(result, null, 2),
        },
      ],
    };
  }

• src/athena.ts:225-250 (helper)

  Core implementation in AthenaService: fetches the named query details using GetNamedQueryCommand and executes it via executeQuery.

  async executeNamedQuery(
    namedQueryId: string,
    databaseOverride?: string,
    maxRows?: number,
    timeoutMs?: number
  ): Promise<QueryResult | { queryExecutionId: string }> {
    const namedQueryResp = await this.client.send(
      new GetNamedQueryCommand({ NamedQueryId: namedQueryId })
    );
  
    if (!namedQueryResp.NamedQuery || !namedQueryResp.NamedQuery.QueryString) {
      throw {
        message: "Named query not found or empty",
        code: "NAMED_QUERY_NOT_FOUND",
      };
    }
  
    const queryInput: QueryInput = {
      query: namedQueryResp.NamedQuery.QueryString,
      database: databaseOverride || namedQueryResp.NamedQuery.Database || "",
      maxRows,
      timeoutMs,
    };
  
    return this.executeQuery(queryInput);
  }