summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meskes2017-11-02 19:46:34 +0000
committerMichael Meskes2017-11-02 19:51:23 +0000
commitb6d95939ed6fc8bde97eb8c9af00838dde82cc41 (patch)
tree9c2fe43834b4c6da66ab655516bd1dbaee782c47
parent43276abc6f7e497bfca2277b9e04585fcd6c25c5 (diff)
Fix float parsing in ecpg INFORMIX mode.
-rw-r--r--src/interfaces/ecpg/ecpglib/data.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/interfaces/ecpg/ecpglib/data.c b/src/interfaces/ecpg/ecpglib/data.c
index 86b2065bc02..3d83c2430c1 100644
--- a/src/interfaces/ecpg/ecpglib/data.c
+++ b/src/interfaces/ecpg/ecpglib/data.c
@@ -59,7 +59,7 @@ garbage_left(enum ARRAY_TYPE isarray, char **scan_length, enum COMPAT_MODE compa
/* skip invalid characters */
do {
(*scan_length)++;
- } while (**scan_length != ' ' && **scan_length != '\0' && isdigit(**scan_length));
+ } while (isdigit(**scan_length));
return false;
}
@@ -403,7 +403,8 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
if (isarray && *scan_length == '"')
scan_length++;
- if (garbage_left(isarray, &scan_length, compat))
+ /* no special INFORMIX treatment for floats */
+ if (garbage_left(isarray, &scan_length, ECPG_COMPAT_PGSQL))
{
ecpg_raise(lineno, ECPG_FLOAT_FORMAT,
ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);