mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-23 13:48:42 -05:00
Code Issues Packages Projects Releases 157 Wiki Activity

tests

Browse Source
This commit is contained in:
James Cor
2022-07-20 00:32:55 -07:00
parent 994b3095f1
commit 587a6b98b5
2 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/cmd/dolt/commands/sqlserver/yaml_config.go
+1 -1
View File
@@ -401,7 +401,7 @@ func (cfg YAMLConfig) DataDir() string {
func (cfg YAMLConfig) CfgDir() string {
if cfg.CfgDirStr != nil {
return *cfg.DataDirStr
return *cfg.CfgDirStr
}
return filepath.Join(cfg.DataDir(), defaultCfgDir)
}
integration-tests/bats/sql-privs.bats
+37
View File
@@ -70,6 +70,43 @@ teardown() {
[[ "$output" =~ "privileges.db" ]] || false
}
@test "sql-privs: yaml specifies doltcfg dir" {
make_test_repo
touch server.yaml
echo "cfg_dir: \"doltcfgdir\"" > server.yaml
start_sql_server_with_config test_db server.yaml
server_query test_db 1 "select user from mysql.user order by user" "User\ndolt"
run ls -a
! [[ "$output" =~ ".doltcfg" ]] || false
[[ "$output" =~ "doltcfgdir" ]] || false
server_query test_db 1 "create user new_user" ""
server_query test_db 1 "select user from mysql.user order by user" "User\ndolt\nnew_user"
run ls doltcfgdir
[[ "$output" =~ "privileges.db" ]] || false
}
@test "sql-privs: yaml specifies privilege file" {
make_test_repo
touch server.yaml
echo "privilege_file: \"privs.db\"" > server.yaml
start_sql_server_with_config test_db server.yaml
server_query test_db 1 "select user from mysql.user order by user" "User\ndolt"
run ls -a
[[ "$output" =~ ".doltcfg" ]] || false
server_query test_db 1 "create user new_user" ""
server_query test_db 1 "select user from mysql.user order by user" "User\ndolt\nnew_user"
run ls -a
[[ "$output" =~ "privs.db" ]] || false
}
@test "sql-privs: can read json privilege files and convert them" {
make_test_repo
cp $BATS_TEST_DIRNAME/privs.json .