Skip to content

Commit

Permalink
fix unclosed rows
Browse files Browse the repository at this point in the history
  • Loading branch information
wangzuo committed Aug 28, 2023
1 parent 0a1ab38 commit dd8e424
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 4 deletions.
7 changes: 7 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,10 @@ test-sqlite: install
cd internal/integration && go test ./...

test: test-postgresql test-sqlite test-mysql

test-migrate: install
rm -rf internal/migrate/db internal/migrate/test.sqlite3
cd internal/migrate && queryx db:migrate --schema sqlite1.hcl
sleep 1
cd internal/migrate && queryx db:migrate --schema sqlite2.hcl
cd internal/migrate && sqlite3 test.sqlite3 "insert into users(name, email) values('test', 'test@example.com')"
4 changes: 4 additions & 0 deletions adapter/migrator.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ func (m *Migrator) exists(ctx context.Context, version string) (bool, error) {
if !rows.Next() {
exists = false
}
if err := rows.Close(); err != nil {
return false, fmt.Errorf("closing rows %w", err)
}

return exists, nil
}

Expand Down
6 changes: 2 additions & 4 deletions cmd/queryx/action/db.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ func newAdapter() (adapter.Adapter, error) {
return adapter.NewAdapter(sch.Databases[0].LoadConfig(environment))
}

// TODO: should check unapplied migrations
func findSchemaChanges(a string, db adapter.Adapter, database *schema.Database) ([]*migrate.Change, error) {
ctx := context.Background()

Expand Down Expand Up @@ -141,17 +140,15 @@ var dbMigrateCmd = &cobra.Command{
if err := a.Open(); err != nil {
return err
}
defer a.Close()
// defer a.Close()

migrator, err := adapter.NewMigrator(a)
if err != nil {
return err
}

if err := migrator.Up(); err != nil {
return err
}

if err := dbMigrateGenerate(); err != nil {
return err
}
Expand Down Expand Up @@ -187,6 +184,7 @@ func dbMigrateGenerate() error {
if err := adapter.Open(); err != nil {
return err
}
// defer adapter.Close()

database := sch.Databases[0]
changes, err := findSchemaChanges(sch.Databases[0].Adapter, adapter, database)
Expand Down
2 changes: 2 additions & 0 deletions internal/migrate/sqlite1.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ database "db" {
}

model "User" {
timestamps = false

column "name" {
type = string
}
Expand Down
2 changes: 2 additions & 0 deletions internal/migrate/sqlite2.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ database "db" {
}

model "User" {
timestamps = false

column "name" {
type = string
}
Expand Down

0 comments on commit dd8e424

Please sign in to comment.