From 7a3ce82c2b0f0c64ff9a337233d06c87223c8895 Mon Sep 17 00:00:00 2001 From: Aravind Shankar Date: Fri, 13 Sep 2019 15:48:30 +0530 Subject: [PATCH] fix cli get setting panic on empty row, close #2872 --- cli/migrate/database/hasuradb/settings.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/migrate/database/hasuradb/settings.go b/cli/migrate/database/hasuradb/settings.go index 12dce856f1375..12c7e738ec1c4 100644 --- a/cli/migrate/database/hasuradb/settings.go +++ b/cli/migrate/database/hasuradb/settings.go @@ -160,13 +160,13 @@ func (h *HasuraDB) GetSetting(name string) (value string, err error) { return value, fmt.Errorf("Invalid result Type %s", hres.ResultType) } - if len(hres.Result) == 0 { + if len(hres.Result) < 2 { for _, setting := range h.settings { if setting.GetName() == name { return setting.GetDefaultValue(), nil } } - return "", nil + return value, fmt.Errorf("Invalid setting name: %s", name) } return hres.Result[1][0], nil