Support unsigned integer #618
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,11 +13,16 @@ class NumericTypeTest extends FunSuite with IntegrationClient { | |
| for (c <- client) { | ||
| Await.ready(c.query( | ||
| """CREATE TEMPORARY TABLE IF NOT EXISTS `numeric` ( | ||
| `tinyint` tinyint(4) NOT NULL, | ||
| `tinyint_unsigned` tinyint(4) UNSIGNED NOT NULL, | ||
| `smallint` smallint(6) NOT NULL, | ||
| `smallint_unsigned` smallint(6) UNSIGNED NOT NULL, | ||
| `mediumint` mediumint(9) NOT NULL, | ||
| `mediumint_unsigned` mediumint(9) UNSIGNED NOT NULL, | ||
| `int` int(11) NOT NULL, | ||
| `int_unsigned` int(11) UNSIGNED NOT NULL, | ||
| `bigint` bigint(20) NOT NULL, | ||
| `bigint_unsigned` bigint(20) UNSIGNED NOT NULL, | ||
| `float` float(4,2) NOT NULL, | ||
| `double` double(4,3) NOT NULL, | ||
| `decimal` decimal(30,11) NOT NULL, | ||
|
|
@@ -26,58 +31,76 @@ class NumericTypeTest extends FunSuite with IntegrationClient { | |
| ) ENGINE=InnoDB DEFAULT CHARSET=utf8;""")) | ||
|
|
||
| Await.ready(c.query( | ||
| """INSERT INTO `numeric` ( | ||
| `tinyint`, `tinyint_unsigned`, | ||
| `smallint`, `smallint_unsigned`, | ||
| `mediumint`, `mediumint_unsigned`, | ||
| `int`, `int_unsigned`, | ||
| `bigint`, `bigint_unsigned`, | ||
| `float`, `double`, `decimal`, `bit`) VALUES ( | ||
| 127, 255, | ||
| 32767, 63535, | ||
| 8388607, 16777215, | ||
| 2147483647, 4294967295, | ||
| 9223372036854775807, 18446744073709551615, | ||
| 1.61, 1.618, 1.61803398875, 1);""")) | ||
|
|
||
| val signedTextEncodedQuery = """SELECT `tinyint`, `smallint`, `mediumint`, `int`, `bigint`, `float`, `double`,`decimal`, `bit` FROM `numeric` """ | ||
| runTest(c, signedTextEncodedQuery)(testRow) | ||
|
|
||
| // TODO Comment out after ignoreUnsigned = true | ||
|
There was a problem hiding this comment. Is this ready to be uncommented now? There was a problem hiding this comment. Honestly, not sure how to set
As you see I set it to There was a problem hiding this comment. You're going to need to make an way to configure the Stack.Params can be a little convoluted at times (all times, really), so look at the HTTP implementation for an example here. The basic idea is to put typed 'params' ( client.configured(SupportUnsignedInts(true))
.whatever(..)
.newService(..) |
||
| // val unsignedTextEncodedQuery = """SELECT `tinyint_unsigned`, `smallint_unsigned`, `mediumint_unsigned`, `int_unsigned`, `bigint_unsigned` FROM `numeric` """ | ||
| // runTest(c, unsignedTextEncodedQuery)(testUnsignedRow) | ||
| } | ||
|
|
||
| def runTest(c: Client, sql: String)(testFunc: Row => Unit): Unit = { | ||
| val textEncoded = Await.result(c.query(sql) map { | ||
| case rs: ResultSet if rs.rows.size > 0 => rs.rows(0) | ||
| case v => fail("expected a ResultSet with 1 row but received: %s".format(v)) | ||
| }) | ||
|
|
||
| val ps = c.prepare(sql) | ||
| val binaryrows = Await.result(ps.select()(identity)) | ||
| assert(binaryrows.size == 1) | ||
| val binaryEncoded = binaryrows(0) | ||
|
|
||
| testFunc(textEncoded) | ||
| testFunc(binaryEncoded) | ||
| } | ||
|
|
||
| def testRow(row: Row) { | ||
| val rowType = row.getClass.getName | ||
| test("extract %s from %s".format("tinyint", rowType)) { | ||
| row("tinyint") match { | ||
| case Some(ByteValue(b)) => assert(b == 127) | ||
| case v => fail("expected ByteValue but got %s".format(v)) | ||
| } | ||
| } | ||
|
|
||
| test("extract %s from %s".format("smallint", rowType)) { | ||
| row("smallint") match { | ||
| case Some(ShortValue(s)) => assert(s == 32767) | ||
| case v => fail("expected ShortValue but got %s".format(v)) | ||
| } | ||
| } | ||
|
|
||
| test("extract %s from %s".format("mediumint", rowType)) { | ||
| row("mediumint") match { | ||
| case Some(IntValue(i)) => assert(i == 8388607) | ||
| case v => fail("expected IntValue but got %s".format(v)) | ||
| } | ||
| } | ||
|
|
||
| test("extract %s from %s".format("int", rowType)) { | ||
| row("int") match { | ||
| case Some(IntValue(i)) => assert(i == 2147483647) | ||
| case v => fail("expected IntValue but got %s".format(v)) | ||
| } | ||
| } | ||
|
|
||
| test("extract %s from %s".format("bigint", rowType)) { | ||
| row("bigint") match { | ||
| case Some(LongValue(l)) => assert(l == 9223372036854775807l) | ||
| case v => fail("expected LongValue but got %s".format(v)) | ||
| } | ||
| } | ||
|
|
@@ -112,6 +135,46 @@ class NumericTypeTest extends FunSuite with IntegrationClient { | |
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
| def testUnsignedRow(row: Row) { | ||
| val rowType = row.getClass.getName | ||
|
|
||
| test("extract %s from %s".format("tinyint_unsigned", rowType)) { | ||
| row("tinyint_unsigned") match { | ||
| case Some(ShortValue(b)) => assert(b == 255) | ||
| case v => fail("expected ShortValue but got %s".format(v)) | ||
| } | ||
| } | ||
|
|
||
| test("extract %s from %s".format("smallint_unsigned", rowType)) { | ||
| row("smallint_unsigned") match { | ||
| case Some(IntValue(s)) => assert(s == 63535) | ||
| case v => fail("expected ShortValue but got %s".format(v)) | ||
| } | ||
| } | ||
|
|
||
| test("extract %s from %s".format("mediumint_unsigned", rowType)) { | ||
| row("mediumint_unsigned") match { | ||
| case Some(IntValue(i)) => assert(i == 16777215) | ||
| case v => fail("expected IntValue but got %s".format(v)) | ||
| } | ||
| } | ||
|
|
||
| test("extract %s from %s".format("int_unsigned", rowType)) { | ||
| row("int_unsigned") match { | ||
| case Some(LongValue(i)) => assert(i == 4294967295l) | ||
| case v => fail("expected IntValue but got %s".format(v)) | ||
| } | ||
| } | ||
|
|
||
| test("extract %s from %s".format("bigint_unsigned", rowType)) { | ||
| row("bigint_unsigned") match { | ||
| case Some(BigIntValue(bi)) => assert(bi == BigInt("18446744073709551615")) | ||
| case v => fail("expected LongValue but got %s".format(v)) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @RunWith(classOf[JUnitRunner]) | ||
|
|
@@ -150,7 +213,7 @@ class BlobTypeTest extends FunSuite with IntegrationClient { | |
| }) | ||
|
|
||
| val ps = c.prepare("SELECT * FROM `blobs`") | ||
| val binaryrows: Seq[Row] = Await.result(ps.select()(identity)) | ||
| assert(binaryrows.size == 1) | ||
| val binaryEncoded = binaryrows(0) | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this unused?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have added for debugging actually but left as is, it might be helpful.