Skip to content

Commit 44083d2

Browse files
Juneezeekyleconroy
Juneezee
and
kyleconroy
authored
refactor: move from io/ioutil to io and os package (#1164)
The io/ioutil package has been deprecated as of Go 1.16, see https://golang.org/doc/go1.16#ioutil. This commit replaces the existing io/ioutil functions with their new definitions in io and os packages. Signed-off-by: Eng Zer Jun <engzerjun@gmail.com> Co-authored-by: Kyle Conroy <kyle@conroy.org>
1 parent ebd3b59 commit 44083d2

File tree

11 files changed

+20
-29
lines changed

11 files changed

+20
-29
lines changed

‎internal/cmd/cmd.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package cmd
33
import (
44
"fmt"
55
"io"
6-
"io/ioutil"
76
"os"
87
"os/exec"
98
"path/filepath"
@@ -75,7 +74,7 @@ var initCmd = &cobra.Command{
7574
if err != nil {
7675
return err
7776
}
78-
return ioutil.WriteFile(file, blob, 0644)
77+
return os.WriteFile(file, blob, 0644)
7978
},
8079
}
8180

@@ -123,7 +122,7 @@ var genCmd = &cobra.Command{
123122
}
124123
for filename, source := range output {
125124
os.MkdirAll(filepath.Dir(filename), 0755)
126-
if err := ioutil.WriteFile(filename, []byte(source), 0644); err != nil {
125+
if err := os.WriteFile(filename, []byte(source), 0644); err != nil {
127126
fmt.Fprintf(stderr, "%s: %s\n", filename, err)
128127
os.Exit(1)
129128
}

‎internal/cmd/generate.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"errors"
66
"fmt"
77
"io"
8-
"io/ioutil"
98
"os"
109
"path/filepath"
1110
"strings"
@@ -78,7 +77,7 @@ func Generate(e Env, dir, filename string, stderr io.Writer) (map[string]string,
7877
}
7978

8079
base := filepath.Base(configPath)
81-
blob, err := ioutil.ReadFile(configPath)
80+
blob, err := os.ReadFile(configPath)
8281
if err != nil {
8382
fmt.Fprintf(stderr, "error parsing %s: file does not exist\n", base)
8483
return nil, err

‎internal/compiler/compile.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"errors"
55
"fmt"
66
"io"
7-
"io/ioutil"
7+
"os"
88
"path/filepath"
99
"regexp"
1010
"strings"
@@ -60,7 +60,7 @@ func (c *Compiler) parseCatalog(schemas []string) error {
6060
}
6161
merr := multierr.New()
6262
for _, filename := range files {
63-
blob, err := ioutil.ReadFile(filename)
63+
blob, err := os.ReadFile(filename)
6464
if err != nil {
6565
merr.Add(filename, "", 0, err)
6666
continue
@@ -93,7 +93,7 @@ func (c *Compiler) parseQueries(o opts.Parser) (*Result, error) {
9393
return nil, err
9494
}
9595
for _, filename := range files {
96-
blob, err := ioutil.ReadFile(filename)
96+
blob, err := os.ReadFile(filename)
9797
if err != nil {
9898
merr.Add(filename, "", 0, err)
9999
continue

‎internal/endtoend/endtoend_test.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package main
22

33
import (
44
"bytes"
5-
"io/ioutil"
65
"os"
76
"path/filepath"
87
"strings"
@@ -21,7 +20,7 @@ func TestExamples(t *testing.T) {
2120
t.Fatal(err)
2221
}
2322

24-
files, err := ioutil.ReadDir(examples)
23+
files, err := os.ReadDir(examples)
2524
if err != nil {
2625
t.Fatal(err)
2726
}
@@ -49,7 +48,7 @@ func BenchmarkExamples(b *testing.B) {
4948
if err != nil {
5049
b.Fatal(err)
5150
}
52-
files, err := ioutil.ReadDir(examples)
51+
files, err := os.ReadDir(examples)
5352
if err != nil {
5453
b.Fatal(err)
5554
}
@@ -125,7 +124,7 @@ func cmpDirectory(t *testing.T, dir string, actual map[string]string) {
125124
strings.HasSuffix(path, "__init__.py") || strings.Contains(path, "/python/src/dbtest/") {
126125
return nil
127126
}
128-
blob, err := ioutil.ReadFile(path)
127+
blob, err := os.ReadFile(path)
129128
if err != nil {
130129
return err
131130
}
@@ -158,7 +157,7 @@ func expectedStderr(t *testing.T, dir string) string {
158157
t.Helper()
159158
path := filepath.Join(dir, "stderr.txt")
160159
if _, err := os.Stat(path); !os.IsNotExist(err) {
161-
blob, err := ioutil.ReadFile(path)
160+
blob, err := os.ReadFile(path)
162161
if err != nil {
163162
t.Fatal(err)
164163
}

‎internal/engine/dolphin/parse.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package dolphin
33
import (
44
"errors"
55
"io"
6-
"io/ioutil"
76
"regexp"
87
"strconv"
98
"strings"
@@ -50,7 +49,7 @@ func normalizeErr(err error) error {
5049
}
5150

5251
func (p *Parser) Parse(r io.Reader) ([]ast.Statement, error) {
53-
blob, err := ioutil.ReadAll(r)
52+
blob, err := io.ReadAll(r)
5453
if err != nil {
5554
return nil, err
5655
}

‎internal/engine/postgresql/parse.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package postgresql
@@ -6,7 +7,6 @@ import (
67
"errors"
78
"fmt"
89
"io"
9-
"io/ioutil"
1010
"strings"
1111

1212
nodes "github.com/pganalyze/pg_query_go/v2"
@@ -152,7 +152,7 @@ type Parser struct {
152152
var errSkip = errors.New("skip stmt")
153153

154154
func (p *Parser) Parse(r io.Reader) ([]ast.Statement, error) {
155-
contents, err := ioutil.ReadAll(r)
155+
contents, err := io.ReadAll(r)
156156
if err != nil {
157157
return nil, err
158158
}

‎internal/engine/sqlite/parse.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"errors"
55
"fmt"
66
"io"
7-
"io/ioutil"
87

98
"github.com/antlr/antlr4/runtime/Go/antlr"
109

@@ -40,7 +39,7 @@ type Parser struct {
4039
}
4140

4241
func (p *Parser) Parse(r io.Reader) ([]ast.Statement, error) {
43-
blob, err := ioutil.ReadAll(r)
42+
blob, err := io.ReadAll(r)
4443
if err != nil {
4544
return nil, err
4645
}

‎internal/sql/sqlpath/read.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package sqlpath
22

33
import (
44
"fmt"
5-
"io/ioutil"
65
"os"
76
"path/filepath"
87
"strings"
@@ -20,7 +19,7 @@ func Glob(paths []string) ([]string, error) {
2019
return nil, fmt.Errorf("path %s does not exist", path)
2120
}
2221
if f.IsDir() {
23-
listing, err := ioutil.ReadDir(path)
22+
listing, err := os.ReadDir(path)
2423
if err != nil {
2524
return nil, err
2625
}

‎internal/sqltest/mysql.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package sqltest
33
import (
44
"database/sql"
55
"fmt"
6-
"io/ioutil"
76
"os"
87
"path/filepath"
98
"testing"
@@ -67,7 +66,7 @@ func MySQL(t *testing.T, migrations []string) (*sql.DB, func()) {
6766
t.Fatal(err)
6867
}
6968
for _, f := range files {
70-
blob, err := ioutil.ReadFile(f)
69+
blob, err := os.ReadFile(f)
7170
if err != nil {
7271
t.Fatal(err)
7372
}

‎internal/sqltest/postgres.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package sqltest
33
import (
44
"database/sql"
55
"fmt"
6-
"io/ioutil"
76
"math/rand"
87
"os"
98
"path/filepath"
@@ -82,7 +81,7 @@ func PostgreSQL(t *testing.T, migrations []string) (*sql.DB, func()) {
8281
t.Fatal(err)
8382
}
8483
for _, f := range files {
85-
blob, err := ioutil.ReadFile(f)
84+
blob, err := os.ReadFile(f)
8685
if err != nil {
8786
t.Fatal(err)
8887
}

‎internal/tools/sqlc-pg-gen/main.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"context"
66
"fmt"
77
"go/format"
8-
"io/ioutil"
98
"log"
109
"os"
1110
"path/filepath"
@@ -251,7 +250,7 @@ func run(ctx context.Context) error {
251250
if err != nil {
252251
return err
253252
}
254-
err = ioutil.WriteFile(filepath.Join("internal", "engine", "postgresql", "pg_catalog.go"), code, 0644)
253+
err = os.WriteFile(filepath.Join("internal", "engine", "postgresql", "pg_catalog.go"), code, 0644)
255254
if err != nil {
256255
return err
257256
}
@@ -292,7 +291,7 @@ func run(ctx context.Context) error {
292291
if err != nil {
293292
return err
294293
}
295-
err = ioutil.WriteFile(filepath.Join("internal", "engine", "postgresql", "contrib", name+".go"), code, 0644)
294+
err = os.WriteFile(filepath.Join("internal", "engine", "postgresql", "contrib", name+".go"), code, 0644)
296295
if err != nil {
297296
return err
298297
}
@@ -313,7 +312,7 @@ func run(ctx context.Context) error {
313312
if err != nil {
314313
return err
315314
}
316-
err = ioutil.WriteFile(filepath.Join("internal", "engine", "postgresql", "extension.go"), code, 0644)
315+
err = os.WriteFile(filepath.Join("internal", "engine", "postgresql", "extension.go"), code, 0644)
317316
if err != nil {
318317
return err
319318
}

0 commit comments

Comments
 (0)