Skip to content

Commit da30c5b

Browse files
fix lint warnings
1 parent 80018ae commit da30c5b

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

settings/request.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import (
66

77
func newSetRequest(setting string, value interface{}) *tarantool.UpdateRequest {
88
return tarantool.NewUpdateRequest(sessionSettingsSpace).
9-
Key(tarantool.StringKey{setting}).
9+
Key(tarantool.StringKey{S: setting}).
1010
Operations(tarantool.NewOperations().Assign(sessionSettingValueField, value))
1111
}
1212

1313
func newGetRequest(setting string) *tarantool.SelectRequest {
1414
return tarantool.NewSelectRequest(sessionSettingsSpace).
15-
Key(tarantool.StringKey{setting}).
15+
Key(tarantool.StringKey{S: setting}).
1616
Limit(1)
1717
}
1818

settings/request_test.go

+10-1
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@ func TestSQLFullMetadata(t *testing.T) {
302302

303303
resp, err = conn.Do(GetSQLFullMetadata()).Get()
304304
require.Nil(t, err)
305+
require.NotNil(t, resp)
305306
require.Equal(t, []interface{}{[]interface{}{SQLFullMetadata, false}}, resp.Data)
306307

307308
resp, err = conn.Execute("SELECT x FROM fmt WHERE id = 1;", []interface{}{})
@@ -311,10 +312,12 @@ func TestSQLFullMetadata(t *testing.T) {
311312

312313
resp, err = conn.Do(SetSQLFullMetadata(true)).Get()
313314
require.Nil(t, err)
315+
require.NotNil(t, resp)
314316
require.Equal(t, []interface{}{[]interface{}{SQLFullMetadata, true}}, resp.Data)
315317

316318
resp, err = conn.Do(GetSQLFullMetadata()).Get()
317319
require.Nil(t, err)
320+
require.NotNil(t, resp)
318321
require.Equal(t, []interface{}{[]interface{}{SQLFullMetadata, true}}, resp.Data)
319322

320323
resp, err = conn.Execute("SELECT x FROM fmt WHERE id = 1;", []interface{}{})
@@ -334,18 +337,22 @@ func TestSQLParserDebug(t *testing.T) {
334337

335338
resp, err = conn.Do(SetSQLParserDebug(false)).Get()
336339
require.Nil(t, err)
340+
require.NotNil(t, resp)
337341
require.Equal(t, []interface{}{[]interface{}{SQLParserDebug, false}}, resp.Data)
338342

339343
resp, err = conn.Do(GetSQLParserDebug()).Get()
340344
require.Nil(t, err)
345+
require.NotNil(t, resp)
341346
require.Equal(t, []interface{}{[]interface{}{SQLParserDebug, false}}, resp.Data)
342347

343348
resp, err = conn.Do(SetSQLParserDebug(true)).Get()
344349
require.Nil(t, err)
350+
require.NotNil(t, resp)
345351
require.Equal(t, []interface{}{[]interface{}{SQLParserDebug, true}}, resp.Data)
346352

347353
resp, err = conn.Do(GetSQLParserDebug()).Get()
348354
require.Nil(t, err)
355+
require.NotNil(t, resp)
349356
require.Equal(t, []interface{}{[]interface{}{SQLParserDebug, true}}, resp.Data)
350357

351358
// To test real effect we need a Tarantool instance built with
@@ -364,10 +371,12 @@ func TestSQLRecursiveTriggers(t *testing.T) {
364371

365372
resp, err = conn.Do(SetSQLRecursiveTriggers(true)).Get()
366373
require.Nil(t, err)
374+
require.NotNil(t, resp)
367375
require.Equal(t, []interface{}{[]interface{}{SQLRecursiveTriggers, true}}, resp.Data)
368376

369377
resp, err = conn.Do(GetSQLRecursiveTriggers()).Get()
370378
require.Nil(t, err)
379+
require.NotNil(t, resp)
371380
require.Equal(t, []interface{}{[]interface{}{SQLRecursiveTriggers, true}}, resp.Data)
372381

373382
resp, err = conn.Execute("CREATE TABLE rec(id INTEGER PRIMARY KEY, a INT, b INT);", []interface{}{})
@@ -388,7 +397,7 @@ func TestSQLRecursiveTriggers(t *testing.T) {
388397
require.NotNil(t, resp)
389398
require.Equal(t, uint64(1), resp.SQLInfo.AffectedCount)
390399

391-
resp, err = conn.Execute("UPDATE rec SET a=a+1, b=b+1;", []interface{}{})
400+
_, err = conn.Execute("UPDATE rec SET a=a+1, b=b+1;", []interface{}{})
392401
require.NotNil(t, err)
393402
require.ErrorContains(t, err, "Failed to execute SQL statement: too many levels of trigger recursion")
394403

0 commit comments

Comments
 (0)