Fix athena issue where it could not connect

Author: adampointer

config.yml.dist

@@ -128,7 +128,7 @@ jobs:
   interval: '5m'
   connections:
   # see https://godoc.org/github.com/segmentio/go-athena#Driver.Open
-  - 'athena://HOST_VALUE_IGNORED/<DB_NAME>?db=<DB_NAME>&region=<AWS_REGION>&output_location=s3://aws-athena-query-results-<ACCOUNT_ID>-<REGION>'
+  - 'athena://?db=<DB_NAME>&region=<AWS_REGION>&output_location=s3://aws-athena-query-results-<ACCOUNT_ID>-<REGION>'
   queries:
   - name: "athena_query_rows"
     help: "Number of rows..."

job.go

@@ -441,10 +441,7 @@ func (j *Job) updateConnections() {
 				user:     user,
 			}
 			if newConn.driver == "athena" {
-				// call go-athena's Open() to ensure conn.db is set,
-				// otherwise API calls will complain about an empty database field:
-				// "InvalidParameter: 1 validation error(s) found. - minimum field size of 1, StartQueryExecutionInput.QueryExecutionContext.Database."
-				newConn.conn, err = sqlx.Open("athena", u.String())
+				newConn.conn, err = sqlx.Open("athena", u.RawQuery)
 				if err != nil {
 					level.Error(j.log).Log("msg", "Failed to open Athena connection", "connection", conn, "err", err)
 					continue