mirror/dolt-dolthub
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2025-12-21 05:59:52 -06:00
Code Issues Packages Projects Releases 20 Wiki Activity

fix failing bats tests

Browse Source
This commit is contained in:
Stephanie You
2023-10-18 12:12:23 -07:00
parent 428acaff73
commit e82fd5e9aa
5 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
go/cmd/dolt/commands/ls.go
View File

@@ -174,6 +174,11 @@ func printUserTables(tableNames []string, apr *argparser.ArgParseResults, queryi
label = row[0][0].(string)
}
if len(tableNames) == 0 {
cli.Printf("No tables in %s\n", label)
return nil
}
cli.Printf("Tables in %s:\n", label)
for _, tbl := range tableNames {
if apr.Contains(cli.VerboseFlag) {
@@ -195,7 +200,15 @@ func printTableVerbose(table string, queryist cli.Queryist, sqlCtx *sql.Context)
return err
}
cli.Println(fmt.Sprintf("\t%-20s %d rows\n", table, row[0][0].(int64)))
if cnt, ok := row[0][0].(int64); ok {
cli.Println(fmt.Sprintf("\t%-20s %d rows", table, cnt))
} else if cnt, ok := row[0][0].(string); ok {
// remote execution returns result as a string
cli.Println(fmt.Sprintf("\t%-20s %s rows", table, cnt))
} else {
return fmt.Errorf("unexpected type for count: %T", row[0][0])
}
return nil
}

1
integration-tests/bats/helper/local-remote.bash
View File

@@ -134,6 +134,7 @@ SKIP_SERVER_TESTS=$(cat <<-EOM
~sql-checkout.bats~
~cli-hosted.bats~
~profile.bats~
~ls.bats~
EOM
)

9
integration-tests/bats/ls.bats
View File

@@ -183,6 +183,15 @@ teardown() {
[[ "$output" =~ "t3" ]] || false
}
@test "ls: no tables in working set" {
dolt sql -q "drop table t1"
dolt sql -q "drop table t2"
run dolt ls
[ "$status" -eq 0 ]
[[ "$output" =~ "No tables in working set" ]] || false
}
@test "ls: too many arguments" {
run dolt ls HEAD HEAD~1
[ "$status" -eq 1 ]

28
integration-tests/bats/system-tables.bats
View File

@@ -55,34 +55,6 @@ teardown() {
[[ "$output" =~ "dolt_commit_diff_test" ]] || false
}
@test "system-tables: dolt ls --system -v shows history and diff systems tables for tables on other branches" {
dolt checkout -b add-table-branch
dolt sql -q "create table test (pk int, c1 int, primary key(pk))"
dolt add test
dolt commit -m "Added test table"
dolt checkout main
run dolt ls --system
[ $status -eq 0 ]
[[ "$output" =~ "dolt_log" ]] || false
[[ "$output" =~ "dolt_conflicts" ]] || false
[[ "$output" =~ "dolt_branches" ]] || false
[[ "$output" =~ "dolt_remote_branches" ]] || false
[[ "$output" =~ "dolt_remotes" ]] || false
[[ ! "$output" =~ "dolt_history_test" ]] || false
[[ ! "$output" =~ "dolt_diff_test" ]] || false
[[ ! "$output" =~ "dolt_commit_diff_test" ]] || false
run dolt ls --system -v
[ $status -eq 0 ]
[[ "$output" =~ "dolt_log" ]] || false
[[ "$output" =~ "dolt_conflicts" ]] || false
[[ "$output" =~ "dolt_branches" ]] || false
[[ "$output" =~ "dolt_remote_branches" ]] || false
[[ "$output" =~ "dolt_remotes" ]] || false
[[ "$output" =~ "dolt_history_test" ]] || false
[[ "$output" =~ "dolt_diff_test" ]] || false
[[ "$output" =~ "dolt_commit_diff_test" ]] || false
}
@test "system-tables: query dolt_log system table" {
dolt sql -q "create table test (pk int, c1 int, primary key(pk))"
dolt add test

4
integration-tests/data-dump-loading-tests/sakila-data-dump-load.bats
View File

@@ -19,9 +19,9 @@ teardown() {
cd sakila
# tables in working set
# tables and views in working set
run dolt ls
[ "${#lines[@]}" -eq 17 ]
[ "${#lines[@]}" -eq 24 ]
# triggers