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

Merge pull request #1586 from jmax01/master 

Correctly handle NVARCHAR, LONGNVARCHAR and NCLOBs

Issue: SPR-16154
This commit is contained in:
Juergen Hoeller 2017-11-03 23:48:44 +01:00 committed by GitHub
parent 845110aa66 e4c5b77de7
commit a37fce854f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -295,10 +295,12 @@ public abstract class StatementCreatorUtils {
else if (inValue instanceof SqlValue) { else if (inValue instanceof SqlValue) {
((SqlValue) inValue).setValue(ps, paramIndex); ((SqlValue) inValue).setValue(ps, paramIndex);
} }
else if (sqlType == Types.VARCHAR || sqlType == Types.NVARCHAR || else if (sqlType == Types.VARCHAR || sqlType == Types.LONGVARCHAR ) {
sqlType == Types.LONGVARCHAR || sqlType == Types.LONGNVARCHAR) {
ps.setString(paramIndex, inValue.toString()); ps.setString(paramIndex, inValue.toString());
} }
else if (sqlType == Types.NVARCHAR || sqlType == Types.LONGNVARCHAR) {
ps.setNString(paramIndex, inValue.toString());
}
else if ((sqlType == Types.CLOB || sqlType == Types.NCLOB) && isStringValue(inValue.getClass())) { else if ((sqlType == Types.CLOB || sqlType == Types.NCLOB) && isStringValue(inValue.getClass())) {
String strVal = inValue.toString(); String strVal = inValue.toString();
if (strVal.length() > 4000) { if (strVal.length() > 4000) {
@ -312,8 +314,15 @@ public abstract class StatementCreatorUtils {
} }
return; return;
} }
// Fallback: regular setString binding else {
ps.setString(paramIndex, strVal); // Fallback: setString or setNString binding
if (sqlType == Types.NCLOB) {
ps.setNString(paramIndex, strVal);
}
else {
ps.setString(paramIndex, strVal);
}
}
} }
else if (sqlType == Types.DECIMAL || sqlType == Types.NUMERIC) { else if (sqlType == Types.DECIMAL || sqlType == Types.NUMERIC) {
if (inValue instanceof BigDecimal) { if (inValue instanceof BigDecimal) {