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

BigDecimal Precision/Scale Fix #1912

Merged
merged 10 commits into from
Sep 21, 2022
Merged

BigDecimal Precision/Scale Fix #1912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b210098
Wei's changes.
Jeffery-Wasty Sep 2, 2022
98063ab
A fix for the division test.
Jeffery-Wasty Sep 2, 2022
0ca5f56
Code cleanup.
Jeffery-Wasty Sep 3, 2022
7ae2ab6
Changed exceptions in method header for more clarity.
Jeffery-Wasty Sep 3, 2022
339f75b
Substitution to simplify test + decimal() to SSType.DECIMAL.toString(…
Jeffery-Wasty Sep 19, 2022
3cf98be
Delete accidentally added file.
Jeffery-Wasty Sep 19, 2022
429cd36
Extended the StatementTest.java cleaning to all similar variables (ca…
Jeffery-Wasty Sep 19, 2022
377db7e
Merge branch 'bigDecimalPrecision' of https://github.com/microsoft/ms…
Jeffery-Wasty Sep 19, 2022
115744d
Removed unused import.
Jeffery-Wasty Sep 19, 2022
7323f2e
Removed unused import.
Jeffery-Wasty Sep 19, 2022
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
37 changes: 23 additions & 14 deletions src/main/java/com/microsoft/sqlserver/jdbc/Parameter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,13 +426,14 @@ final class GetTypeDefinitionOp extends DTVExecuteOp {

private final Parameter param;
private final SQLServerConnection con;
private BigDecimal providedDecimal;

GetTypeDefinitionOp(Parameter param, SQLServerConnection con) {
this.param = param;
this.con = con;
}

private void setTypeDefinition(DTV dtv) {
private void setTypeDefinition(DTV dtv) throws SQLServerException {
switch (dtv.getJdbcType()) {
case TINYINT:
param.typeDefinition = SSType.TINYINT.toString();
Expand Down Expand Up @@ -505,34 +506,42 @@ private void setTypeDefinition(DTV dtv) {
// so, here, if the decimal parameter is encrypted and it is null and it is not outparameter
// then we set precision as the default precision instead of max precision
if (!isOutput()) {
param.typeDefinition = "decimal(" + SQLServerConnection.defaultDecimalPrecision + ", "
+ scale + ")";
param.typeDefinition = SSType.DECIMAL.toString() + "("
+ SQLServerConnection.defaultDecimalPrecision + ", " + scale + ")";
}
} else {
if (SQLServerConnection.defaultDecimalPrecision >= valueLength) {
param.typeDefinition = "decimal(" + SQLServerConnection.defaultDecimalPrecision + ","
+ scale + ")";
param.typeDefinition = SSType.DECIMAL.toString() + "("
+ SQLServerConnection.defaultDecimalPrecision + "," + scale + ")";

if (SQLServerConnection.defaultDecimalPrecision < (valueLength + scale)) {
param.typeDefinition = "decimal("
+ (SQLServerConnection.defaultDecimalPrecision + scale) + "," + scale + ")";
param.typeDefinition = SSType.DECIMAL.toString() + "("
+ (SQLServerConnection.defaultDecimalPrecision + scale) + "," + scale + ")";
}
} else {
param.typeDefinition = "decimal(" + SQLServerConnection.maxDecimalPrecision + ","
+ scale + ")";
param.typeDefinition = SSType.DECIMAL.toString() + "("
+ SQLServerConnection.maxDecimalPrecision + "," + scale + ")";
}
}

if (isOutput()) {
param.typeDefinition = "decimal(" + SQLServerConnection.maxDecimalPrecision + ", " + scale
+ ")";
param.typeDefinition = SSType.DECIMAL.toString() + "("
+ SQLServerConnection.maxDecimalPrecision + ", " + scale + ")";
}

if (userProvidesPrecision) {
param.typeDefinition = "decimal(" + valueLength + "," + scale + ")";
param.typeDefinition = SSType.DECIMAL.toString() + "(" + valueLength + "," + scale + ")";
}
} else
param.typeDefinition = "decimal(" + SQLServerConnection.maxDecimalPrecision + "," + scale + ")";
} else if (dtv.getJavaType() == JavaType.BIGDECIMAL
&& (providedDecimal = (BigDecimal) dtv.getValue(dtv.getJdbcType(), scale, null, null,
typeInfo, cryptoMeta, null, null)) != null
&& providedDecimal.precision() >= scale) {
param.typeDefinition = SSType.DECIMAL.toString() + "(" + providedDecimal.precision()
+ "," + scale + ")";
} else {
param.typeDefinition = SSType.DECIMAL.toString() + "("
+ SQLServerConnection.maxDecimalPrecision + "," + scale + ")";
}

break;

Expand Down
Loading