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

Merge pull request #3106 from dolthub/james/replicate_heads_session_var

Browse Source 
Make `dolt_replicate_heads` and `dolt_replicate_all_heads` both Global and Session variable
This commit is contained in:
James Cor
2022-03-28 15:02:37 -07:00
committed by GitHub
parent c5a41a9b92 85b426dbba
commit b9e2348472
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
go/libraries/doltcore/sqle/system_variables.go
View File

@@ -73,7 +73,7 @@ func AddDoltSystemVariables() {
},
{
Name: ReplicateHeadsKey,
Scope: sql.SystemVariableScope_Session,
Scope: sql.SystemVariableScope_Both,
Dynamic: true,
SetVarHintApplies: false,
Type: sql.NewSystemStringType(ReplicateHeadsKey),
@@ -81,7 +81,7 @@ func AddDoltSystemVariables() {
},
{
Name: ReplicateAllHeadsKey,
Scope: sql.SystemVariableScope_Session,
Scope: sql.SystemVariableScope_Both,
Dynamic: true,
SetVarHintApplies: false,
Type: sql.NewSystemBoolType(ReplicateAllHeadsKey),

20
integration-tests/bats/sql-server-config.bats
View File

@@ -54,6 +54,26 @@ teardown() {
[[ "$output" =~ "sqlserver.global.max_connections = 1000" ]] || false
}
@test "sql-server-config: dolt_replicate_heads is global variable" {
cd repo1
start_sql_server repo1
insert_query repo1 1 "SET @@GLOBAL.dolt_replicate_heads = main"
server_query repo1 1 "select @@GLOBAL.dolt_replicate_heads" "@@GLOBAL.dolt_replicate_heads\nmain"
server_query repo1 1 "select @@SESSION.dolt_replicate_heads" "@@SESSION.dolt_replicate_heads\nmain"
server_query repo1 1 "select @@dolt_replicate_heads" "@@SESSION.dolt_replicate_heads\nmain"
}
@test "sql-server-config: dolt_replicate_all_heads is global variable" {
cd repo1
start_sql_server repo1
insert_query repo1 1 "SET @@GLOBAL.dolt_replicate_all_heads = 1"
server_query repo1 1 "select @@GLOBAL.dolt_replicate_all_heads" "@@GLOBAL.dolt_replicate_all_heads\n1"
server_query repo1 1 "select @@SESSION.dolt_replicate_all_heads" "@@SESSION.dolt_replicate_all_heads\n1"
server_query repo1 1 "select @@dolt_replicate_all_heads" "@@SESSION.dolt_replicate_all_heads\n1"
}
@test "sql-server-config: dolt_transaction_commit is global variable" {
cd repo1
start_sql_server repo1