root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

StatementCreatorUtils.setValue only uses setString etc for Types.OTHER in case of Oracle 

Issue: SPR-12890
This commit is contained in:
Juergen Hoeller 2015-04-16 21:53:51 +02:00
parent 10a51a4f19
commit 050e581c10
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java
View File

@ -410,7 +410,8 @@ public abstract class StatementCreatorUtils {
ps.setObject(paramIndex, inValue, Types.TIMESTAMP); ps.setObject(paramIndex, inValue, Types.TIMESTAMP);
} }
} }
else if (sqlType == SqlTypeValue.TYPE_UNKNOWN || sqlType == Types.OTHER) { else if (sqlType == SqlTypeValue.TYPE_UNKNOWN || (sqlType == Types.OTHER &&
"Oracle".equals(ps.getConnection().getMetaData().getDatabaseProductName()))) {
if (isStringValue(inValue.getClass())) { if (isStringValue(inValue.getClass())) {
ps.setString(paramIndex, inValue.toString()); ps.setString(paramIndex, inValue.toString());
} }

10
spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2014 the original author or authors. * Copyright 2002-2015 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -38,11 +38,13 @@ public class StatementCreatorUtilsTests {
private PreparedStatement preparedStatement; private PreparedStatement preparedStatement;
@Before @Before
public void setUp() { public void setUp() {
preparedStatement = mock(PreparedStatement.class); preparedStatement = mock(PreparedStatement.class);
} }
@Test @Test
public void testSetParameterValueWithNullAndType() throws SQLException { public void testSetParameterValueWithNullAndType() throws SQLException {
StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.VARCHAR, null, null); StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.VARCHAR, null, null);
@ -264,9 +266,15 @@ public class StatementCreatorUtilsTests {
@Test // SPR-8571 @Test // SPR-8571
public void testSetParameterValueWithStringAndVendorSpecificType() throws SQLException { public void testSetParameterValueWithStringAndVendorSpecificType() throws SQLException {
Connection con = mock(Connection.class);
DatabaseMetaData dbmd = mock(DatabaseMetaData.class);
given(preparedStatement.getConnection()).willReturn(con);
given(dbmd.getDatabaseProductName()).willReturn("Oracle");
given(con.getMetaData()).willReturn(dbmd);
StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.OTHER, null, "test"); StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.OTHER, null, "test");
verify(preparedStatement).setString(1, "test"); verify(preparedStatement).setString(1, "test");
} }
@Test // SPR-8571 @Test // SPR-8571
public void testSetParameterValueWithNullAndVendorSpecificType() throws SQLException { public void testSetParameterValueWithNullAndVendorSpecificType() throws SQLException {
StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.OTHER, null, null); StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.OTHER, null, null);