Add support for additional options

README.md

@@ -72,6 +72,13 @@ Please note:
 
 If you need an example IAM policy for providing read-only access to your customer-base, check out the [Example IAM Policy](#example-iam-policy) below.
 
+You can provide additional options if necessary. For example, to disable result set streaming and enable `TRACE`-level debugging, use `UseResultsetStreaming=0;LogLevel=6`.
+
+Result set streaming is a performance optimization that streams results from Athena rather than using pagination logic, however it requries outbound access to TCP port 444 and not all organizations allow that.
+
+Other options can be found in the "Driver Configuration Options" section of the [Athena JDBC Driver Installation and Configuration
+Guide](https://s3.amazonaws.com/athena-downloads/drivers/JDBC/SimbaAthenaJDBC_2.0.7/docs/Simba+Athena+JDBC+Driver+Install+and+Configuration+Guide.pdf).
+
 ## Testing
 
 There are two different sets of tests in the project.

resources/metabase-plugin.yaml

@@ -24,6 +24,10 @@ driver:
         - password
         - name: secret_key
         - display-name: Secret Key
+    - merge:
+      - additional-options
+      - display-name: Additional Athena connection string options
+        placeholder: 'UseResultsetStreaming=0;LogLevel=6'
 init:
   - step: load-namespace
     namespace: metabase.driver.athena

src/metabase/driver/athena.clj

@@ -15,6 +15,7 @@
             [metabase.driver :as driver]
             [metabase.driver.common :as driver.common]
             [metabase.driver.sql-jdbc
+             [common :as sql-jdbc.common]
              [connection :as sql-jdbc.conn]
              [execute :as sql-jdbc.execute]
              [sync :as sql-jdbc.sync]]
@@ -49,19 +50,21 @@
 ;;; ---------------------------------------------- sql-jdbc.connection -----------------------------------------------
 
 (defmethod sql-jdbc.conn/connection-details->spec :athena [_ {:keys [region access_key secret_key s3_staging_dir workgroup db], :as details}]
-  (merge
-   {:classname   "com.simba.athena.jdbc.Driver"
-    :subprotocol "awsathena"
-    :subname     (str "//athena." region ".amazonaws.com:443")
-    :user        access_key
-    :password    secret_key
-    :s3_staging_dir  s3_staging_dir
-    :workgroup workgroup
+  (-> (merge
+   {:classname        "com.simba.athena.jdbc.Driver"
+    :subprotocol      "awsathena"
+    :subname          (str "//athena." region ".amazonaws.com:443")
+    :user             access_key
+    :password         secret_key
+    :s3_staging_dir   s3_staging_dir
+    :workgroup        workgroup
+    :AwsRegion        region
     ; :LogLevel    6
     }
    (when (str/blank? access_key)
      {:AwsCredentialsProviderClass "com.simba.athena.amazonaws.auth.DefaultAWSCredentialsProviderChain"})
-   (dissoc details :db)))
+   (dissoc details :db))
+   (sql-jdbc.common/handle-additional-options details, :seperator-style :semicolon)))
 
 ;;; ------------------------------------------------- sql-jdbc.sync --------------------------------------------------