From 036bd791f0b6f56209e8c61354817231f4e8393b Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 4 Feb 2014 16:44:08 +0100 Subject: [PATCH] Introduced "spring.jdbc.getParameterType.ignore" property Issue: SPR-11386 (cherry picked from commit 60c1905) --- .../core/SpringProperties.java | 1 + .../jdbc/core/StatementCreatorUtils.java | 26 ++++++++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/SpringProperties.java b/spring-core/src/main/java/org/springframework/core/SpringProperties.java index 01813e2596..7e37951ca1 100644 --- a/spring-core/src/main/java/org/springframework/core/SpringProperties.java +++ b/spring-core/src/main/java/org/springframework/core/SpringProperties.java @@ -41,6 +41,7 @@ import org.apache.commons.logging.LogFactory; * @since 3.2.7 * @see org.springframework.core.env.AbstractEnvironment#IGNORE_GETENV_PROPERTY_NAME * @see org.springframework.beans.CachedIntrospectionResults#IGNORE_BEANINFO_PROPERTY_NAME + * @see org.springframework.jdbc.core.StatementCreatorUtils#IGNORE_GETPARAMETERTYPE_PROPERTY_NAME */ public abstract class SpringProperties { diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java index d31991f89d..b805724ddd 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,6 +35,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.core.SpringProperties; import org.springframework.jdbc.support.SqlValue; /** @@ -59,12 +60,29 @@ import org.springframework.jdbc.support.SqlValue; */ public abstract class StatementCreatorUtils { - private static final Log logger = LogFactory.getLog(StatementCreatorUtils.class); + /** + * System property that instructs Spring to ignore {@link java.sql.ParameterMetaData#getParameterType} + * completely, i.e. to never even attempt to retrieve {@link PreparedStatement#getParameterMetaData()} + * for {@link StatementCreatorUtils#setNull} calls. + *

The default is "false", trying {@code getParameterType} calls first and falling back to + * {@link PreparedStatement#setNull} / {@link PreparedStatement#setObject} calls based on well-known + * behavior of common databases. Spring records JDBC drivers with non-working {@code getParameterType} + * implementations and won't attempt to call that method for that driver again, always falling back. + *

Consider switching this flag to "true" if you experience misbehavior at runtime, e.g. with + * a connection pool setting back the {@link PreparedStatement} instance in case of an exception + * thrown from {@code getParameterType} (as reported on JBoss AS 7). + */ + public static final String IGNORE_GETPARAMETERTYPE_PROPERTY_NAME = "spring.jdbc.getParameterType.ignore"; + + + static final boolean shouldIgnoreGetParameterType = SpringProperties.getFlag(IGNORE_GETPARAMETERTYPE_PROPERTY_NAME); // Using a ConcurrentHashMap as a Set (for Java 5 compatibility) static final Map driversWithNoSupportForGetParameterType = new ConcurrentHashMap(1); + private static final Log logger = LogFactory.getLog(StatementCreatorUtils.class); + private static final Map, Integer> javaTypeToSqlTypeMap = new HashMap, Integer>(32); static { @@ -227,8 +245,8 @@ public abstract class StatementCreatorUtils { Integer sqlTypeToUse = null; DatabaseMetaData dbmd = null; String jdbcDriverName = null; - boolean checkGetParameterType = true; - if (!driversWithNoSupportForGetParameterType.isEmpty()) { + boolean checkGetParameterType = !shouldIgnoreGetParameterType; + if (checkGetParameterType && !driversWithNoSupportForGetParameterType.isEmpty()) { try { dbmd = ps.getConnection().getMetaData(); jdbcDriverName = dbmd.getDriverName();