Skip to content

Commit d715180

Browse files
committed
fixup! fixup! fixup! chore: bump Go version to 1.24 and golangci-lint
1 parent ad14596 commit d715180

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

postgresql/resource_postgresql_database_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ func checkTableOwnership(
389389
if err != nil {
390390
t.Fatalf("could not create connection pool: %v", err)
391391
}
392-
closeDB(t, db)
392+
defer closeDB(t, db)
393393

394394
var _rez int
395395

postgresql/utils_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func dbExecute(t *testing.T, dsn, query string, args ...any) {
8787
if err != nil {
8888
t.Fatalf("could to create connection pool: %v", err)
8989
}
90-
closeDB(t, db)
90+
defer closeDB(t, db)
9191

9292
// Create the test DB
9393
if _, err = db.Exec(query, args...); err != nil {
@@ -192,7 +192,7 @@ func createTestTables(t *testing.T, dbSuffix string, tables []string, owner stri
192192
if err != nil {
193193
t.Fatalf("could not open connection pool for db %s: %v", dbName, err)
194194
}
195-
closeDB(t, db)
195+
defer closeDB(t, db)
196196

197197
if owner != "" && !config.Superuser {
198198
if _, err := db.Exec(fmt.Sprintf("GRANT %s TO CURRENT_USER", owner)); err != nil {
@@ -223,7 +223,7 @@ func createTestSchemas(t *testing.T, dbSuffix string, schemas []string, owner st
223223
if err != nil {
224224
t.Fatalf("could not open connection pool for db %s: %v", dbName, err)
225225
}
226-
closeDB(t, db)
226+
defer closeDB(t, db)
227227

228228
if owner != "" {
229229
if !config.Superuser {
@@ -258,7 +258,7 @@ func createTestSchemas(t *testing.T, dbSuffix string, schemas []string, owner st
258258
if err != nil {
259259
t.Fatalf("could not open connection pool for db %s: %v", dbName, err)
260260
}
261-
closeDB(t, db)
261+
defer closeDB(t, db)
262262

263263
if owner != "" && !config.Superuser {
264264
if _, err := db.Exec(fmt.Sprintf("GRANT %s TO CURRENT_USER", owner)); err != nil {
@@ -288,7 +288,7 @@ func createTestSequences(t *testing.T, dbSuffix string, sequences []string, owne
288288
if err != nil {
289289
t.Fatalf("could not open connection pool for db %s: %v", dbName, err)
290290
}
291-
closeDB(t, db)
291+
defer closeDB(t, db)
292292

293293
if owner != "" {
294294
if !config.Superuser {
@@ -322,7 +322,7 @@ func createTestSequences(t *testing.T, dbSuffix string, sequences []string, owne
322322
if err != nil {
323323
t.Fatalf("could not open connection pool for db %s: %v", dbName, err)
324324
}
325-
closeDB(t, db)
325+
defer closeDB(t, db)
326326

327327
if owner != "" && !config.Superuser {
328328
if _, err := db.Exec(fmt.Sprintf("GRANT %s TO CURRENT_USER", owner)); err != nil {
@@ -377,7 +377,7 @@ func connectAsTestRole(t *testing.T, role, dbName string) *sql.DB {
377377

378378
func testCheckTablesPrivileges(t *testing.T, dbName, roleName string, tables []string, allowedPrivileges []string) error {
379379
db := connectAsTestRole(t, roleName, dbName)
380-
closeDB(t, db)
380+
defer closeDB(t, db)
381381

382382
for _, table := range tables {
383383
queries := map[string]string{
@@ -398,7 +398,7 @@ func testCheckTablesPrivileges(t *testing.T, dbName, roleName string, tables []s
398398

399399
func testCheckSchemasPrivileges(t *testing.T, dbName, roleName string, schemas []string, allowedPrivileges []string) error {
400400
db := connectAsTestRole(t, roleName, dbName)
401-
closeDB(t, db)
401+
defer closeDB(t, db)
402402

403403
for _, schema := range schemas {
404404
queries := map[string]string{
@@ -417,7 +417,7 @@ func testCheckSchemasPrivileges(t *testing.T, dbName, roleName string, schemas [
417417

418418
func testCheckColumnPrivileges(t *testing.T, dbName, roleName string, tables []string, allowedPrivileges []string, columns []string) error {
419419
db := connectAsTestRole(t, roleName, dbName)
420-
closeDB(t, db)
420+
defer closeDB(t, db)
421421

422422
columnValues := []string{}
423423
for _, col := range columns {

0 commit comments

Comments
 (0)