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

Improvements | SQLServerParameterMetadata improvements with improved code coverage #973

Merged
merged 8 commits into from
Mar 13, 2019
Merged

Improvements | SQLServerParameterMetadata improvements with improved code coverage #973

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d06da0a
Improvements | Add Null Checks to possible Null values
cheenamalhotra Feb 28, 2019
a97fb43
Cleanup up ParameterMetadata implementation + improve code coverage
cheenamalhotra Mar 5, 2019
d67e5fa
Minor improvement
cheenamalhotra Mar 5, 2019
4bb0645
Adjustments
cheenamalhotra Mar 5, 2019
b12c643
Adjustments + Javadoc updated
cheenamalhotra Mar 5, 2019
8453cc2
Adjustments
cheenamalhotra Mar 6, 2019
e3ac166
Respecting review comments
cheenamalhotra Mar 7, 2019
6504ed7
Merge branch 'ms-dev' into nullPointers
cheenamalhotra Mar 8, 2019
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
87 changes: 60 additions & 27 deletions src/main/java/com/microsoft/sqlserver/jdbc/SQLServerParameterMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,15 +735,19 @@ private void checkParam(int n) throws SQLServerException {
@Override
public String getParameterClassName(int param) throws SQLServerException {
checkClosed();
String parameterClassName = null;
try {
if (procMetadata == null) {
// PreparedStatement.
checkParam(param);
return queryMetaMap.get(param).parameterClassName;
parameterClassName = queryMetaMap.get(param).parameterClassName;
} else {
JDBCType jdbcType = JDBCType.of((short) getParameterInfo(param).get("DATA_TYPE"));
return jdbcType.className();
Map<String, Object> info = getParameterInfo(param);
if (null != info) {
parameterClassName = JDBCType.of((short) info.get("DATA_TYPE")).className();
}
}
return parameterClassName;
} catch (SQLException e) {
SQLServerException.makeFromDriverError(con, stmtParent, e.toString(), null, false);
return null;
Expand Down Expand Up @@ -771,15 +775,19 @@ public int getParameterMode(int param) throws SQLServerException {
// if it is not a stored proc, the param can only be input.
return parameterModeIn;
} else {
int n = (int) getParameterInfo(param).get("COLUMN_TYPE");
switch (n) {
case 1:
return parameterModeIn;
case 2:
return parameterModeOut;
default:
return parameterModeUnknown;
Map<String, Object> info = getParameterInfo(param);
if (null != info) {
int n = (int) info.get("COLUMN_TYPE");
switch (n) {
case 1:
return parameterModeIn;
case 2:
return parameterModeOut;
default:
return parameterModeUnknown;
}
}
return parameterModeUnknown;
}
} catch (SQLException e) {
SQLServerException.makeFromDriverError(con, stmtParent, e.toString(), null, false);
Expand Down Expand Up @@ -829,14 +837,19 @@ public int getParameterType(int param) throws SQLServerException {
@Override
public String getParameterTypeName(int param) throws SQLServerException {
checkClosed();
String parameterTypeName = null;
try {
if (procMetadata == null) {
// PreparedStatement.
checkParam(param);
return queryMetaMap.get(param).parameterTypeName;
parameterTypeName = queryMetaMap.get(param).parameterTypeName;
} else {
return getParameterInfo(param).get("TYPE_NAME").toString();
Map<String, Object> info = getParameterInfo(param);
if (null != info) {
parameterTypeName = info.get("TYPE_NAME").toString();
}
}
return parameterTypeName;
} catch (SQLException e) {
SQLServerException.makeFromDriverError(con, stmtParent, e.toString(), null, false);
return null;
Expand All @@ -846,15 +859,19 @@ public String getParameterTypeName(int param) throws SQLServerException {
@Override
public int getPrecision(int param) throws SQLServerException {
checkClosed();
int nPrec = 0;
try {
if (procMetadata == null) {
// PreparedStatement.
checkParam(param);
return queryMetaMap.get(param).precision;
nPrec = queryMetaMap.get(param).precision;
} else {
int nPrec = (int) getParameterInfo(param).get("PRECISION");
return nPrec;
Map<String, Object> info = getParameterInfo(param);
if (null != info) {
nPrec = (int) info.get("PRECISION");
}
}
return nPrec;
} catch (SQLException e) {
SQLServerException.makeFromDriverError(con, stmtParent, e.toString(), null, false);
return 0;
Expand All @@ -864,15 +881,19 @@ public int getPrecision(int param) throws SQLServerException {
@Override
public int getScale(int param) throws SQLServerException {
checkClosed();
int nScale = 0;
try {
if (procMetadata == null) {
// PreparedStatement.
checkParam(param);
return queryMetaMap.get(param).scale;
nScale = queryMetaMap.get(param).scale;
} else {
int nScale = (int) getParameterInfo(param).get("SCALE");
return nScale;
Map<String, Object> info = getParameterInfo(param);
if (null != info) {
nScale = (int) getParameterInfo(param).get("SCALE");
}
}
return nScale;
} catch (SQLException e) {
SQLServerException.makeFromDriverError(con, stmtParent, e.toString(), null, false);
return 0;
Expand All @@ -888,11 +909,14 @@ public int isNullable(int param) throws SQLServerException {
checkParam(param);
return queryMetaMap.get(param).isNullable;
} else {
int nNull = (int) getParameterInfo(param).get("NULLABLE");
if (nNull == 1)
return parameterNullable;
if (nNull == 0)
return parameterNoNulls;
Map<String, Object> info = getParameterInfo(param);
if (null != info) {
int nNull = (int) info.get("NULLABLE");
if (nNull == 1)
return parameterNullable;
if (nNull == 0)
return parameterNoNulls;
}
return parameterNullableUnknown;
}
} catch (SQLException e) {
Expand All @@ -913,14 +937,19 @@ public int isNullable(int param) throws SQLServerException {
@Override
public boolean isSigned(int param) throws SQLServerException {
checkClosed();
boolean isSigned = false;
try {
if (procMetadata == null) {
// PreparedStatement.
checkParam(param);
return queryMetaMap.get(param).isSigned;
isSigned = queryMetaMap.get(param).isSigned;
} else {
return JDBCType.of((short) getParameterInfo(param).get("DATA_TYPE")).isSigned();
Map<String, Object> info = getParameterInfo(param);
if (null != info) {
isSigned = JDBCType.of((short) info.get("DATA_TYPE")).isSigned();
}
}
return isSigned;
} catch (SQLException e) {
SQLServerException.makeFromDriverError(con, stmtParent, e.toString(), null, false);
return false;
Expand All @@ -929,6 +958,10 @@ public boolean isSigned(int param) throws SQLServerException {

String getTVPSchemaFromStoredProcedure(int param) throws SQLServerException {
checkClosed();
return (String) getParameterInfo(param).get("SS_TYPE_SCHEMA_NAME");
Map<String, Object> info = getParameterInfo(param);
if (null != info) {
return (String) info.get("SS_TYPE_SCHEMA_NAME");
}
return null;
}
}