mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-05-13 03:10:03 -05:00
Code Issues Packages Projects Releases 164 Wiki Activity

Merge pull request #1536 from alrs/doltcore-table-errs

Browse Source 
libraries/doltcore/tables: fix two subpackage dropped errors
This commit is contained in:
Zach Musgrave
2021-04-13 15:51:03 -07:00
committed by GitHub
parent f0392f4d33 5533613c02
commit 13a910e99f
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/libraries/doltcore/table/editor/pk_table_editor.go
+4
View File
@@ -307,6 +307,10 @@ func GetIndexedRows(ctx context.Context, te TableEditor, key types.Tuple, indexN
}
tableRow, err := row.FromNoms(te.Schema(), pkTupleVal.(types.Tuple), fieldsVal.(types.Tuple))
if err != nil {
return nil, err
}
rows = append(rows, tableRow)
}
go/libraries/doltcore/table/typed/json/writer.go
+4 -2
View File
@@ -77,7 +77,7 @@ func (jsonw *JSONWriter) GetSchema() schema.Schema {
func (jsonw *JSONWriter) WriteRow(ctx context.Context, r row.Row) error {
allCols := jsonw.sch.GetAllCols()
colValMap := make(map[string]interface{}, allCols.Size())
err := allCols.Iter(func(tag uint64, col schema.Column) (stop bool, err error) {
if err := allCols.Iter(func(tag uint64, col schema.Column) (stop bool, err error) {
val, ok := r.GetColVal(tag)
if !ok || types.IsNull(val) {
return false, nil
@@ -112,7 +112,9 @@ func (jsonw *JSONWriter) WriteRow(ctx context.Context, r row.Row) error {
colValMap[col.Name] = val
return false, nil
})
}); err != nil {
return err
}
data, err := marshalToJson(colValMap)
if err != nil {