diff options
| -rw-r--r-- | contrib/hstore/hstore_io.c | 43 | ||||
| -rw-r--r-- | src/backend/utils/adt/json.c | 40 | ||||
| -rw-r--r-- | src/include/utils/jsonapi.h | 7 |
3 files changed, 42 insertions, 48 deletions
diff --git a/contrib/hstore/hstore_io.c b/contrib/hstore/hstore_io.c index 4e6a54b775e..93206193916 100644 --- a/contrib/hstore/hstore_io.c +++ b/contrib/hstore/hstore_io.c @@ -12,6 +12,7 @@ #include "libpq/pqformat.h" #include "utils/builtins.h" #include "utils/json.h" +#include "utils/jsonapi.h" #include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/typcache.h" @@ -1253,7 +1254,6 @@ hstore_to_json_loose(PG_FUNCTION_ARGS) int count = HS_COUNT(in); char *base = STRPTR(in); HEntry *entries = ARRPTR(in); - bool is_number; StringInfoData tmp, dst; @@ -1280,48 +1280,9 @@ hstore_to_json_loose(PG_FUNCTION_ARGS) appendStringInfoString(&dst, "false"); else { - is_number = false; resetStringInfo(&tmp); appendBinaryStringInfo(&tmp, HS_VAL(entries, base, i), HS_VALLEN(entries, i)); - - /* - * don't treat something with a leading zero followed by another - * digit as numeric - could be a zip code or similar - */ - if (tmp.len > 0 && - !(tmp.data[0] == '0' && - isdigit((unsigned char) tmp.data[1])) && - strspn(tmp.data, "+-0123456789Ee.") == tmp.len) - { - /* - * might be a number. See if we can input it as a numeric - * value. Ignore any actual parsed value. - */ - char *endptr = "junk"; - long lval; - - lval = strtol(tmp.data, &endptr, 10); - (void) lval; - if (*endptr == '\0') - { - /* - * strol man page says this means the whole string is - * valid - */ - is_number = true; - } - else - { - /* not an int - try a double */ - double dval; - - dval = strtod(tmp.data, &endptr); - (void) dval; - if (*endptr == '\0') - is_number = true; - } - } - if (is_number) + if (IsValidJsonNumber(tmp.data, tmp.len)) appendBinaryStringInfo(&dst, tmp.data, tmp.len); else escape_json(&dst, tmp.data); diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c index 53a011d50b4..0873bb3ce15 100644 --- a/src/backend/utils/adt/json.c +++ b/src/backend/utils/adt/json.c @@ -164,6 +164,36 @@ lex_expect(JsonParseContext ctx, JsonLexContext *lex, JsonTokenType token) (c) == '_' || \ IS_HIGHBIT_SET(c)) +/* utility function to check if a string is a valid JSON number */ +extern bool +IsValidJsonNumber(const char * str, int len) +{ + bool numeric_error; + JsonLexContext dummy_lex; + + + /* + * json_lex_number expects a leading '-' to have been eaten already. + * + * having to cast away the constness of str is ugly, but there's not much + * easy alternative. + */ + if (*str == '-') + { + dummy_lex.input = (char *) str + 1; + dummy_lex.input_length = len - 1; + } + else + { + dummy_lex.input = (char *) str; + dummy_lex.input_length = len; + } + + json_lex_number(&dummy_lex, dummy_lex.input, &numeric_error); + + return ! numeric_error; +} + /* * Input. */ @@ -1306,8 +1336,6 @@ datum_to_json(Datum val, bool is_null, StringInfo result, { char *outputstr; text *jsontext; - bool numeric_error; - JsonLexContext dummy_lex; if (is_null) { @@ -1332,12 +1360,10 @@ datum_to_json(Datum val, bool is_null, StringInfo result, case JSONTYPE_NUMERIC: outputstr = OidOutputFunctionCall(outfuncoid, val); /* - * Don't call escape_json here if it's a valid JSON number. + * Don't call escape_json for a non-key if it's a valid JSON + * number. */ - dummy_lex.input = *outputstr == '-' ? outputstr + 1 : outputstr; - dummy_lex.input_length = strlen(dummy_lex.input); - json_lex_number(&dummy_lex, dummy_lex.input, &numeric_error); - if (! numeric_error) + if (!key_scalar && IsValidJsonNumber(outputstr, strlen(outputstr))) appendStringInfoString(result, outputstr); else escape_json(result, outputstr); diff --git a/src/include/utils/jsonapi.h b/src/include/utils/jsonapi.h index e25a0d93d89..dcfe71c29dd 100644 --- a/src/include/utils/jsonapi.h +++ b/src/include/utils/jsonapi.h @@ -107,4 +107,11 @@ extern void pg_parse_json(JsonLexContext *lex, JsonSemAction *sem); */ extern JsonLexContext *makeJsonLexContext(text *json, bool need_escapes); +/* + * Utility function to check if a string is a valid JSON number. + * + * str agrument does not need to be nul-terminated. + */ +extern bool IsValidJsonNumber(const char * str, int len); + #endif /* JSONAPI_H */ |