mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-25 10:19:24 -06:00
Code Issues Packages Projects Releases 136 Wiki Activity

Fix more bats sql tests

Browse Source
This commit is contained in:
Tan Yong Zhi
2022-08-23 15:42:24 +08:00
parent 178f541f34
commit af955f4ccb
4 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
integration-tests/bats/multidb.bats
View File

@@ -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"
}

3
integration-tests/bats/replication-multidb.bats
View File

@@ -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

1
integration-tests/bats/sql-create-database.bats
View File

@@ -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

17
integration-tests/bats/sql-server.bats
View File

@@ -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 <john@example.com>');
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')"