Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
bobgroup-go-utils
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
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Bob Public Utils
bobgroup-go-utils
Commits
00b0546b
Commit
00b0546b
authored
3 years ago
by
Jan Semmelink
Browse files
Options
Downloads
Patches
Plain Diff
Use Scan() method before json.Unmarshal for param values
parent
1873153a
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!11
Use Scan() method before json.Unmarshal for param values
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
struct_utils/named_values_to_struct.go
+28
-12
28 additions, 12 deletions
struct_utils/named_values_to_struct.go
with
28 additions
and
12 deletions
struct_utils/named_values_to_struct.go
+
28
−
12
View file @
00b0546b
package
struct_utils
import
(
"database/sql"
"encoding/csv"
"encoding/json"
"reflect"
...
...
@@ -284,19 +285,34 @@ func unmarshalValue(v interface{}, t reflect.Type) (reflect.Value, error) {
newValuePtr
:=
reflect
.
New
(
t
)
if
reflect
.
ValueOf
(
v
)
.
Type
()
.
AssignableTo
(
t
)
{
newValuePtr
.
Elem
()
.
Set
(
reflect
.
ValueOf
(
v
))
//can assign as is
}
else
{
return
newValuePtr
.
Elem
(),
nil
}
//needs conversion
s
,
ok
:=
v
.
(
string
)
if
!
ok
{
jsonValue
,
_
:=
json
.
Marshal
(
v
)
s
=
string
(
jsonValue
)
}
//is string value, unmarshal as quoted or unquoted JSON value
if
err
:=
json
.
Unmarshal
([]
byte
(
"
\"
"
+
s
+
"
\"
"
),
newValuePtr
.
Interface
());
err
!=
nil
{
if
err
:=
json
.
Unmarshal
([]
byte
(
s
),
newValuePtr
.
Interface
());
err
!=
nil
{
return
newValuePtr
.
Elem
(),
errors
.
Wrapf
(
err
,
"invalid
\"
%s
\"
"
,
s
)
//now we have string value
if
valueScanner
,
ok
:=
newValuePtr
.
Interface
()
.
(
sql
.
Scanner
);
ok
{
//if has scanner - prefer that over json unmarshal
//because we do not know if json expects quoted/unquoted for this type
//and if we try quoted, it fail, then try unquoted, we have two different
//errors one one of them will be kind of meaning nothing, but which?
//scanner should always take the value as typed, so let's try that first
if
err
:=
valueScanner
.
Scan
(
s
);
err
==
nil
{
return
newValuePtr
.
Elem
(),
nil
}
}
//try JSON unmarshal as is else with quotes
if
err
:=
json
.
Unmarshal
([]
byte
(
s
),
newValuePtr
.
Interface
());
err
==
nil
{
return
newValuePtr
.
Elem
(),
nil
}
if
err
:=
json
.
Unmarshal
([]
byte
(
"
\"
"
+
s
+
"
\"
"
),
newValuePtr
.
Interface
());
err
!=
nil
{
return
newValuePtr
.
Elem
(),
errors
.
Wrapf
(
err
,
"invalid
\"
%s
\"
"
,
s
)
}
return
newValuePtr
.
Elem
(),
nil
}
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