Skip to content

Handle null values for Timestamp JDBC parameters #5845

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

Merged
XingY merged 1 commit into from
Sep 10, 2024
Merged

Handle null values for Timestamp JDBC parameters #5845

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 4 deletions bigiron/src/org/labkey/bigiron/mssql/MicrosoftSqlServer2016Dialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) throws S
@Override
public void setObject(int parameterIndex, Object x, int targetSqlType, int scale) throws SQLException
{
if (targetSqlType == Types.TIMESTAMP)
if (targetSqlType == Types.TIMESTAMP && x instanceof Timestamp)
setObject(parameterIndex, x);
else
super.setObject(parameterIndex, x, targetSqlType, scale);
Expand All @@ -168,7 +168,7 @@ public void setObject(int parameterIndex, Object x, int targetSqlType, int scale
@Override
public void setObject(int parameterIndex, Object x, int targetSqlType) throws SQLException
{
if (targetSqlType == Types.TIMESTAMP)
if (targetSqlType == Types.TIMESTAMP && x instanceof Timestamp)
setObject(parameterIndex, x);
else
super.setObject(parameterIndex, x, targetSqlType);
Expand All @@ -183,7 +183,7 @@ public void setObject(int parameterIndex, Object x) throws SQLException
@Override
public void setObject(String parameterName, Object x, int targetSqlType, int scale) throws SQLException
{
if (targetSqlType == Types.TIMESTAMP)
if (targetSqlType == Types.TIMESTAMP && x instanceof Timestamp)
setObject(parameterName, x);
else
super.setObject(parameterName, x, targetSqlType, scale);
Expand All @@ -192,7 +192,7 @@ public void setObject(String parameterName, Object x, int targetSqlType, int sca
@Override
public void setObject(String parameterName, Object x, int targetSqlType) throws SQLException
{
if (targetSqlType == Types.TIMESTAMP)
if (targetSqlType == Types.TIMESTAMP && x instanceof Timestamp)
setObject(parameterName, x);
else
super.setObject(parameterName, x, targetSqlType);
Expand Down