mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-30 11:31:37 -05:00
Code Issues Packages Projects Releases 159 Wiki Activity

Fixed bats expected output, fixed display bug for 0 rows affected

Browse Source 
Signed-off-by: Zach Musgrave <zach@liquidata.co>
This commit is contained in:
Zach Musgrave
2020-04-14 11:22:15 -07:00
parent 22d27adbc5
commit d93310affe
6 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bats/1pk5col-ints.bats
+23 -16
View File
@@ -114,18 +114,18 @@ if rows[2] != "9,8,7,6,5,4".split(","):
@test "dolt sql all manner of inserts" {
run dolt sql -q "insert into test (pk,c1,c2,c3,c4,c5) values (0,6,6,6,6,6)"
[ "$status" -eq 0 ]
[[ "$output" =~ "| 1 |" ]] || false
[[ "$output" =~ "Query OK, 1 row affected" ]] || false
run dolt sql -q "select * from test"
[[ "$output" =~ "6" ]] || false
run dolt sql -q "insert into test (pk,c1,c2,c3,c4,c5) values (1,7,7,7,7,7),(2,8,8,8,8,8)"
[ "$status" -eq 0 ]
[[ "$output" =~ "| 2 |" ]] || false
[[ "$output" =~ "Query OK, 2 rows affected" ]] || false
run dolt sql -q "select * from test"
[[ "$output" =~ "7" ]] || false
[[ "$output" =~ "8" ]] || false
run dolt sql -q "insert into test (pk,c1,c3,c5) values (3,9,9,9)"
[ "$status" -eq 0 ]
[[ "$output" =~ "| 1 |" ]] || false
[[ "$output" =~ "Query OK, 1 row affected" ]] || false
run dolt sql -q "select * from test"
[[ "$output" =~ "9" ]] || false
run dolt sql -q "insert into test (c1,c3,c5) values (50,55,60)"
@@ -148,7 +148,7 @@ if rows[2] != "9,8,7,6,5,4".split(","):
@test "dolt sql insert no columns specified" {
run dolt sql -q "insert into test values (0,0,0,0,0,0)"
[ "$status" -eq 0 ]
[[ "$output" =~ "| 1 |" ]] || false
[[ "$output" =~ "Query OK, 1 row affected" ]] || false
run dolt sql -q "select * from test"
[[ "$output" =~ "0" ]] || false
run dolt sql -q "insert into test values (4,1,2)"
@@ -171,21 +171,23 @@ if rows[2] != "9,8,7,6,5,4".split(","):
dolt sql -q "insert into test (pk,c1,c2,c3,c4,c5) values (0,6,6,6,6,6)"
run dolt sql -q "replace into test (pk,c1,c2,c3,c4,c5) values (0,7,7,7,7,7),(1,8,8,8,8,8)"
[ "$status" -eq 0 ]
[[ "${lines[1]}" =~ "updated" ]] || false
# No skip, but this is a bug in the output. Query produces the right result, but counts it incorrectly
[[ "$output" =~ "Query OK, 4 rows affected" ]] || false
## No skip, but this should report 3 but is reporting 4 [[ "${lines[3]}" =~ "3" ]] || false
run dolt sql -q "select * from test"
[[ "$output" =~ "7" ]] || false
[[ "$output" =~ "8" ]] || false
[[ ! "$output" =~ "6" ]] || false
skip "replace into output is incorrect"
}
@test "dolt sql insert and dolt sql select" {
run dolt sql -q "insert into test (pk,c1,c2,c3,c4,c5) values (0,1,2,3,4,5)"
[ "$status" -eq 0 ]
[[ "$output" =~ "| 1 |" ]] || false
[[ "$output" =~ "Query OK, 1 row affected" ]] || false
run dolt sql -q "insert into test (pk,c1,c2,c3,c4,c5) values (101,102,103,104,105,106),(1,6,7,8,9,10)"
[ "$status" -eq 0 ]
[[ "$output" =~ "| 2 |" ]] || false
[[ "$output" =~ "Query OK, 2 rows affected" ]] || false
run dolt sql -q "select * from test"
[ "$status" -eq 0 ]
[[ "$output" =~ \|[[:space:]]+c5 ]] || false
@@ -287,22 +289,26 @@ if rows[2] != "9,8,7,6,5,4".split(","):
dolt sql -q "insert into test (pk,c1,c2,c3,c4,c5) values (0,1,2,3,4,5),(1,11,12,13,14,15),(2,21,22,23,24,25)"
run dolt sql -q "update test set c1=6,c2=7,c3=8,c4=9,c5=10 where pk=0"
[ "$status" -eq 0 ]
[[ "$output" =~ "| 1 | 1 |" ]] || false
[[ "$output" =~ "Query OK, 1 row affected" ]] || false
[[ "$output" =~ "Rows matched: 1 Changed: 1 Warnings: 0" ]] || false
run dolt sql -q "select * from test where pk=0"
[ "$status" -eq 0 ]
[[ "$output" =~ "10" ]] || false
[[ ! "$output" =~ "|5" ]] || false
dolt sql -q "insert into test (pk,c1,c2,c3,c4,c5) values (4,11,12,13,14,15)"
run dolt sql -q "update test set c2=11,c3=11,c4=11,c5=11 where c1=11"
[[ "$output" =~ "Query OK, 2 rows affected" ]] || false
[[ "$output" =~ "Rows matched: 2 Changed: 2 Warnings: 0" ]] || false
[ "$status" -eq 0 ]
[[ "$output" =~ "| 2 | 2 |" ]] || false
[[ "$output" =~ "" ]] || false
run dolt sql -q "select * from test"
[ "$status" -eq 0 ]
[[ "$output" =~ "11" ]] || false
[[ ! "$output" =~ "12" ]] || false
run dolt sql -q "update test set c2=50,c3=50,c4=50,c5=50 where c1=50"
[ "$status" -eq 0 ]
[[ "$output" =~ "| 0 | 0 |" ]] || false
[[ "$output" =~ "Query OK, 0 rows affected" ]] || false
[[ "$output" =~ "Rows matched: 0 Changed: 0 Warnings: 0" ]] || false
run dolt sql -q "select * from test"
[ "$status" -eq 0 ]
[[ ! "$output" =~ "50" ]] || false
@@ -314,7 +320,8 @@ if rows[2] != "9,8,7,6,5,4".split(","):
[ "$output" = "unable to cast \"foo\" of type string to int64" ]
run dolt sql -q "update test set c1=100,c2=100,c3=100,c4=100,c5=100 where pk>0"
[ "$status" -eq 0 ]
[[ "$output" =~ "| 3 | 3 |" ]] || false
[[ "$output" =~ "Query OK, 3 rows affected" ]] || false
[[ "$output" =~ "Rows matched: 3 Changed: 3 Warnings: 0" ]] || false
run dolt sql -q "select * from test"
[ "$status" -eq 0 ]
[[ "$output" =~ "100" ]] || false
@@ -326,24 +333,24 @@ if rows[2] != "9,8,7,6,5,4".split(","):
dolt sql -q "insert into test (pk,c1,c2,c3,c4,c5) values (0,1,2,3,4,5),(1,11,12,13,14,15),(2,21,22,23,24,25)"
run dolt sql -q "delete from test where pk=2"
[ "$status" -eq 0 ]
[[ "$output" =~ "| 1 |" ]] || false
[[ "$output" =~ "Query OK, 1 row affected" ]] || false
run dolt sql -q "delete from test"
[ "$status" -eq 0 ]
[[ "$output" =~ "| 2 |" ]] || false
[[ "$output" =~ "Query OK, 2 rows affected" ]] || false
dolt sql -q "insert into test (pk,c1,c2,c3,c4,c5) values (0,1,2,3,4,5),(1,11,12,13,14,15),(2,21,22,23,24,25)"
run dolt sql -q "delete from test where pk>0"
[ "$status" -eq 0 ]
[[ "$output" =~ "| 2 |" ]] || false
[[ "$output" =~ "Query OK, 2 rows affected" ]] || false
run dolt sql -q "delete from test where c1=1"
[ "$status" -eq 0 ]
[[ "$output" =~ "| 1 |" ]] || false
[[ "$output" =~ "Query OK, 1 row affected" ]] || false
dolt sql -q "insert into test (pk,c1,c2,c3,c4,c5) values (0,1,2,3,4,5),(1,11,12,13,14,15),(2,21,22,23,24,25)"
run dolt sql -q "delete from test where c10=1"
[ "$status" -eq 1 ]
[ "$output" = "column \"c10\" could not be found in any table in scope" ]
run dolt sql -q "delete from test where c1='foo'"
[ "$status" -eq 0 ]
[[ "$output" =~ "| 0 |" ]] || false
[[ "$output" =~ "Query OK, 0 rows affected" ]] || false
}
@test "dolt checkout to put a table back to its checked in state" {
bats/1pk5col-strings.bats
+2 -2
View File
@@ -78,7 +78,7 @@ teardown() {
@test "interact with a strings type table with sql" {
run dolt sql -q "insert into test (pk,c1,c2,c3,c4,c5) values ('tim','is','super','duper','rad','fo sho')"
[ "$status" -eq 0 ]
[[ "$output" =~ "| 1 |" ]] || false
[[ "$output" =~ "Query OK, 1 row affected" ]] || false
run dolt sql -q "select * from test"
[ "$status" -eq 0 ]
[[ "$output" =~ "c5" ]] || false
@@ -124,4 +124,4 @@ teardown() {
run dolt sql <<< "insert into test (pk,c1) values ('test3', 'this \\\\'' should \\\\'' work')"
[ "$status" -eq 0 ]
[[ "$output" =~ "Rows inserted: 1" ]]
}
}
bats/2pk5cols-ints.bats
+3 -3
View File
@@ -76,14 +76,14 @@ teardown() {
@test "interact with a multiple primary key table with sql" {
run dolt sql -q "insert into test (pk1,pk2,c1,c2,c3,c4,c5) values (0,0,6,6,6,6,6)"
[ "$status" -eq 0 ]
[[ "$output" =~ "| 1 |" ]] || false
[[ "$output" =~ "Query OK, 1 row affected" ]] || false
run dolt sql -q "select * from test"
[ "$status" -eq 0 ]
[[ "$output" =~ "c5" ]] || false
[[ "$output" =~ "6" ]] || false
run dolt sql -q "insert into test (pk1,pk2,c1,c2,c3,c4,c5) values (0,1,7,7,7,7,7),(1,0,8,8,8,8,8)"
[ "$status" -eq 0 ]
[[ "$output" =~ "| 2 |" ]] || false
[[ "$output" =~ "Query OK, 2 rows affected" ]] || false
run dolt sql -q "select * from test"
[ "$status" -eq 0 ]
[[ "$output" =~ "c5" ]] || false
@@ -103,4 +103,4 @@ teardown() {
run dolt sql -q "insert into test (c1,c2,c3,c4,c5) values (6,6,6,6,6)"
[ "$status" -eq 1 ]
[ "$output" = "column name 'pk1' is non-nullable but attempted to set default value of null" ] || false
}
}
bats/git-dolt.bats
+1
View File
@@ -24,6 +24,7 @@ teardown() {
@test "git dolt install sets up a smudge filter in the current git repository" {
init_git_repo
run git dolt install
[ "$status" -eq 0 ]
[[ "${lines[0]}" =~ "Installed git-dolt smudge filter" ]] || false
bats/sql-multi-db.bats
+2 -2
View File
@@ -29,7 +29,7 @@ seed_repos_with_tables_with_use_statements() {
}
@test "sql multi-db test show databases" {
EXPECTED=$(echo -e "Database\nrepo1\nrepo2")
EXPECTED=$(echo -e "Database\ninformation_schema\nrepo1\nrepo2")
run dolt sql -r csv --multi-db-dir ./ -q "SHOW DATABASES"
[ "$status" -eq 0 ]
[[ "$output" =~ "$EXPECTED" ]] || false
@@ -82,4 +82,4 @@ seed_repos_with_tables_with_use_statements() {
echo \"\"\"$output\"\"\"
[ "$status" -eq 0 ]
[[ "$output" =~ "$EXPECTED" ]] || false
}
}
go/cmd/dolt/commands/sql.go
+1 -1
View File
@@ -1299,7 +1299,7 @@ func printOKResult(ctx context.Context, iter sql.RowIter) error {
if okResult, ok := row[0].(sql.OkResult); ok {
rowNoun := "row"
if okResult.RowsAffected > 1 {
if okResult.RowsAffected != 1 {
rowNoun = "rows"
}
cli.Printf("Query OK, %d %s affected\n", okResult.RowsAffected, rowNoun)