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

test fixes

Browse Source
This commit is contained in:
Brian Hendriks
2019-05-20 14:00:57 -07:00
parent ae4d2e4d7b
commit e0c8a7cbd6
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bats/1pk5col-ints.bats
View File

@@ -491,7 +491,7 @@ teardown() {
@test "import data from a csv file after table created" {
run dolt table import test -u $BATS_TEST_DIRNAME/helper/1pk5col-ints.csv
[ "$status" -eq 0 ]
[ "$output" = "" ]
[[ "$output" =~ "Import completed successfully." ]] || false
run dolt table select test
[ "$status" -eq 0 ]
# Number of lines offset by 3 for table printing style
@@ -501,7 +501,7 @@ teardown() {
@test "import data from a psv file after table created" {
run dolt table import test -u $BATS_TEST_DIRNAME/helper/1pk5col-ints.psv
[ "$status" -eq 0 ]
[ "$output" = "" ]
[[ "$output" =~ "Import completed successfully." ]] || false
run dolt table select test
[ "$status" -eq 0 ]
# Number of lines offset by 3 for table printing style

13
bats/create-tables.bats
View File

@@ -63,7 +63,7 @@ teardown() {
@test "create a table with json import" {
run dolt table import -c -s $BATS_TEST_DIRNAME/helper/employees-sch.json employees $BATS_TEST_DIRNAME/helper/employees-tbl.json
[ "$status" -eq 0 ]
[ "$output" = "" ]
[[ "$output" =~ "Import completed successfully." ]] || false
run dolt ls
[ "$status" -eq 0 ]
[[ "$output" =~ "employees" ]] || false
@@ -102,7 +102,7 @@ teardown() {
@test "import data from csv and create the table" {
run dolt table import -c --pk=pk test $BATS_TEST_DIRNAME/helper/1pk5col-ints.csv
[ "$status" -eq 0 ]
[ "$output" = "" ]
[[ "$output" =~ "Import completed successfully." ]] || false
run dolt ls
[ "$status" -eq 0 ]
[[ "$output" =~ "test" ]] || false
@@ -120,7 +120,7 @@ teardown() {
@test "create a table with two primary keys from csv import" {
run dolt table import -c --pk=pk1,pk2 test $BATS_TEST_DIRNAME/helper/2pk5col-ints.csv
[ "$status" -eq 0 ]
[ "$output" = "" ]
[[ "$output" =~ "Import completed successfully." ]] || false
run dolt ls
[ "$status" -eq 0 ]
[[ "$output" =~ "test" ]] || false
@@ -129,7 +129,7 @@ teardown() {
@test "import data from psv and create the table" {
run dolt table import -c --pk=pk test $BATS_TEST_DIRNAME/helper/1pk5col-ints.psv
[ "$status" -eq 0 ]
[ "$output" = "" ]
[[ "$output" =~ "Import completed successfully." ]] || false
run dolt ls
[ "$status" -eq 0 ]
[[ "$output" =~ "test" ]] || false
@@ -148,6 +148,7 @@ teardown() {
@test "create a table from CSV with common column name patterns" {
run dolt table import -c --pk=UPPERCASE test $BATS_TEST_DIRNAME/helper/caps-column-names.csv
[ "$status" -eq 0 ]
[[ "$output" =~ "Import completed successfully." ]] || false
run dolt table select test
[ "$status" -eq 0 ]
[[ "$output" =~ "UPPERCASE" ]] || false
@@ -156,7 +157,7 @@ teardown() {
@test "create a table from excel import with multiple sheets" {
run dolt table import -c --pk=id employees $BATS_TEST_DIRNAME/helper/employees.xlsx
[ "$status" -eq 0 ]
[ "$output" = "" ]
[[ "$output" =~ "Import completed successfully." ]] || false
run dolt ls
[ "$status" -eq 0 ]
[[ "$output" =~ "employees" ]] || false
@@ -166,7 +167,7 @@ teardown() {
[ "${#lines[@]}" -eq 7 ]
run dolt table import -c --pk=number basketball $BATS_TEST_DIRNAME/helper/employees.xlsx
[ "$status" -eq 0 ]
[ "$output" = "" ]
[[ "$output" =~ "Import completed successfully." ]] || false
run dolt ls
[ "$status" -eq 0 ]
[[ "$output" =~ "employees" ]] || false

9
go/cmd/dolt/commands/tblcmds/import.go
View File

@@ -132,7 +132,13 @@ func Import(commandStr string, args []string, dEnv *env.DoltEnv) int {
return 1
}
return executeMove(dEnv, force, mvOpts)
res := executeMove(dEnv, force, mvOpts)
if res == 0 {
cli.Println(color.CyanString("\nImport completed successfully."))
}
return res
}
func parseCreateArgs(commandStr string, args []string) (bool, *mvdata.MoveOptions) {
@@ -244,7 +250,6 @@ func executeMove(dEnv *env.DoltEnv, force bool, mvOpts *mvdata.MoveOptions) int
}
}
cli.Println(color.CyanString("\nImport completed successfully."))
return 0
}