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

sql_variant issue with String type #442

Merged
merged 5 commits into from
Aug 29, 2017
Merged

sql_variant issue with String type #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
826e650
Merge branch 'getString-issue-for-uniqueidentifier' of https://github…
AfsanehR-zz Aug 10, 2017
8a939e4
Merge branch 'dev' of https://github.com/Microsoft/mssql-jdbc into dev
AfsanehR-zz Aug 14, 2017
9d0486c
fixed issue with sql_variant
AfsanehR-zz Aug 14, 2017
dd74c9d
do not override the maxlength type in sql_variant when reading the va…
AfsanehR-zz Aug 15, 2017
e207571
added test
AfsanehR-zz Aug 29, 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
8 changes: 1 addition & 7 deletions src/main/java/com/microsoft/sqlserver/jdbc/dtv.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3104,7 +3104,7 @@ public void apply(TypeInfo typeInfo,
*/
public void apply(TypeInfo typeInfo,
TDSReader tdsReader) throws SQLServerException {
typeInfo.ssLenType = SSLenType.LONGLENTYPE; //Variant type should be LONGLENTYPE length.
typeInfo.ssLenType = SSLenType.LONGLENTYPE; //sql_variant type should be LONGLENTYPE length.
typeInfo.maxLength = tdsReader.readInt();
typeInfo.ssType = SSType.SQL_VARIANT;
}
Expand Down Expand Up @@ -4115,7 +4115,6 @@ else if (TDSType.NUMERICN == baseType)

case MONEY4:
jdbcType = JDBCType.SMALLMONEY;
typeInfo.setMaxLength(4);
precision = Long.toString(Long.MAX_VALUE).length();
typeInfo.setPrecision(precision);
scale = 4;
Expand All @@ -4128,7 +4127,6 @@ else if (TDSType.NUMERICN == baseType)

case MONEY8:
jdbcType = JDBCType.MONEY;
typeInfo.setMaxLength(8);
precision = Long.toString(Long.MAX_VALUE).length();
scale = 4;
typeInfo.setPrecision(precision);
Expand Down Expand Up @@ -4179,9 +4177,7 @@ else if (TDSType.BIGCHAR == baseType)
jdbcType = JDBCType.CHAR;
collation = tdsReader.readCollation();
typeInfo.setSQLCollation(collation);
typeInfo.setSSLenType(SSLenType.USHORTLENTYPE);
maxLength = tdsReader.readUnsignedShort();
typeInfo.setMaxLength(maxLength);
if (maxLength > DataTypes.SHORT_VARTYPE_MAX_BYTES)
tdsReader.throwInvalidTDS();
typeInfo.setDisplaySize(maxLength);
Expand All @@ -4205,7 +4201,6 @@ else if (TDSType.NVARCHAR == baseType)
jdbcType = JDBCType.NVARCHAR;
collation = tdsReader.readCollation();
typeInfo.setSQLCollation(collation);
typeInfo.setSSLenType(SSLenType.USHORTLENTYPE);
maxLength = tdsReader.readUnsignedShort();
if (maxLength > DataTypes.SHORT_VARTYPE_MAX_BYTES || 0 != maxLength % 2)
tdsReader.throwInvalidTDS();
Expand Down Expand Up @@ -4272,7 +4267,6 @@ else if (TDSType.BIGVARBINARY == baseType)
jdbcType = JDBCType.VARBINARY;
maxLength = tdsReader.readUnsignedShort();
internalVariant.setMaxLength(maxLength);
typeInfo.setMaxLength(maxLength);
if (maxLength > DataTypes.SHORT_VARTYPE_MAX_BYTES)
tdsReader.throwInvalidTDS();
typeInfo.setDisplaySize(2 * maxLength);
Expand Down
14 changes: 14 additions & 0 deletions src/test/java/com/microsoft/sqlserver/jdbc/datatypes/SQLVariantResultSetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,6 +803,20 @@ public void readSeveralRows() throws SQLException {
}

}

/**
* Test retrieving values with varchar and integer as basetype
* @throws SQLException
*/
@Test
public void readVarcharInteger() throws SQLException {
Object expected[] = {"abc", 42};
int index = 0;
rs = (SQLServerResultSet) stmt.executeQuery("SELECT cast('abc' as sql_variant) UNION ALL SELECT cast(42 as sql_variant)");
while (rs.next()) {
assertEquals(rs.getObject(1), expected[index++]);
}
}

private boolean parseByte(byte[] expectedData,
byte[] retrieved) {
Expand Down