mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-05-08 02:36:27 -05:00
Code Issues Packages Projects Releases 163 Wiki Activity

maybe deref commit time value

Browse Source
This commit is contained in:
Andy Arthur
2022-05-18 15:59:00 -07:00
parent 2e27bcdafc
commit 814b8a58aa
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/libraries/doltcore/sqle/dtables/diff_iter.go
+9 -2
View File
@@ -342,7 +342,7 @@ func (itr prollyDiffIter) makeDiffRow(d tree.Diff) (r sql.Row, err error) {
o := n
r[o] = itr.toCm.name
r[o+1] = itr.toCm.ts
r[o+1] = maybeTime(itr.toCm.ts)
if d.Type != tree.AddedDiff {
err = itr.fromConverter.PutConverted(val.Tuple(d.Key), val.Tuple(d.From), r[n+2:n+2+m])
@@ -353,7 +353,7 @@ func (itr prollyDiffIter) makeDiffRow(d tree.Diff) (r sql.Row, err error) {
o = n + 2 + m
r[o] = itr.fromCm.name
r[o+1] = itr.fromCm.ts
r[o+1] = maybeTime(itr.fromCm.ts)
r[o+2] = diffTypeString(d)
return r, nil
@@ -370,3 +370,10 @@ func diffTypeString(d tree.Diff) (s string) {
}
return
}
func maybeTime(t *time.Time) interface{} {
if t != nil {
return *t
}
return nil
}