Skip to content

Verbose mod for up and down commands #182

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.

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 10 additions & 1 deletion migrate.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"log"
"net/http"
"os"
"path"
Expand Down Expand Up @@ -37,9 +39,16 @@ type MigrationSet struct {
//
// This should be used sparingly as it is removing a safety check.
IgnoreUnknown bool
Log *log.Logger
}

var migSet = MigrationSet{}
var migSet = MigrationSet{
Log: log.New(ioutil.Discard, "SQL: ", log.Llongfile),
}

func SetLogger(log *log.Logger) {
migSet.Log = log
}

// NewMigrationSet returns a parametrized Migration object
func (ms MigrationSet) getTableName() string {
Expand Down
7 changes: 6 additions & 1 deletion sql-migrate/command_common.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ package main

import (
"fmt"
"log"
"os"

"github.com/rubenv/sql-migrate"
)

func ApplyMigrations(dir migrate.MigrationDirection, dryrun bool, limit int) error {
func ApplyMigrations(dir migrate.MigrationDirection, dryrun bool, limit int, verbose bool) error {
env, err := GetEnvironment()
if err != nil {
return fmt.Errorf("Could not parse config: %s", err)
Expand All @@ -21,6 +23,9 @@ func ApplyMigrations(dir migrate.MigrationDirection, dryrun bool, limit int) err
Dir: env.Dir,
}

if verbose {
migrate.SetLogger(log.New(os.Stdout, "SQL: ", log.Llongfile))
}
if dryrun {
migrations, _, err := migrate.PlanMigration(db, dialect, source, dir, limit)
if err != nil {
Expand Down
4 changes: 3 additions & 1 deletion sql-migrate/command_down.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,20 @@ func (c *DownCommand) Synopsis() string {
func (c *DownCommand) Run(args []string) int {
var limit int
var dryrun bool
var verbose bool

cmdFlags := flag.NewFlagSet("down", flag.ContinueOnError)
cmdFlags.Usage = func() { ui.Output(c.Help()) }
cmdFlags.IntVar(&limit, "limit", 1, "Max number of migrations to apply.")
cmdFlags.BoolVar(&dryrun, "dryrun", false, "Don't apply migrations, just print them.")
cmdFlags.BoolVar(&verbose, "verbose", false, "Show queries at console")
ConfigFlags(cmdFlags)

if err := cmdFlags.Parse(args); err != nil {
return 1
}

err := ApplyMigrations(migrate.Down, dryrun, limit)
err := ApplyMigrations(migrate.Down, dryrun, limit, verbose)
if err != nil {
ui.Error(err.Error())
return 1
Expand Down
4 changes: 3 additions & 1 deletion sql-migrate/command_up.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,20 @@ func (c *UpCommand) Synopsis() string {
func (c *UpCommand) Run(args []string) int {
var limit int
var dryrun bool
var verbose bool

cmdFlags := flag.NewFlagSet("up", flag.ContinueOnError)
cmdFlags.Usage = func() { ui.Output(c.Help()) }
cmdFlags.IntVar(&limit, "limit", 0, "Max number of migrations to apply.")
cmdFlags.BoolVar(&dryrun, "dryrun", false, "Don't apply migrations, just print them.")
cmdFlags.BoolVar(&verbose, "verbose", false, "Show queries at console")
ConfigFlags(cmdFlags)

if err := cmdFlags.Parse(args); err != nil {
return 1
}

err := ApplyMigrations(migrate.Up, dryrun, limit)
err := ApplyMigrations(migrate.Up, dryrun, limit, verbose)
if err != nil {
ui.Error(err.Error())
return 1
Expand Down