technofab/dbmate
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/dbmate.git synced 2026-02-02 09:25:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: move from io/ioutil to io and os package (#236)

Browse source 
The `io/ioutil` package has been deprecated in Go 1.16. 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>
This commit is contained in:
Eng Zer Jun 2021-08-27 12:13:37 +08:00 • committed by GitHub
parent 6243c2b9a9
commit fb17e8eeca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pkg/dbmate/db.go
View file

@ -5,7 +5,6 @@ import (
"errors" "errors"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"net/url" "net/url"
"os" "os"
"path/filepath" "path/filepath"
@ -226,7 +225,7 @@ func (db *DB) dumpSchema(drv Driver) error {
} }
// write schema to file // write schema to file
return ioutil.WriteFile(db.SchemaFile, schema, 0644) return os.WriteFile(db.SchemaFile, schema, 0644)
} }
// ensureDir creates a directory if it does not already exist // ensureDir creates a directory if it does not already exist
@ -402,7 +401,7 @@ func (db *DB) printVerbose(result sql.Result) {
} }
func findMigrationFiles(dir string, re *regexp.Regexp) ([]string, error) { func findMigrationFiles(dir string, re *regexp.Regexp) ([]string, error) {
files, err := ioutil.ReadDir(dir) files, err := os.ReadDir(dir)
if err != nil { if err != nil {
return nil, fmt.Errorf("could not find migrations directory `%s`", dir) return nil, fmt.Errorf("could not find migrations directory `%s`", dir)
} }

11
pkg/dbmate/db_test.go
View file

@ -1,7 +1,6 @@
package dbmate_test package dbmate_test
import ( import (
"io/ioutil"
"net/url" "net/url"
"os" "os"
"path/filepath" "path/filepath"
@ -102,7 +101,7 @@ func TestDumpSchema(t *testing.T) {
db := newTestDB(t, u) db := newTestDB(t, u)
// create custom schema file directory // create custom schema file directory
dir, err := ioutil.TempDir("", "dbmate") dir, err := os.MkdirTemp("", "dbmate")
require.NoError(t, err) require.NoError(t, err)
defer func() { defer func() {
err := os.RemoveAll(dir) err := os.RemoveAll(dir)
@ -129,7 +128,7 @@ func TestDumpSchema(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
// verify schema // verify schema
schema, err := ioutil.ReadFile(db.SchemaFile) schema, err := os.ReadFile(db.SchemaFile)
require.NoError(t, err) require.NoError(t, err)
require.Contains(t, string(schema), "-- PostgreSQL database dump") require.Contains(t, string(schema), "-- PostgreSQL database dump")
} }
@ -140,7 +139,7 @@ func TestAutoDumpSchema(t *testing.T) {
db.AutoDumpSchema = true db.AutoDumpSchema = true
// create custom schema file directory // create custom schema file directory
dir, err := ioutil.TempDir("", "dbmate") dir, err := os.MkdirTemp("", "dbmate")
require.NoError(t, err) require.NoError(t, err)
defer func() { defer func() {
err := os.RemoveAll(dir) err := os.RemoveAll(dir)
@ -163,7 +162,7 @@ func TestAutoDumpSchema(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
// verify schema // verify schema
schema, err := ioutil.ReadFile(db.SchemaFile) schema, err := os.ReadFile(db.SchemaFile)
require.NoError(t, err) require.NoError(t, err)
require.Contains(t, string(schema), "-- PostgreSQL database dump") require.Contains(t, string(schema), "-- PostgreSQL database dump")
@ -176,7 +175,7 @@ func TestAutoDumpSchema(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
// schema should be recreated // schema should be recreated
schema, err = ioutil.ReadFile(db.SchemaFile) schema, err = os.ReadFile(db.SchemaFile)
require.NoError(t, err) require.NoError(t, err)
require.Contains(t, string(schema), "-- PostgreSQL database dump") require.Contains(t, string(schema), "-- PostgreSQL database dump")
} }

4
pkg/dbmate/migration.go
View file

@ -2,7 +2,7 @@ package dbmate
import ( import (
"fmt" "fmt"
"io/ioutil" "os"
"regexp" "regexp"
"strings" "strings"
) )
@ -33,7 +33,7 @@ func NewMigration() Migration {
// parseMigration reads a migration file and returns (up Migration, down Migration, error) // parseMigration reads a migration file and returns (up Migration, down Migration, error)
func parseMigration(path string) (Migration, Migration, error) { func parseMigration(path string) (Migration, Migration, error) {
data, err := ioutil.ReadFile(path) data, err := os.ReadFile(path)
if err != nil { if err != nil {
return NewMigration(), NewMigration(), err return NewMigration(), NewMigration(), err
} }