mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-01-26 10:37:04 -06:00
Code Issues Packages Projects Releases 123 Wiki Activity

Small cleanups requested in PR

Browse Source
This commit is contained in:
Neil Macneale IV
2023-03-03 13:42:15 -08:00
parent 6d974b7e90
commit fb1ea48775
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
go/libraries/doltcore/sqle/dtables/diff_table.go
View File

@@ -862,7 +862,7 @@ func GetDiffTableSchemaAndJoiner(format *types.NomsBinFormat, fromSch, toSch sch
return nil, nil, err
}
} else {
fromSch, toSch, err = ResolveSchemaCollections(fromSch, toSch)
fromSch, toSch, err = expandFromToSchemas(fromSch, toSch)
if err != nil {
return nil, nil, err
}
@@ -888,9 +888,9 @@ func GetDiffTableSchemaAndJoiner(format *types.NomsBinFormat, fromSch, toSch sch
return
}
// Convert schemas to ColCollections. One argument must be non-nil. If one is null, the result will be the columns
// of the non-nil argument.
func ResolveSchemaCollections(fromSch, toSch schema.Schema) (newFromSch, newToSch schema.Schema, err error) {
// expandFromToSchemas converts input schemas to schemas appropriate for diffs. One argument must be
// non-nil. If one is null, the result will be the columns of the non-nil argument.
func expandFromToSchemas(fromSch, toSch schema.Schema) (newFromSch, newToSch schema.Schema, err error) {
var fromClmCol, toClmCol *schema.ColCollection
if fromSch == nil && toSch == nil {
return nil, nil, errors.New("non-nil argument required to CalculateDiffSchema")
@@ -921,8 +921,7 @@ func ResolveSchemaCollections(fromSch, toSch schema.Schema) (newFromSch, newToSc
// CalculateDiffSchema returns the schema for the dolt_diff table based on the schemas from the from and to tables.
// Either may be nil, in which case the nil argument will use the schema of the non-nil argument
func CalculateDiffSchema(fromSch, toSch schema.Schema) (schema.Schema, error) {
//
fromSch, toSch, err := ResolveSchemaCollections(fromSch, toSch)
fromSch, toSch, err := expandFromToSchemas(fromSch, toSch)
if err != nil {
return nil, err
}