Skip to content

Close the file when finished parsing them #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rubenv merged 1 commit into from
Dec 13, 2019
Merged

Close the file when finished parsing them #160

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions migrate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package migrate

import (
"bytes"
"os"
"database/sql"
"errors"
"fmt"
Expand Down Expand Up @@ -228,14 +229,9 @@ func findMigrations(dir http.FileSystem) ([]*Migration, error) {

for _, info := range files {
if strings.HasSuffix(info.Name(), ".sql") {
file, err := dir.Open(info.Name())
migration, err := migrationFromFile(dir, info)
if err != nil {
return nil, fmt.Errorf("Error while opening %s: %s", info.Name(), err)
}

migration, err := ParseMigration(info.Name(), file)
if err != nil {
return nil, fmt.Errorf("Error while parsing %s: %s", info.Name(), err)
return nil, err
}

migrations = append(migrations, migration)
Expand All @@ -248,6 +244,20 @@ func findMigrations(dir http.FileSystem) ([]*Migration, error) {
return migrations, nil
}

func migrationFromFile(dir http.FileSystem, info os.FileInfo) (*Migration, error) {
file, err := dir.Open(info.Name())
if err != nil {
return nil, fmt.Errorf("Error while opening %s: %s", info.Name(), err)
}
defer func () { _ = file.Close() }()

migration, err := ParseMigration(info.Name(), file)
if err != nil {
return nil, fmt.Errorf("Error while parsing %s: %s", info.Name(), err)
}
return migration, nil
}

// Migrations from a bindata asset set.
type AssetMigrationSource struct {
// Asset should return content of file in path if exists
Expand Down