Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
postgres-lambda-diff
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jakob Huber
postgres-lambda-diff
Commits
243ee266
Commit
243ee266
authored
11 years ago
by
Andrew Dunstan
Browse files
Options
Downloads
Patches
Plain Diff
Reindent json.c and jsonfuncs.c.
This will help in preparation of clean patches for upcoming json work.
parent
6c36f383
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/backend/utils/adt/json.c
+35
-32
35 additions, 32 deletions
src/backend/utils/adt/json.c
src/backend/utils/adt/jsonfuncs.c
+10
-10
10 additions, 10 deletions
src/backend/utils/adt/jsonfuncs.c
with
45 additions
and
42 deletions
src/backend/utils/adt/json.c
+
35
−
32
View file @
243ee266
...
@@ -751,11 +751,12 @@ json_lex_string(JsonLexContext *lex)
...
@@ -751,11 +751,12 @@ json_lex_string(JsonLexContext *lex)
report_json_context
(
lex
)));
report_json_context
(
lex
)));
/*
/*
* For UTF8, replace the escape sequence by the actual utf8
* For UTF8, replace the escape sequence by the actual
* character in lex->strval. Do this also for other encodings
* utf8 character in lex->strval. Do this also for other
* if the escape designates an ASCII character, otherwise
* encodings if the escape designates an ASCII character,
* raise an error. We don't ever unescape a \u0000, since that
* otherwise raise an error. We don't ever unescape a
* would result in an impermissible nul byte.
* \u0000, since that would result in an impermissible nul
* byte.
*/
*/
if
(
ch
==
0
)
if
(
ch
==
0
)
...
@@ -771,8 +772,9 @@ json_lex_string(JsonLexContext *lex)
...
@@ -771,8 +772,9 @@ json_lex_string(JsonLexContext *lex)
else
if
(
ch
<=
0x007f
)
else
if
(
ch
<=
0x007f
)
{
{
/*
/*
* This is the only way to designate things like a form feed
* This is the only way to designate things like a
* character in JSON, so it's useful in all encodings.
* form feed character in JSON, so it's useful in all
* encodings.
*/
*/
appendStringInfoChar
(
lex
->
strval
,
(
char
)
ch
);
appendStringInfoChar
(
lex
->
strval
,
(
char
)
ch
);
}
}
...
@@ -1246,6 +1248,7 @@ datum_to_json(Datum val, bool is_null, StringInfo result,
...
@@ -1246,6 +1248,7 @@ datum_to_json(Datum val, bool is_null, StringInfo result,
break
;
break
;
case
TYPCATEGORY_NUMERIC
:
case
TYPCATEGORY_NUMERIC
:
outputstr
=
OidOutputFunctionCall
(
typoutputfunc
,
val
);
outputstr
=
OidOutputFunctionCall
(
typoutputfunc
,
val
);
/*
/*
* Don't call escape_json here if it's a valid JSON number.
* Don't call escape_json here if it's a valid JSON number.
*/
*/
...
...
This diff is collapsed.
Click to expand it.
src/backend/utils/adt/jsonfuncs.c
+
10
−
10
View file @
243ee266
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment