Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Skip header row when not a DDL query #31

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"database/sql/driver"
"errors"
"regexp"
"time"

"github.com/aws/aws-sdk-go/aws"
Expand Down Expand Up @@ -48,10 +49,9 @@ func (c *conn) runQuery(ctx context.Context, query string) (driver.Rows, error)
}

return newRows(rowsConfig{
Athena: c.athena,
QueryID: queryID,
// todo add check for ddl queries to not skip header(#10)
SkipHeader: true,
Athena: c.athena,
QueryID: queryID,
SkipHeader: isDDLQuery(query),
})
}

Expand Down Expand Up @@ -136,3 +136,11 @@ func (c *conn) Exec(query string, args []driver.Value) (driver.Result, error) {

var _ driver.Queryer = (*conn)(nil)
var _ driver.Execer = (*conn)(nil)

// supported DDL statements by Athena
// https://docs.aws.amazon.com/athena/latest/ug/language-reference.html
var ddlQueryRegex = regexp.MustCompile(`(?i)^(ALTER|CREATE|DESCRIBE|DROP|MSCK|SHOW)`)

func isDDLQuery(query string) bool {
return ddlQueryRegex.Match([]byte(query))
}
19 changes: 19 additions & 0 deletions db_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,25 @@ func TestOpen(t *testing.T) {
require.NoError(t, err, "Query")
}

func TestDDLQuery(t *testing.T) {
harness := setup(t)
defer harness.teardown()

rows := harness.mustQuery("show tables")

output := make([]string, 0)
for rows.Next() {
var table string

err := rows.Scan(&table)
assert.NoError(t, err, "rows.Scan()")

output = append(output, table)
}

assert.Equal(t, 1, len(output), "query output")
}

type dummyRow struct {
NullValue *struct{} `json:"nullValue"`
SmallintType int `json:"smallintType"`
Expand Down