From a575845f6767c8fbfd8de189cb42adcff4793550 Mon Sep 17 00:00:00 2001 From: Irwan Fario Subastian Date: Tue, 14 Apr 2026 15:53:42 +1000 Subject: [PATCH 1/3] Add support for catalog --- lib/req_athena.ex | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/req_athena.ex b/lib/req_athena.ex index 0878d6c..6dc7eab 100644 --- a/lib/req_athena.ex +++ b/lib/req_athena.ex @@ -19,6 +19,7 @@ defmodule ReqAthena do workgroup region database + catalog athena output_location cache_query @@ -265,7 +266,10 @@ defmodule ReqAthena do body = Map.merge(output_config, %{ - QueryExecutionContext: %{Database: Request.fetch_option!(request, :database)}, + QueryExecutionContext: %{ + Database: Request.fetch_option!(request, :database), + Catalog: Request.fetch_option!(request, :catalog) + }, QueryString: ReqAthena.Query.to_query_string(query) }) From 53497ec288fe7b4ff1367ff73346668824ce758a Mon Sep 17 00:00:00 2001 From: Irwan Fario Subastian Date: Tue, 14 Apr 2026 18:45:20 +1000 Subject: [PATCH 2/3] Make catalog optional --- lib/req_athena.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/req_athena.ex b/lib/req_athena.ex index 6dc7eab..c007c9b 100644 --- a/lib/req_athena.ex +++ b/lib/req_athena.ex @@ -268,7 +268,7 @@ defmodule ReqAthena do Map.merge(output_config, %{ QueryExecutionContext: %{ Database: Request.fetch_option!(request, :database), - Catalog: Request.fetch_option!(request, :catalog) + Catalog: Request.get_option(request, :catalog) }, QueryString: ReqAthena.Query.to_query_string(query) }) From 817ab6dcd9baf16c0a0ac149aac3cb4689ed289c Mon Sep 17 00:00:00 2001 From: Irwan Fario Subastian Date: Wed, 15 Apr 2026 17:54:33 +1000 Subject: [PATCH 3/3] Update test to match default Catalog --- test/req_athena_test.exs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/req_athena_test.exs b/test/req_athena_test.exs index 4677db0..fcc4b51 100644 --- a/test/req_athena_test.exs +++ b/test/req_athena_test.exs @@ -164,6 +164,7 @@ defmodule ReqAthenaTest do assert %{ "ClientRequestToken" => ^client_req_token, "QueryExecutionContext" => %{ + "Catalog" => nil, "Database" => "my_awesome_database" }, "QueryString" => "EXECUTE query_8CD6B60FAFA18EBFA8719A6EAC192624 USING 1", @@ -181,6 +182,7 @@ defmodule ReqAthenaTest do assert %{ "ClientRequestToken" => ^client_req_token, "QueryExecutionContext" => %{ + "Catalog" => nil, "Database" => "my_awesome_database" }, "QueryString" => @@ -346,7 +348,10 @@ defmodule ReqAthenaTest do assert %{ "ClientRequestToken" => ^client_req_token, - "QueryExecutionContext" => %{"Database" => "my_awesome_database"}, + "QueryExecutionContext" => %{ + "Catalog" => nil, + "Database" => "my_awesome_database" + }, "QueryString" => "select * from iris", "WorkGroup" => "default" } = decoded