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.

Sign up for GitHub

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

Jump to bottom

Always map java.sql.Types.BIGINT to LongType #311

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Always map java.sql.Types.BIGINT to LongType #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d79ea87
Update RedshiftJDBCWrapper.scala
ngerstle Dec 9, 2016
6a16c4b
Adding regression tests for LongType errors
ngerstle Dec 9, 2016
3809fea
Remove excess whitespace from new test cases.
JoshRosen Jan 5, 2017
de15c0c
More whitespace fixes.
JoshRosen Jan 5, 2017
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
14 changes: 14 additions & 0 deletions src/it/scala/com/databricks/spark/redshift/RedshiftReadSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,4 +245,18 @@ class RedshiftReadSuite extends IntegrationSuiteBase {
.load()
assert(df.schema.fields(0).dataType === LongType)
}

test("read result of count() query (a BigInt) returned as LongType (regression for #310)") {
val df = read
.option("query", s"select count(testbool) as c from $test_table")
.load()
assert(df.schema.fields(0).dataType === LongType)
}

test("read result returning a BigInt becomes a LongType (regression for #311)") {
val df = read
.option("query", s"select testlong::BigInt as c from $test_table")
.load()
assert(df.schema.fields(0).dataType === LongType)
}
}
2 changes: 1 addition & 1 deletion src/main/scala/com/databricks/spark/redshift/RedshiftJDBCWrapper.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ private[redshift] class JDBCWrapper {
val answer = sqlType match {
// scalastyle:off
case java.sql.Types.ARRAY => null
case java.sql.Types.BIGINT => if (signed) { LongType } else { DecimalType(20,0) }
case java.sql.Types.BIGINT => LongType
case java.sql.Types.BINARY => BinaryType
case java.sql.Types.BIT => BooleanType // @see JdbcDialect for quirks
case java.sql.Types.BLOB => BinaryType
Expand Down