technofab/dbmate
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/dbmate.git synced 2025-12-12 16:10:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Flatten package layout

Browse source
This commit is contained in:
Adrian Macneil 2015-12-01 09:43:35 -08:00
parent 275f5791f4
commit aa5757f8f9
13 changed files with 193 additions and 239 deletions
Download patch file Download diff file Expand all files Collapse all files

25
commands.go
View file

@ -3,10 +3,7 @@ package main
import (
"database/sql"
"fmt"
"github.com/adrianmacneil/dbmate/driver"
"github.com/adrianmacneil/dbmate/driver/shared"
"github.com/codegangsta/cli"
"io"
"io/ioutil"
"net/url"
"os"
@ -22,7 +19,7 @@ func UpCommand(ctx *cli.Context) error {
return err
}
drv, err := driver.Get(u.Scheme)
drv, err := GetDriver(u.Scheme)
if err != nil {
return err
}
@ -48,7 +45,7 @@ func CreateCommand(ctx *cli.Context) error {
return err
}
drv, err := driver.Get(u.Scheme)
drv, err := GetDriver(u.Scheme)
if err != nil {
return err
}
@ -63,7 +60,7 @@ func DropCommand(ctx *cli.Context) error {
return err
}
drv, err := driver.Get(u.Scheme)
drv, err := GetDriver(u.Scheme)
if err != nil {
return err
}
@ -73,12 +70,6 @@ func DropCommand(ctx *cli.Context) error {
const migrationTemplate = "-- migrate:up\n\n\n-- migrate:down\n\n"
func mustClose(c io.Closer) {
if err := c.Close(); err != nil {
panic(err)
}
}
// NewCommand creates a new migration file
func NewCommand(ctx *cli.Context) error {
// new migration name
@ -126,7 +117,7 @@ func GetDatabaseURL(ctx *cli.Context) (u *url.URL, err error) {
return url.Parse(value)
}
func doTransaction(db *sql.DB, txFunc func(shared.Transaction) error) error {
func doTransaction(db *sql.DB, txFunc func(Transaction) error) error {
tx, err := db.Begin()
if err != nil {
return err
@ -143,13 +134,13 @@ func doTransaction(db *sql.DB, txFunc func(shared.Transaction) error) error {
return tx.Commit()
}
func openDatabaseForMigration(ctx *cli.Context) (driver.Driver, *sql.DB, error) {
func openDatabaseForMigration(ctx *cli.Context) (Driver, *sql.DB, error) {
u, err := GetDatabaseURL(ctx)
if err != nil {
return nil, nil, err
}
drv, err := driver.Get(u.Scheme)
drv, err := GetDriver(u.Scheme)
if err != nil {
return nil, nil, err
}
@ -205,7 +196,7 @@ func MigrateCommand(ctx *cli.Context) error {
}
// begin transaction
err = doTransaction(db, func(tx shared.Transaction) error {
err = doTransaction(db, func(tx Transaction) error {
// run actual migration
if _, err := tx.Exec(migration["up"]); err != nil {
return err
@ -364,7 +355,7 @@ func RollbackCommand(ctx *cli.Context) error {
}
// begin transaction
err = doTransaction(db, func(tx shared.Transaction) error {
err = doTransaction(db, func(tx Transaction) error {
// rollback migration
if _, err := tx.Exec(migration["down"]); err != nil {
return err