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

using sql.SchemaAsCreateStmt

Browse Source
This commit is contained in:
Andy Arthur
2019-11-15 11:16:08 -08:00
parent d39b20d3c1
commit 6ce033b972
2 changed files with 5 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -259,7 +259,7 @@ func diffRoots(ctx context.Context, r1, r2 *doltdb.RootValue, tblNames []string,
}
if dArgs.diffOutput == SQLDiffOutput {
err = diff.SQLTableDIffs(ctx, r1, r2, iohelp.NopWrCloser(cli.CliOut))
err = diff.PrintSqlTableDIffs(ctx, r1, r2, iohelp.NopWrCloser(cli.CliOut))
if err != nil {
return errhand.BuildDError("error: unable to diff tables").AddCause(err).Build()
@@ -411,7 +411,6 @@ func diffSchemas(tableName string, sch1 schema.Schema, sch2 schema.Schema, dArgs
if verr := tabularSchemaDiff(tableName, tags, diffs); verr != nil {
return verr
}
} else {
sqlSchemaDiff(tableName, tags, diffs)
}

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

@@ -17,10 +17,8 @@ package diff
import (
"context"
"errors"
"io"
"strings"
"github.com/fatih/color"
"io"
"github.com/liquidata-inc/dolt/go/cmd/dolt/cli"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb"
@@ -122,7 +120,7 @@ func (sds *SQLDiffSink) Close() error {
}
}
func SQLTableDIffs(ctx context.Context, r1, r2 *doltdb.RootValue, wr io.WriteCloser) error {
func PrintSqlTableDIffs(ctx context.Context, r1, r2 *doltdb.RootValue, wr io.WriteCloser) error {
adds, _, drops, err := r1.TableDiff(ctx, r2)
if err != nil {
@@ -159,28 +157,8 @@ func SQLTableDIffs(ctx context.Context, r1, r2 *doltdb.RootValue, wr io.WriteClo
if sch, err := tbl.GetSchema(ctx); err != nil {
return errors.New("error unable to get schema for table " + tblName)
} else {
var b strings.Builder
b.WriteString("CREATE TABLE ")
b.WriteString(sql.QuoteIdentifier(tblName))
b.WriteString("(\n")
for _, col := range sch.GetAllCols().GetColumns() {
b.WriteString(sql.FmtCol(4, 0, 0, col))
b.WriteString(",\n")
}
seenOne := false
b.WriteString(" PRIMARY KEY (")
for _, col := range sch.GetAllCols().GetColumns() {
if col.IsPartOfPK {
if seenOne {
b.WriteString(",")
}
b.WriteString(sql.QuoteIdentifier(col.Name))
seenOne = true
}
}
b.WriteString(")")
b.WriteString("\n );")
if err = iohelp.WriteLine(wr, b.String()); err != nil {
stmt := sql.SchemaAsCreateStmt(tblName, sch)
if err = iohelp.WriteLine(wr, stmt); err != nil {
return err
}