Skip to content

Commit 82eb6e5

Browse files
committed
comments and internal naming
1 parent afd456d commit 82eb6e5

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

impl/scanresult.go

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,23 @@ func ScanValues(src Row) ([]any, error) {
1111
return nil, err
1212
}
1313
var (
14-
anys = make([]sqldb.AnyValue, len(cols))
15-
vals = make([]any, len(cols))
14+
anys = make([]sqldb.AnyValue, len(cols))
15+
result = make([]any, len(cols))
1616
)
17-
for i := range vals {
18-
vals[i] = &anys[i]
17+
// result elements hold pointer to sqldb.AnyValue for scanning
18+
for i := range result {
19+
result[i] = &anys[i]
1920
}
20-
err = src.Scan(vals...)
21+
err = src.Scan(result...)
2122
if err != nil {
2223
return nil, err
2324
}
24-
for i := range vals {
25-
vals[i] = anys[i].Val
25+
// don't return pointers to sqldb.AnyValue
26+
// but what internal value has been scanned
27+
for i := range result {
28+
result[i] = anys[i].Val
2629
}
27-
return vals, nil
30+
return result, nil
2831
}
2932

3033
// ScanStrings scans the values of a row as strings.
@@ -37,15 +40,15 @@ func ScanStrings(src Row) ([]string, error) {
3740
return nil, err
3841
}
3942
var (
40-
strs = make([]string, len(cols))
41-
args = make([]any, len(cols))
43+
result = make([]string, len(cols))
44+
resultPtrs = make([]any, len(cols))
4245
)
43-
for i := range args {
44-
args[i] = (*sqldb.StringScannable)(&strs[i])
46+
for i := range resultPtrs {
47+
resultPtrs[i] = (*sqldb.StringScannable)(&result[i])
4548
}
46-
err = src.Scan(args...)
49+
err = src.Scan(resultPtrs...)
4750
if err != nil {
4851
return nil, err
4952
}
50-
return strs, nil
53+
return result, nil
5154
}

0 commit comments

Comments
 (0)