mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-11 18:49:14 -06:00
Code Issues Packages Projects Releases 128 Wiki Activity

repo fmt

Browse Source
This commit is contained in:
Andy Arthur
2019-11-15 10:07:41 -08:00
parent 2db9217ba3
commit 930c66d189
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
go/cmd/dolt/commands/diff.go
View File

@@ -704,7 +704,6 @@ func createSplitter(newSch schema.Schema, oldSch schema.Schema, joiner *rowconv.
unionSch = newSch
}
newToUnionConv := rowconv.IdentityConverter
if newSch != nil {
newToUnionMapping, err := rowconv.TagMapping(newSch, unionSch)

23
go/libraries/doltcore/diff/sql_diff.go
View File

@@ -17,20 +17,21 @@ package diff
import (
"context"
"errors"
"github.com/fatih/color"
"github.com/liquidata-inc/dolt/go/cmd/dolt/cli"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/sql"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed/noms"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped/nullprinter"
"github.com/liquidata-inc/dolt/go/libraries/utils/iohelp"
"io"
"strings"
"github.com/fatih/color"
"github.com/liquidata-inc/dolt/go/cmd/dolt/cli"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/row"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/sql"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/table/pipeline"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed/noms"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped/nullprinter"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped/sqlexport"
"github.com/liquidata-inc/dolt/go/libraries/utils/iohelp"
"github.com/liquidata-inc/dolt/go/store/types"
)
@@ -136,14 +137,14 @@ func SQLTableDIffs(ctx context.Context, r1, r2 *doltdb.RootValue, wr io.WriteClo
// rename tables
for k, v := range renames {
if err = iohelp.WriteLine(wr,"RENAME TABLE" + sql.QuoteIdentifier(k) + "TO" + sql.QuoteIdentifier(v)); err != nil {
if err = iohelp.WriteLine(wr, "RENAME TABLE"+sql.QuoteIdentifier(k)+"TO"+sql.QuoteIdentifier(v)); err != nil {
return err
}
}
// drop tables
for _, tblName := range drops {
if err = iohelp.WriteLine(wr,"DROP TABLE" + sql.QuoteIdentifier(tblName) + ";"); err != nil {
if err = iohelp.WriteLine(wr, "DROP TABLE"+sql.QuoteIdentifier(tblName)+";"); err != nil {
return err
}
}
@@ -179,7 +180,7 @@ func SQLTableDIffs(ctx context.Context, r1, r2 *doltdb.RootValue, wr io.WriteClo
}
b.WriteString(")")
b.WriteString("\n );")
if err = iohelp.WriteLine(wr,b.String()); err != nil {
if err = iohelp.WriteLine(wr, b.String()); err != nil {
return err
}
@@ -266,4 +267,4 @@ func findRenames(ctx context.Context, r1, r2 *doltdb.RootValue, adds []string, d
}
return outAdds, outDrops, renames, nil
}
}