system variables cannot have nil defaults (#8590)

dolthub · Nov 22, 2024 · bb53838 · bb53838
1 parent b9ad822
commit bb53838
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/go/libraries/doltcore/sqle/system_variables.go b/go/libraries/doltcore/sqle/system_variables.go
@@ -124,7 +124,7 @@ var DoltSystemVariables = []sql.SystemVariable{
 		Dynamic:           true,
 		SetVarHintApplies: false,
 		Type:              types.NewSystemStringType(dsess.DoltCommitOnTransactionCommitMessage),
-		Default:           nil,
+		Default:           "",
 	},
 	&sql.MysqlSystemVariable{
 		Name:              dsess.TransactionsDisabledSysVar,
@@ -164,23 +164,23 @@ var DoltSystemVariables = []sql.SystemVariable{
 		Dynamic:           false,
 		SetVarHintApplies: false,
 		Type:              types.NewSystemStringType(dsess.AwsCredsFile),
-		Default:           nil,
+		Default:           "",
 	},
 	&sql.MysqlSystemVariable{
 		Name:              dsess.AwsCredsProfile,
 		Scope:             sql.GetMysqlScope(sql.SystemVariableScope_Session),
 		Dynamic:           false,
 		SetVarHintApplies: false,
 		Type:              types.NewSystemStringType(dsess.AwsCredsProfile),
-		Default:           nil,
+		Default:           "",
 	},
 	&sql.MysqlSystemVariable{
 		Name:              dsess.AwsCredsRegion,
 		Scope:             sql.GetMysqlScope(sql.SystemVariableScope_Session),
 		Dynamic:           false,
 		SetVarHintApplies: false,
 		Type:              types.NewSystemStringType(dsess.AwsCredsRegion),
-		Default:           nil,
+		Default:           "",
 	},
 	&sql.MysqlSystemVariable{
 		Name:              dsess.ShowBranchDatabases,
@@ -351,7 +351,7 @@ func AddDoltSystemVariables() {
 			Dynamic:           true,
 			SetVarHintApplies: false,
 			Type:              types.NewSystemStringType(dsess.DoltCommitOnTransactionCommitMessage),
-			Default:           nil,
+			Default:           "",
 		},
 		&sql.MysqlSystemVariable{
 			Name:              dsess.TransactionsDisabledSysVar,
@@ -391,23 +391,23 @@ func AddDoltSystemVariables() {
 			Dynamic:           false,
 			SetVarHintApplies: false,
 			Type:              types.NewSystemStringType(dsess.AwsCredsFile),
-			Default:           nil,
+			Default:           "",
 		},
 		&sql.MysqlSystemVariable{
 			Name:              dsess.AwsCredsProfile,
 			Scope:             sql.GetMysqlScope(sql.SystemVariableScope_Session),
 			Dynamic:           false,
 			SetVarHintApplies: false,
 			Type:              types.NewSystemStringType(dsess.AwsCredsProfile),
-			Default:           nil,
+			Default:           "",
 		},
 		&sql.MysqlSystemVariable{
 			Name:              dsess.AwsCredsRegion,
 			Scope:             sql.GetMysqlScope(sql.SystemVariableScope_Session),
 			Dynamic:           false,
 			SetVarHintApplies: false,
 			Type:              types.NewSystemStringType(dsess.AwsCredsRegion),
-			Default:           nil,
+			Default:           "",
 		},
 		&sql.MysqlSystemVariable{
 			Name:              dsess.ShowBranchDatabases,

diff --git a/integration-tests/bats/sql-server.bats b/integration-tests/bats/sql-server.bats
@@ -209,7 +209,7 @@ user_session_vars:
     [[ "$output" =~ /Users/user1/.aws/config.*lddev ]] || false
 
     run dolt --host=127.0.0.1 --port=$PORT --no-tls --user=user2 --password=pass2 sql -q "SELECT @@aws_credentials_file, @@aws_credentials_profile;"
-    [[ "$output" =~ NULL.*NULL ]] || false
+    [[ "$output" =~ "   " ]] || false
 
     run dolt --host=127.0.0.1 --port=$PORT --no-tls --user=user2 --password=pass2 sql -q "SET @@aws_credentials_file='/Users/should_fail';"
     [[ "$output" =~ "Variable 'aws_credentials_file' is a read only variable" ]] || false