mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-21 11:29:51 -05:00
Code Issues Packages Projects Releases 156 Wiki Activity

added more bats

Browse Source
This commit is contained in:
Andy Arthur
2020-06-04 09:49:17 -05:00
parent 8f879dec73
commit 333aeb1fd2
4 changed files with 121 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bats/diff.bats
+90 -83
View File
@@ -3,6 +3,18 @@ load $BATS_TEST_DIRNAME/helper/common.bash
setup() {
setup_common
dolt sql <<SQL
CREATE TABLE test (
pk BIGINT NOT NULL COMMENT 'tag:0',
c1 BIGINT COMMENT 'tag:1',
c2 BIGINT COMMENT 'tag:2',
c3 BIGINT COMMENT 'tag:3',
c4 BIGINT COMMENT 'tag:4',
c5 BIGINT COMMENT 'tag:5',
PRIMARY KEY (pk)
);
SQL
}
teardown() {
@@ -10,10 +22,9 @@ teardown() {
}
@test "diff clean working set" {
dolt sql -q 'create table test (pk int not null primary key)'
dolt add .
dolt commit -m test
dolt sql -q 'insert into test values (0)'
dolt commit -m table
dolt sql -q 'insert into test values (0,0,0,0,0,0)'
dolt add .
dolt commit -m row
run dolt diff
@@ -35,30 +46,92 @@ teardown() {
}
@test "diff dirty working set" {
dolt sql -q 'create table test (pk int not null primary key)'
dolt add .
dolt commit -m test
dolt sql -q 'insert into test values (0)'
dolt commit -m table
dolt sql -q 'insert into test values (0,0,0,0,0,0)'
run dolt diff
[ "$status" -eq 0 ]
[[ "$output" =~ "+ | 0" ]] || false
run dolt diff head
[ "$status" -eq 0 ]
[[ "$output" =~ "+ | 0" ]] || false
dolt add .
run dolt diff
[ "$status" -eq 0 ]
[ "$output" = "" ]
run dolt diff head
[ "$status" -eq 0 ]
[[ "$output" =~ "+ | 0" ]] || false
}
@test "diff with table args" {
dolt sql -q 'create table other (pk int not null primary key)'
dolt add .
dolt commit -m tables
dolt sql -q 'insert into test values (0,0,0,0,0,0)'
dolt sql -q 'insert into other values (9)'
run dolt diff test
[ "$status" -eq 0 ]
[[ "$output" =~ "+ | 0" ]] || false
[[ ! "$output" =~ "+ | 9" ]] || false
run dolt diff other
[ "$status" -eq 0 ]
[[ "$output" =~ "+ | 9" ]] || false
[[ ! "$output" =~ "+ | 0" ]] || false
run dolt diff test other
[ "$status" -eq 0 ]
[[ "$output" =~ "+ | 0" ]] || false
[[ "$output" =~ "+ | 9" ]] || false
dolt add .
run dolt diff head test other
[ "$status" -eq 0 ]
[[ "$output" =~ "+ | 0" ]] || false
[[ "$output" =~ "+ | 9" ]] || false
dolt commit -m rows
run dolt diff head^ head test other
[ "$status" -eq 0 ]
[[ "$output" =~ "+ | 0" ]] || false
[[ "$output" =~ "+ | 9" ]] || false
run dolt diff head^ head fake
[ "$status" -ne 0 ]
[[ "$output" =~ "table fake does not exist in either diff root" ]] || false
}
@test "diff with table and branch of the same name" {
dolt sql -q 'create table dolomite (pk int not null primary key)'
dolt add .
dolt commit -m tables
dolt branch dolomite
dolt sql -q 'insert into dolomite values (9)'
dolt add .
dolt commit -m 'intermediate commit'
dolt sql -q 'insert into test values (0,0,0,0,0,0)'
# branch/commit args get preference over tables
run dolt diff dolomite
[ "$status" -eq 0 ]
[[ "$output" =~ "+ | 9" ]] || false
[[ "$output" =~ "+ | 0" ]] || false
run dolt diff dolomite test
[ "$status" -eq 0 ]
[[ "$output" =~ "+ | 0" ]] || false
[[ ! "$output" =~ "+ | 9" ]] || false
run dolt diff dolomite head dolomite
[ "$status" -eq 0 ]
[[ "$output" =~ "+ | 9" ]] || false
[[ ! "$output" =~ "+ | 0" ]] || false
run dolt diff head^ head dolomite
[ "$status" -eq 0 ]
[[ "$output" =~ "+ | 9" ]] || false
[[ ! "$output" =~ "+ | 0" ]] || false
dolt branch -D dolomite
dolt sql -q 'insert into dolomite values (8)'
run dolt diff dolomite
[ "$status" -eq 0 ]
[[ "$output" =~ "+ | 8" ]] || false
[[ ! "$output" =~ "+ | 0" ]] || false
}
@test "diff summary comparing working table to last commit" {
dolt sql <<SQL
CREATE TABLE test (
pk BIGINT NOT NULL COMMENT 'tag:0',
c1 BIGINT COMMENT 'tag:1',
c2 BIGINT COMMENT 'tag:2',
c3 BIGINT COMMENT 'tag:3',
c4 BIGINT COMMENT 'tag:4',
c5 BIGINT COMMENT 'tag:5',
PRIMARY KEY (pk)
);
SQL
dolt sql -q "insert into test values (0, 0, 0, 0, 0, 0)"
dolt sql -q "insert into test values (1, 1, 1, 1, 1, 1)"
dolt add test
@@ -100,17 +173,6 @@ SQL
}
@test "diff summary comparing row with a deleted cell and an added cell" {
dolt sql <<SQL
CREATE TABLE test (
pk BIGINT NOT NULL COMMENT 'tag:0',
c1 BIGINT COMMENT 'tag:1',
c2 BIGINT COMMENT 'tag:2',
c3 BIGINT COMMENT 'tag:3',
c4 BIGINT COMMENT 'tag:4',
c5 BIGINT COMMENT 'tag:5',
PRIMARY KEY (pk)
);
SQL
dolt add test
dolt commit -m "create table"
dolt sql -q "insert into test values (0, 1, 2, 3, 4, 5)"
@@ -140,17 +202,6 @@ SQL
@test "diff summary comparing two branches" {
dolt checkout -b firstbranch
dolt sql <<SQL
CREATE TABLE test (
pk BIGINT NOT NULL COMMENT 'tag:0',
c1 BIGINT COMMENT 'tag:1',
c2 BIGINT COMMENT 'tag:2',
c3 BIGINT COMMENT 'tag:3',
c4 BIGINT COMMENT 'tag:4',
c5 BIGINT COMMENT 'tag:5',
PRIMARY KEY (pk)
);
SQL
dolt sql -q "insert into test values (0, 0, 0, 0, 0, 0)"
dolt add test
dolt commit -m "Added one row"
@@ -200,17 +251,6 @@ DELIM
}
@test "diff summary gets summaries for all tables with changes" {
dolt sql <<SQL
CREATE TABLE test (
pk BIGINT NOT NULL,
c1 BIGINT,
c2 BIGINT,
c3 BIGINT,
c4 BIGINT,
c5 BIGINT,
PRIMARY KEY (pk)
);
SQL
dolt sql -q "insert into test values (0, 0, 0, 0, 0, 0)"
dolt sql -q "insert into test values (1, 1, 1, 1, 1, 1)"
dolt sql <<SQL
@@ -240,17 +280,6 @@ SQL
}
@test "diff with where clause" {
dolt sql <<SQL
CREATE TABLE test (
pk BIGINT NOT NULL COMMENT 'tag:0',
c1 BIGINT COMMENT 'tag:1',
c2 BIGINT COMMENT 'tag:2',
c3 BIGINT COMMENT 'tag:3',
c4 BIGINT COMMENT 'tag:4',
c5 BIGINT COMMENT 'tag:5',
PRIMARY KEY (pk)
);
SQL
dolt sql -q "insert into test values (0, 0, 0, 0, 0, 0)"
dolt sql -q "insert into test values (1, 1, 1, 1, 1, 1)"
dolt add test
@@ -309,17 +338,6 @@ SQL
}
@test "diff with where clause errors" {
dolt sql <<SQL
CREATE TABLE test (
pk BIGINT NOT NULL COMMENT 'tag:0',
c1 BIGINT COMMENT 'tag:1',
c2 BIGINT COMMENT 'tag:2',
c3 BIGINT COMMENT 'tag:3',
c4 BIGINT COMMENT 'tag:4',
c5 BIGINT COMMENT 'tag:5',
PRIMARY KEY (pk)
);
SQL
dolt sql -q "insert into test values (0, 0, 0, 0, 0, 0)"
dolt sql -q "insert into test values (1, 1, 1, 1, 1, 1)"
dolt add test
@@ -341,17 +359,6 @@ SQL
}
@test "diff --cached" {
dolt sql <<SQL
CREATE TABLE test (
pk BIGINT NOT NULL COMMENT 'tag:0',
c1 BIGINT COMMENT 'tag:1',
c2 BIGINT COMMENT 'tag:2',
c3 BIGINT COMMENT 'tag:3',
c4 BIGINT COMMENT 'tag:4',
c5 BIGINT COMMENT 'tag:5',
PRIMARY KEY (pk)
);
SQL
skip "diff --cached not supported"
run dolt diff --cached
[ $status -wq 0 ]
bats/sql-diff.bats
+9
View File
@@ -491,6 +491,15 @@ SQL
grep 'RENAME' query
}
@test "diff sql reconciles CREATE/ALTER/DROP VIEW" {
dolt sql -q 'create table test (pk int not null primary key)'
dolt sql -q 'create view double as select pk*2 from test'
run dolt diff -q
[ "$status" -eq 0 ]
skip "create view statements not implemented"
[[ "$output" =~ "CREATE VIEW `double`" ]] || false
}
@test "diff sql recreates tables with all types" {
dolt checkout -b firstbranch
dolt checkout -b newbranch
go/libraries/doltcore/diff/diffs.go
+20 -8
View File
@@ -18,12 +18,12 @@ import (
"context"
"sort"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema"
"github.com/liquidata-inc/dolt/go/store/hash"
"github.com/liquidata-inc/dolt/go/store/types"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/env"
"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema"
"github.com/liquidata-inc/dolt/go/libraries/utils/set"
"github.com/liquidata-inc/dolt/go/store/hash"
"github.com/liquidata-inc/dolt/go/store/types"
)
type TableDiffType int
@@ -276,7 +276,7 @@ func matchTablesForRoots(ctx context.Context, newer, older *doltdb.RootValue) (t
FromTableNames := make(map[uint64]string)
FromTableHashes := make(map[uint64]hash.Hash)
err := older.IterAllTables(ctx, func(name string, table *doltdb.Table) (stop bool, err error) {
err := older.IterTables(ctx, func(name string, table *doltdb.Table) (stop bool, err error) {
sch, err := table.GetSchema(ctx)
if err != nil {
return true, err
@@ -297,7 +297,7 @@ func matchTablesForRoots(ctx context.Context, newer, older *doltdb.RootValue) (t
return tm, err
}
err = newer.IterAllTables(ctx, func(name string, table *doltdb.Table) (stop bool, err error) {
err = newer.IterTables(ctx, func(name string, table *doltdb.Table) (stop bool, err error) {
sch, err := table.GetSchema(ctx)
if err != nil {
return true, err
@@ -354,7 +354,15 @@ func GetUserTableDeltas(ctx context.Context, fromRoot, toRoot *doltdb.RootValue)
fromTableNames := make(map[uint64]string)
fromTableHashes := make(map[uint64]hash.Hash)
err := fromRoot.IterUserTables(ctx, func(name string, table *doltdb.Table) (stop bool, err error) {
skipSet := set.NewStrSet([]string{
doltdb.DocTableName,
})
err := fromRoot.IterTables(ctx, func(name string, table *doltdb.Table) (stop bool, err error) {
if skipSet.Contains(name) {
return false, nil
}
sch, err := table.GetSchema(ctx)
if err != nil {
return true, err
@@ -376,7 +384,11 @@ func GetUserTableDeltas(ctx context.Context, fromRoot, toRoot *doltdb.RootValue)
return nil, err
}
err = toRoot.IterUserTables(ctx, func(name string, table *doltdb.Table) (stop bool, err error) {
err = toRoot.IterTables(ctx, func(name string, table *doltdb.Table) (stop bool, err error) {
if skipSet.Contains(name) {
return false, nil
}
sch, err := table.GetSchema(ctx)
if err != nil {
return true, err
go/libraries/doltcore/doltdb/root_val.go
+2 -18
View File
@@ -557,19 +557,7 @@ func (root *RootValue) HasConflicts(ctx context.Context) (bool, error) {
return len(cnfTbls) > 0, nil
}
func (root *RootValue) IterUserTables(ctx context.Context, cb func(name string, table *Table) (stop bool, err error)) error {
return root.iterTables(ctx, cb, func(name string) bool {
return !HasDoltPrefix(name)
})
}
func (root *RootValue) IterAllTables(ctx context.Context, cb func(name string, table *Table) (stop bool, err error)) error {
return root.iterTables(ctx, cb, func(name string) bool {
return true
})
}
func (root *RootValue) iterTables(ctx context.Context, cb func(name string, table *Table) (stop bool, err error), filter func(name string) bool) error {
func (root *RootValue) IterTables(ctx context.Context, cb func(name string, table *Table) (stop bool, err error)) error {
tm, err := root.getTableMap()
if err != nil {
@@ -589,17 +577,13 @@ func (root *RootValue) iterTables(ctx context.Context, cb func(name string, tabl
return err
}
name := string(nm.(types.String))
if !filter(name) {
continue
}
tableStruct, err := tableRef.(types.Ref).TargetValue(ctx, root.vrw)
if err != nil {
return err
}
name := string(nm.(types.String))
table := &Table{root.vrw, tableStruct.(types.Struct)}
stop, err := cb(name, table)