aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/backend/utils/adt/formatting.c70
-rw-r--r--src/test/regress/expected/numeric.out61
-rw-r--r--src/test/regress/sql/numeric.sql12
3 files changed, 99 insertions, 44 deletions
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
index 5afc293a5a0..cb0dbf748e5 100644
--- a/src/backend/utils/adt/formatting.c
+++ b/src/backend/utils/adt/formatting.c
@@ -1227,11 +1227,7 @@ static void
parse_format(FormatNode *node, const char *str, const KeyWord *kw,
const KeySuffix *suf, const int *index, int ver, NUMDesc *Num)
{
- const KeySuffix *s;
FormatNode *n;
- int node_set = 0,
- suffix,
- last = 0;
#ifdef DEBUG_TO_FROM_CHAR
elog(DEBUG_elog_output, "to_char/number(): run parser");
@@ -1241,12 +1237,14 @@ parse_format(FormatNode *node, const char *str, const KeyWord *kw,
while (*str)
{
- suffix = 0;
+ int suffix = 0;
+ const KeySuffix *s;
/*
* Prefix
*/
- if (ver == DCH_TYPE && (s = suff_search(str, suf, SUFFTYPE_PREFIX)) != NULL)
+ if (ver == DCH_TYPE &&
+ (s = suff_search(str, suf, SUFFTYPE_PREFIX)) != NULL)
{
suffix |= s->id;
if (s->len)
@@ -1259,8 +1257,7 @@ parse_format(FormatNode *node, const char *str, const KeyWord *kw,
if (*str && (n->key = index_seq_search(str, kw, index)) != NULL)
{
n->type = NODE_TYPE_ACTION;
- n->suffix = 0;
- node_set = 1;
+ n->suffix = suffix;
if (n->key->len)
str += n->key->len;
@@ -1273,71 +1270,56 @@ parse_format(FormatNode *node, const char *str, const KeyWord *kw,
/*
* Postfix
*/
- if (ver == DCH_TYPE && *str && (s = suff_search(str, suf, SUFFTYPE_POSTFIX)) != NULL)
+ if (ver == DCH_TYPE && *str &&
+ (s = suff_search(str, suf, SUFFTYPE_POSTFIX)) != NULL)
{
- suffix |= s->id;
+ n->suffix |= s->id;
if (s->len)
str += s->len;
}
+
+ n++;
}
else if (*str)
{
/*
- * Special characters '\' and '"'
+ * Process double-quoted literal string, if any
*/
- if (*str == '"' && last != '\\')
+ if (*str == '"')
{
- int x = 0;
-
while (*(++str))
{
- if (*str == '"' && x != '\\')
+ if (*str == '"')
{
str++;
break;
}
- else if (*str == '\\' && x != '\\')
- {
- x = '\\';
- continue;
- }
+ /* backslash quotes the next character, if any */
+ if (*str == '\\' && *(str + 1))
+ str++;
n->type = NODE_TYPE_CHAR;
n->character = *str;
n->key = NULL;
n->suffix = 0;
- ++n;
- x = *str;
+ n++;
}
- node_set = 0;
- suffix = 0;
- last = 0;
}
- else if (*str && *str == '\\' && last != '\\' && *(str + 1) == '"')
- {
- last = *str;
- str++;
- }
- else if (*str)
+ else
{
+ /*
+ * Outside double-quoted strings, backslash is only special if
+ * it immediately precedes a double quote.
+ */
+ if (*str == '\\' && *(str + 1) == '"')
+ str++;
n->type = NODE_TYPE_CHAR;
n->character = *str;
n->key = NULL;
- node_set = 1;
- last = 0;
+ n->suffix = 0;
+ n++;
str++;
}
}
-
- /* end */
- if (node_set)
- {
- if (n->type == NODE_TYPE_ACTION)
- n->suffix = suffix;
- ++n;
-
- n->suffix = 0;
- node_set = 0;
- }
}
n->type = NODE_TYPE_END;
diff --git a/src/test/regress/expected/numeric.out b/src/test/regress/expected/numeric.out
index a96bfc0eb04..17985e85401 100644
--- a/src/test/regress/expected/numeric.out
+++ b/src/test/regress/expected/numeric.out
@@ -1217,6 +1217,67 @@ SELECT '' AS to_char_26, to_char('100'::numeric, 'FM999');
| 100
(1 row)
+-- Check parsing of literal text in a format string
+SELECT '' AS to_char_27, to_char('100'::numeric, 'foo999');
+ to_char_27 | to_char
+------------+---------
+ | foo 100
+(1 row)
+
+SELECT '' AS to_char_28, to_char('100'::numeric, 'f\oo999');
+ to_char_28 | to_char
+------------+----------
+ | f\oo 100
+(1 row)
+
+SELECT '' AS to_char_29, to_char('100'::numeric, 'f\\oo999');
+ to_char_29 | to_char
+------------+-----------
+ | f\\oo 100
+(1 row)
+
+SELECT '' AS to_char_30, to_char('100'::numeric, 'f\"oo999');
+ to_char_30 | to_char
+------------+----------
+ | f"oo 100
+(1 row)
+
+SELECT '' AS to_char_31, to_char('100'::numeric, 'f\\"oo999');
+ to_char_31 | to_char
+------------+-----------
+ | f\"oo 100
+(1 row)
+
+SELECT '' AS to_char_32, to_char('100'::numeric, 'f"ool"999');
+ to_char_32 | to_char
+------------+----------
+ | fool 100
+(1 row)
+
+SELECT '' AS to_char_33, to_char('100'::numeric, 'f"\ool"999');
+ to_char_33 | to_char
+------------+----------
+ | fool 100
+(1 row)
+
+SELECT '' AS to_char_34, to_char('100'::numeric, 'f"\\ool"999');
+ to_char_34 | to_char
+------------+-----------
+ | f\ool 100
+(1 row)
+
+SELECT '' AS to_char_35, to_char('100'::numeric, 'f"ool\"999');
+ to_char_35 | to_char
+------------+----------
+ | fool"999
+(1 row)
+
+SELECT '' AS to_char_36, to_char('100'::numeric, 'f"ool\\"999');
+ to_char_36 | to_char
+------------+-----------
+ | fool\ 100
+(1 row)
+
-- TO_NUMBER()
--
SET lc_numeric = 'C';
diff --git a/src/test/regress/sql/numeric.sql b/src/test/regress/sql/numeric.sql
index 321c7bdf7c5..d77504e6246 100644
--- a/src/test/regress/sql/numeric.sql
+++ b/src/test/regress/sql/numeric.sql
@@ -786,6 +786,18 @@ SELECT '' AS to_char_24, to_char('100'::numeric, 'FM999.9');
SELECT '' AS to_char_25, to_char('100'::numeric, 'FM999.');
SELECT '' AS to_char_26, to_char('100'::numeric, 'FM999');
+-- Check parsing of literal text in a format string
+SELECT '' AS to_char_27, to_char('100'::numeric, 'foo999');
+SELECT '' AS to_char_28, to_char('100'::numeric, 'f\oo999');
+SELECT '' AS to_char_29, to_char('100'::numeric, 'f\\oo999');
+SELECT '' AS to_char_30, to_char('100'::numeric, 'f\"oo999');
+SELECT '' AS to_char_31, to_char('100'::numeric, 'f\\"oo999');
+SELECT '' AS to_char_32, to_char('100'::numeric, 'f"ool"999');
+SELECT '' AS to_char_33, to_char('100'::numeric, 'f"\ool"999');
+SELECT '' AS to_char_34, to_char('100'::numeric, 'f"\\ool"999');
+SELECT '' AS to_char_35, to_char('100'::numeric, 'f"ool\"999');
+SELECT '' AS to_char_36, to_char('100'::numeric, 'f"ool\\"999');
+
-- TO_NUMBER()
--
SET lc_numeric = 'C';
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-25 01:32:49 +0000