Skip to content

Commit

Permalink
Merge pull request #561 from NBISweden/dependabot/go_modules/backend/…
Browse files Browse the repository at this point in the history
…github.com/mattn/go-sqlite3-1.14.15

Bump github.com/mattn/go-sqlite3 from 1.14.14 to 1.14.15 in /backend
  • Loading branch information
jonandernovella authored Aug 17, 2022
2 parents ef6a369 + 3fcb049 commit 9a4c204
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
4 changes: 2 additions & 2 deletions backend/api/handlers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package api_test

import (
"encoding/json"
"io/ioutil"
"io"
"net/http"
"net/http/httptest"
"os"
Expand Down Expand Up @@ -158,7 +158,7 @@ func Test_Handlers(t *testing.T) {
_, err = w.Write(userResponse)
case "/time_entries.json":
if r.Method == "POST" {
bodyBytes, err := ioutil.ReadAll(r.Body)
bodyBytes, err := io.ReadAll(r.Body)
if err != nil {
w.WriteHeader(fiber.StatusUnprocessableEntity)
}
Expand Down
2 changes: 1 addition & 1 deletion backend/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.17
require (
github.com/gofiber/fiber/v2 v2.36.0
github.com/gofiber/storage/sqlite3 v0.0.0-20220331080057-83339bc1564f
github.com/mattn/go-sqlite3 v1.14.14
github.com/mattn/go-sqlite3 v1.14.15
github.com/sirupsen/logrus v1.9.0
github.com/swaggo/fiber-swagger v1.3.0
github.com/swaggo/swag v1.8.4
Expand Down
4 changes: 2 additions & 2 deletions backend/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJ
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/mattn/go-sqlite3 v1.14.12/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/mattn/go-sqlite3 v1.14.14 h1:qZgc/Rwetq+MtyE18WhzjokPD93dNqLGNT3QJuLvBGw=
github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI=
github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/otiai10/copy v1.7.0/go.mod h1:rmRl6QPdJj6EiUqXQ/4Nn2lLXoNQjFCQbbNrxgc/t3U=
Expand Down
5 changes: 2 additions & 3 deletions backend/internal/database/database.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ package database
import (
"database/sql"
"fmt"
"io/ioutil"
"os"

// go-sqlite3 is the module for the SQLite3 database driver.
Expand Down Expand Up @@ -63,11 +62,11 @@ func New(databasePath string) (*Database, error) {
}

for i := range files {
query, err := ioutil.ReadFile(files[i])
query, err := os.ReadFile(files[i])
if err != nil {
_ = tx.Rollback()
return nil,
fmt.Errorf("ioutil.ReadFile() failed: %w", err)
fmt.Errorf("os.ReadFile() failed: %w", err)
}
if _, err := tx.Exec(string(query)); err != nil {
_ = tx.Rollback()
Expand Down

0 comments on commit 9a4c204

Please sign in to comment.