Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
fix: strict handling of getBoolean and setObject with postgres accept…
…ed values (#732) Strict support of accepted values in getBoolean and setObject(BOOLEAN) Discussion: https://www.postgresql.org/message-id/flat/990BE54A-5803-4B5A-A5C8-BD6DBE75B72C%40me.com
- Loading branch information
Showing
with
331 additions
and 206 deletions.
- +105 −0 pgjdbc/src/main/java/org/postgresql/jdbc/BooleanTypeUtil.java
- +2 −2 pgjdbc/src/main/java/org/postgresql/jdbc/PgArray.java
- +3 −76 pgjdbc/src/main/java/org/postgresql/jdbc/PgPreparedStatement.java
- +27 −27 pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSet.java
- +1 −0 pgjdbc/src/main/java/org/postgresql/util/PSQLState.java
- +110 −34 pgjdbc/src/test/java/org/postgresql/test/jdbc2/PreparedStatementTest.java
- +83 −67 pgjdbc/src/test/java/org/postgresql/test/jdbc2/ResultSetTest.java
| @@ -0,0 +1,105 @@ | ||
| /* | ||
| * Copyright (c) 2017, PostgreSQL Global Development Group | ||
| * See the LICENSE file in the project root for more information. | ||
| */ | ||
|
|
||
| package org.postgresql.jdbc; | ||
|
|
||
| import org.postgresql.util.GT; | ||
| import org.postgresql.util.PSQLException; | ||
| import org.postgresql.util.PSQLState; | ||
|
|
||
| import java.util.logging.Level; | ||
| import java.util.logging.Logger; | ||
|
|
||
| /** | ||
| * Helper class to handle boolean type of PostgreSQL. | ||
| * <p> | ||
| * Based on values accepted by the PostgreSQL server: | ||
| * https://www.postgresql.org/docs/current/static/datatype-boolean.html | ||
| */ | ||
| class BooleanTypeUtil { | ||
|
|
||
| private static final Logger LOGGER = Logger.getLogger(BooleanTypeUtil.class.getName()); | ||
|
|
||
| private BooleanTypeUtil() { | ||
| } | ||
|
|
||
| /** | ||
| * Cast an Object value to the corresponding boolean value. | ||
| * | ||
| * @param in Object to cast into boolean | ||
| * @return boolean value corresponding to the cast of the object | ||
| * @throws PSQLException PSQLState.CANNOT_COERCE | ||
| */ | ||
| static boolean castToBoolean(final Object in) throws PSQLException { | ||
| LOGGER.log(Level.FINE, "Object to cast: {0}", in); | ||
| if (in instanceof Boolean) { | ||
| return (Boolean) in; | ||
| } | ||
| if (in instanceof String) { | ||
| return from((String) in); | ||
| } | ||
| if (in instanceof Character) { | ||
| return from((Character) in); | ||
| } | ||
| if (in instanceof Number) { | ||
| return from((Number) in, in.getClass().getName()); | ||
| } | ||
| throw cannotCoerceException(in.getClass().getName()); | ||
| } | ||
|
|
||
| private static boolean from(final String strval) throws PSQLException { | ||
| // Leading or trailing whitespace is ignored, and case does not matter. | ||
| final String val = strval.trim(); | ||
| if ("1".equals(val) || "true".equalsIgnoreCase(val) | ||
| || "t".equalsIgnoreCase(val) || "yes".equalsIgnoreCase(val) | ||
| || "y".equalsIgnoreCase(val) || "on".equalsIgnoreCase(val)) { | ||
| return true; | ||
| } | ||
| if ("0".equals(val) || "false".equalsIgnoreCase(val) | ||
| || "f".equalsIgnoreCase(val) || "no".equalsIgnoreCase(val) | ||
| || "n".equalsIgnoreCase(val) || "off".equalsIgnoreCase(val)) { | ||
| return false; | ||
| } | ||
| throw cannotCoerceException("String", val); | ||
| } | ||
|
|
||
| private static boolean from(final Character charval) throws PSQLException { | ||
| if ('1' == charval || 't' == charval || 'T' == charval | ||
| || 'y' == charval || 'Y' == charval) { | ||
| return true; | ||
| } | ||
| if ('0' == charval || 'f' == charval || 'F' == charval | ||
| || 'n' == charval || 'N' == charval) { | ||
| return false; | ||
| } | ||
| throw cannotCoerceException("Character", charval.toString()); | ||
| } | ||
|
|
||
| private static boolean from(final Number numval, final String className) throws PSQLException { | ||
| // Handles BigDecimal, Byte, Short, Integer, Long Float, Double | ||
| // based on the widening primitive conversions. | ||
| double value = numval.doubleValue(); | ||
| if (value == 1.0d) { | ||
| return true; | ||
| } | ||
| if (value == 0.0d) { | ||
| return false; | ||
| } | ||
| throw cannotCoerceException(className, String.valueOf(numval)); | ||
| } | ||
|
|
||
| private static PSQLException cannotCoerceException(final String fromType) { | ||
| LOGGER.log(Level.FINE, "Cannot cast type {0} to boolean", fromType); | ||
| return new PSQLException(GT.tr("Cannot cast type {0} to boolean", fromType), | ||
| PSQLState.CANNOT_COERCE); | ||
| } | ||
|
|
||
| private static PSQLException cannotCoerceException(final String fromType, final String value) { | ||
| LOGGER.log(Level.FINE, "Cannot cast type {0} to boolean: \"{1}\"", new Object[]{fromType, value}); | ||
| return new PSQLException(GT.tr("Cannot cast type {0} to boolean: \"{1}\"", fromType, value), | ||
| PSQLState.CANNOT_COERCE); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.