From 6ffd31b6bd5cea5d749d148086078b66fff2362a Mon Sep 17 00:00:00 2001
From: Claudio Costa <cstcld91@gmail.com>
Date: Fri, 4 Jun 2021 20:50:56 +0200
Subject: [PATCH] Fix nil map assignment (#17723)

---
 store/sqlstore/store.go      | 4 ++++
 store/sqlstore/store_test.go | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/store/sqlstore/store.go b/store/sqlstore/store.go
index ac5ca67fa1..e8a6930f4c 100644
--- a/store/sqlstore/store.go
+++ b/store/sqlstore/store.go
@@ -1509,6 +1509,10 @@ func (ss *SqlStore) appendMultipleStatementsFlag(dataSource string) (string, err
 			return "", err
 		}
 
+		if config.Params == nil {
+			config.Params = map[string]string{}
+		}
+
 		config.Params["multiStatements"] = "true"
 		return config.FormatDSN(), nil
 	}
diff --git a/store/sqlstore/store_test.go b/store/sqlstore/store_test.go
index 123172e497..309a7a1d48 100644
--- a/store/sqlstore/store_test.go
+++ b/store/sqlstore/store_test.go
@@ -682,7 +682,6 @@ func TestAppendMultipleStatementsFlagMysql(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.Scenario, func(t *testing.T) {
-			t.Parallel()
 			store := &SqlStore{settings: &model.SqlSettings{DriverName: &tc.Driver, DataSource: &tc.DSN}}
 			res, err := store.appendMultipleStatementsFlag(*store.settings.DataSource)
 			require.NoError(t, err)