From af955f4ccb60229693bf90364dd746f156889b35 Mon Sep 17 00:00:00 2001 From: Tan Yong Zhi Date: Tue, 23 Aug 2022 15:42:24 +0800 Subject: [PATCH] Fix more bats sql tests --- integration-tests/bats/multidb.bats | 2 +- integration-tests/bats/replication-multidb.bats | 3 +++ integration-tests/bats/sql-create-database.bats | 1 + integration-tests/bats/sql-server.bats | 17 +++++++++++++++-- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/integration-tests/bats/multidb.bats b/integration-tests/bats/multidb.bats index 1cb1861d57..91bcd16fe3 100644 --- a/integration-tests/bats/multidb.bats +++ b/integration-tests/bats/multidb.bats @@ -30,7 +30,7 @@ teardown() { @test "multidb: database default branches" { cd dbs1 start_multi_db_server repo1 - server_query repo1 1 dolt "" "create database new; use new; call dcheckout('-b', 'feat'); create table t (x int); call dcommit('-am', 'cm'); set @@global.new_default_branch='feat'" + server_query repo1 1 dolt "" "create database new; use new; call dcheckout('-b', 'feat'); create table t (x int); call dolt_add('.'); call dcommit('-am', 'cm'); set @@global.new_default_branch='feat'" server_query repo1 1 "use repo1" } diff --git a/integration-tests/bats/replication-multidb.bats b/integration-tests/bats/replication-multidb.bats index e54b8608e2..e48b45519e 100644 --- a/integration-tests/bats/replication-multidb.bats +++ b/integration-tests/bats/replication-multidb.bats @@ -162,10 +162,13 @@ teardown() { cd .. server_query repo1 1 dolt "" "create table t1 (a int primary key)" + server_query repo1 1 dolt "" "call dolt_add('.')" server_query repo1 1 dolt "" "call dolt_commit('-am', 'cm')" server_query repo2 1 dolt "" "create table t2 (a int primary key)" + server_query repo2 1 dolt "" "call dolt_add('.')" server_query repo2 1 dolt "" "call dolt_commit('-am', 'cm')" server_query repo3 1 dolt "" "create table t3 (a int primary key)" + server_query repo3 1 dolt "" "call dolt_add('.')" server_query repo3 1 dolt "" "call dolt_commit('-am', 'cm')" clone_helper $TMPDIRS diff --git a/integration-tests/bats/sql-create-database.bats b/integration-tests/bats/sql-create-database.bats index b94c631a75..6217e288c8 100644 --- a/integration-tests/bats/sql-create-database.bats +++ b/integration-tests/bats/sql-create-database.bats @@ -80,6 +80,7 @@ SQL create database mydb; use mydb; create table test(a int primary key); +call dolt_add('.'); select dolt_commit("-am", "first commit"); SQL diff --git a/integration-tests/bats/sql-server.bats b/integration-tests/bats/sql-server.bats index b2823738a9..291a3f5f7a 100644 --- a/integration-tests/bats/sql-server.bats +++ b/integration-tests/bats/sql-server.bats @@ -340,8 +340,8 @@ SQL [ "$status" -eq 0 ] [[ "$output" =~ "one_pk" ]] || false + dolt sql --user=dolt -q "CALL DOLT_ADD('.')" # check that dolt_commit works properly when autocommit is on - dolt add . run dolt sql --user=dolt -q "SELECT DOLT_COMMIT('-a', '-m', 'Commit1')" [ "$status" -eq 0 ] @@ -775,6 +775,7 @@ SQL PRIMARY KEY (pk) ); INSERT INTO one_pk (pk,c1,c2) VALUES (2,2,2),(3,3,3); + CALL DOLT_ADD('.'); SELECT commit('-am', 'test commit message', '--author', 'John Doe '); INSERT INTO dolt_branches (name,hash) VALUES ('main', @@repo1_head);" @@ -1129,6 +1130,7 @@ END""") server_query repo1 1 dolt "" "INSERT INTO t1 (val) VALUES (2)" server_query repo1 1 dolt "" "SELECT * FROM t1" "pk,val\n1,1\n2,2" + run server_query repo1 1 dolt "" "call dolt_add('.')" run server_query repo1 1 dolt "" "call dolt_commit('-am', 'table with two values')" run server_query repo1 1 dolt "" "call dolt_branch('new_branch')" @@ -1200,11 +1202,13 @@ END""") server_query "" 1 dolt "" "create database test1" server_query "" 1 dolt "" "show databases" "Database\ninformation_schema\nmysql\ntest1" server_query "test1" 1 dolt "" "create table a(x int)" + server_query "test1" 1 dolt "" "select dolt_add('.')" server_query "test1" 1 dolt "" "insert into a values (1), (2)" server_query "test1" 1 dolt "" "call dolt_commit('-a', '-m', 'new table a')" server_query "" 1 dolt "" "create database test2" server_query "test2" 1 dolt "" "create table b(x int)" + server_query "test2" 1 dolt "" "select dolt_add('.')" server_query "test2" 1 dolt "" "insert into b values (1), (2)" server_query "test2" 1 dolt "" "select dolt_commit('-a', '-m', 'new table b')" @@ -1230,6 +1234,7 @@ END""") server_query "" 1 dolt "" "create database test3" server_query "test3" 1 dolt "" "create table c(x int)" + server_query "test3" 1 dolt "" "select dolt_add('.')" server_query "test3" 1 dolt "" "insert into c values (1), (2)" run server_query "test3" 1 dolt "" "select dolt_commit('-a', '-m', 'new table c')" @@ -1257,14 +1262,17 @@ END""") server_query "" 1 dolt "" "show databases" "Database\ninformation_schema\nmysql\ntest1\ntest2\ntest3" server_query "test1" 1 dolt "" "create table a(x int)" + server_query "test1" 1 dolt "" "select dolt_add('.')" server_query "test1" 1 dolt "" "insert into a values (1), (2)" run server_query "test1" 1 dolt "" "call dolt_commit('-a', '-m', 'new table a')" server_query "test2" 1 dolt "" "create table a(x int)" + server_query "test2" 1 dolt "" "select dolt_add('.')" server_query "test2" 1 dolt "" "insert into a values (3), (4)" server_query "test2" 1 dolt "" "call dolt_commit('-a', '-m', 'new table a')" server_query "test3" 1 dolt "" "create table a(x int)" + server_query "test3" 1 dolt "" "select dolt_add('.')" server_query "test3" 1 dolt "" "insert into a values (5), (6)" server_query "test3" 1 dolt "" "call dolt_commit('-a', '-m', 'new table a')" @@ -1303,7 +1311,7 @@ END""") server_query "" 1 dolt "" "show databases" "Database\nTest1\ninformation_schema\nmysql" server_query "" 1 dolt "" "use test1; create table a(x int);" server_query "" 1 dolt "" "use TEST1; insert into a values (1), (2);" - run server_query "" 1 dolt "" "use test1; select dolt_commit('-a', '-m', 'new table a');" + run server_query "" 1 dolt "" "use test1; select dolt_add('.'); select dolt_commit('-a', '-m', 'new table a');" server_query "" 1 dolt "" "use test1; call dolt_checkout('-b', 'newbranch');" server_query "" 1 dolt "" "use \`TEST1/newbranch\`; select * from a order by x" ";x\n1\n2" server_query "" 1 dolt "" "use \`test1/newbranch\`; select * from a order by x" ";x\n1\n2" @@ -1323,6 +1331,7 @@ END""") server_query "" 1 dolt "" "create database test1" server_query "" 1 dolt "" "show databases" "Database\ninformation_schema\nmysql\ntest1" server_query "test1" 1 dolt "" "create table a(x int)" + server_query "test1" 1 dolt "" "select dolt_add('.')" server_query "test1" 1 dolt "" "insert into a values (1), (2)" server_query "test1" 1 dolt "" "call dolt_commit('-a', '-m', 'new table a')" @@ -1338,6 +1347,7 @@ END""") server_query "" 1 dolt "" "create database test3" server_query "test3" 1 dolt "" "create table c(x int)" + server_query "test3" 1 dolt "" "select dolt_add('.')" server_query "test3" 1 dolt "" "insert into c values (1), (2)" server_query "test3" 1 dolt "" "call dolt_commit('-a', '-m', 'new table c')" @@ -1379,12 +1389,15 @@ END""") server_query "" 1 dolt "" "create database test1" server_query "repo1" 1 dolt "" "show databases" "Database\ninformation_schema\nmysql\nrepo1\ntest1" server_query "test1" 1 dolt "" "create table a(x int)" + server_query "test1" 1 dolt "" "select dolt_add('.')" server_query "test1" 1 dolt "" "insert into a values (1), (2)" + # not bothering to check the results of the commit here server_query "test1" 1 dolt "" "call dolt_commit('-a', '-m', 'new table a')" server_query "" 1 dolt "" "create database test2" server_query "test2" 1 dolt "" "create table b(x int)" + server_query "test2" 1 dolt "" "select dolt_add('.')" server_query "test2" 1 dolt "" "insert into b values (1), (2)" # not bothering to check the results of the commit here server_query "test2" 1 dolt "" "call dolt_commit('-a', '-m', 'new table b')"