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

Fixes issue with PreparedStatement.setBigDecimal() in the driver when no scale is passed #684

Merged
merged 9 commits into from
May 2, 2018
Merged

Fixes issue with PreparedStatement.setBigDecimal() in the driver when no scale is passed #684

Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3a13946
Fix for Issue with PreparedStatement.setBigDecimal in the driver - Gi…
cheenamalhotra Apr 23, 2018
1e611c4
Fix | Continued fix for setBigDecimal issues | GitHub issue 683
cheenamalhotra Apr 24, 2018
69feb9d
Fix | Continued fix for setBigDecimal issues | GitHub issue 683
cheenamalhotra Apr 25, 2018
582c39d
Fix | In continuation for setBigDecimal issues - regression issues fi…
cheenamalhotra Apr 25, 2018
53bdf98
Merge branch 'dev' into bigdecimal-issue
cheenamalhotra Apr 28, 2018
79dc829
Merge branch 'dev' into bigdecimal-issue
cheenamalhotra Apr 30, 2018
d21d4b6
Tests | Added tests for decimal values not tested yet | GitHub issue …
cheenamalhotra May 2, 2018
14acb51
Tests | Moved precision hardcoded value to constant | GitHub issue #525
cheenamalhotra May 2, 2018
b9062ba
Merge branch 'dev' into bigdecimal-issue
cheenamalhotra May 2, 2018
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
17 changes: 13 additions & 4 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 @@ -2212,11 +2212,20 @@ void execute(DTV dtv,
BigDecimal bigDecimalValue) throws SQLServerException {
// Rescale the value if necessary
if (null != bigDecimalValue) {
Integer inScale = dtv.getScale();
if (null != inScale && inScale != bigDecimalValue.scale())
bigDecimalValue = bigDecimalValue.setScale(inScale, RoundingMode.DOWN);
Integer dtvScale, biScale = bigDecimalValue.scale();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please apply the formatter, otherwise looks good!

if (null == dtv.getScale() && JDBCType.DECIMAL==dtv.getJdbcType()) {
dtvScale = bigDecimalValue.precision() > SQLServerConnection.maxDecimalPrecision ?
SQLServerConnection.maxDecimalPrecision - (bigDecimalValue.precision() - biScale) : biScale;
if(dtvScale > SQLServerConnection.maxDecimalPrecision) {
dtv.setScale(SQLServerConnection.maxDecimalPrecision);
dtvScale = SQLServerConnection.maxDecimalPrecision;
}else {
dtv.setScale(dtvScale);
}
}else dtvScale = dtv.getScale();
if (dtvScale!=null && dtvScale != biScale)
bigDecimalValue = bigDecimalValue.setScale(dtvScale, RoundingMode.DOWN);
}

dtv.setValue(bigDecimalValue, JavaType.BIGDECIMAL);
}

Expand Down