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

unittests

Browse Source
This commit is contained in:
Andy Arthur
2019-11-15 15:16:16 -08:00
parent c4d27b14eb
commit 0546757be2
2 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -136,14 +136,14 @@ func PrintSqlTableDiffs(ctx context.Context, r1, r2 *doltdb.RootValue, wr io.Wri
// 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
}
}

35
go/libraries/doltcore/diff/sql_diff_test.go
View File

@@ -16,17 +16,27 @@ package diff
import (
"context"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/row"
"strings"
"testing"
"github.com/stretchr/testify/assert"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils"
"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/schema/alterschema"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/sql"
"github.com/liquidata-inc/dolt/go/store/types"
)
type StringBuilderCloser struct {
strings.Builder
}
func (*StringBuilderCloser) Close() error {
return nil
}
func TestPrintSqlTableDiffs(t *testing.T) {
dEnv := dtestutils.CreateTestEnv()
@@ -37,7 +47,6 @@ func TestPrintSqlTableDiffs(t *testing.T) {
dropColColl, _ := schema.NewColCollection(dropCols...)
dropSch := schema.SchemaFromCols(dropColColl)
renameCols := []schema.Column{
schema.NewColumn("pk", 0, types.StringKind, true, schema.NotNullConstraint{}),
schema.NewColumn("data", 1, types.IntKind, false),
@@ -47,10 +56,7 @@ func TestPrintSqlTableDiffs(t *testing.T) {
addCols := []schema.Column{
schema.NewColumn("pk", 0, types.StringKind, true, schema.NotNullConstraint{}),
schema.NewColumn("boolData", 1, types.BoolKind, false),
schema.NewColumn("intData", 2, types.IntKind, false),
schema.NewColumn("floatData", 3, types.FloatKind, false),
schema.NewColumn("stringData", 4, types.StringKind, false),
schema.NewColumn("data", 1, types.IntKind, false),
}
addColColl, _ := schema.NewColCollection(addCols...)
addSch := schema.SchemaFromCols(addColColl)
@@ -68,6 +74,11 @@ func TestPrintSqlTableDiffs(t *testing.T) {
added, _, removed, _ := newRoot.TableDiff(ctx, oldRoot)
adds, _, _, _ := findRenames(ctx, newRoot, oldRoot, added, removed)
assert.Equal(t, []string{"addTable"}, adds)
expectedOutput := sql.SchemaAsCreateStmt("addTable", addSch) + "\n"
var stringWr StringBuilderCloser
_ = PrintSqlTableDiffs(ctx, newRoot, oldRoot, &stringWr)
assert.Equal(t, expectedOutput, stringWr.String())
}
{
ctx := context.Background()
@@ -78,6 +89,11 @@ func TestPrintSqlTableDiffs(t *testing.T) {
added, _, removed, _ := newRoot.TableDiff(ctx, oldRoot)
_, drops, _, _ := findRenames(ctx, newRoot, oldRoot, added, removed)
assert.Equal(t, []string{"dropTable"}, drops)
expectedOutput := "DROP TABLE `dropTable`;\n"
var stringWr StringBuilderCloser
_ = PrintSqlTableDiffs(ctx, newRoot, oldRoot, &stringWr)
assert.Equal(t, expectedOutput, stringWr.String())
}
{
ctx := context.Background()
@@ -87,6 +103,11 @@ func TestPrintSqlTableDiffs(t *testing.T) {
newRoot, _ := alterschema.RenameTable(ctx, dEnv.DoltDB, oldRoot, "renameTable", "newTableName")
added, _, removed, _ := newRoot.TableDiff(ctx, oldRoot)
_, _, renames, _ := findRenames(ctx, newRoot, oldRoot, added, removed)
assert.Equal(t, map[string]string{"renameTable":"newTableName"}, renames)
assert.Equal(t, map[string]string{"renameTable": "newTableName"}, renames)
expectedOutput := "RENAME TABLE `renameTable` TO `newTableName`\n"
var stringWr StringBuilderCloser
_ = PrintSqlTableDiffs(ctx, newRoot, oldRoot, &stringWr)
assert.Equal(t, expectedOutput, stringWr.String())
}
}