Move mysql to adapter folder

cmd/rove/main.go

@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/josephspurrier/rove"
-	"github.com/josephspurrier/rove/pkg/database"
+	"github.com/josephspurrier/rove/pkg/adapter/mysql"
 
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )
@@ -35,38 +35,39 @@ func main() {
 	argList := os.Args[1:]
 	arg := kingpin.MustParse(app.Parse(argList))
 
-	// Create a new MySQL database object.
-	conn, err := database.NewConnection(*cDBPrefix)
+	// Create a new MySQL connection.
+	conn, err := mysql.NewConnection(*cDBPrefix)
 	if err != nil {
 		fmt.Println(err)
 		os.Exit(1)
 	}
 
-	m, err := database.NewMySQL(conn)
+	// Create a new MySQL database object.
+	db, err := mysql.New(conn)
 	if err != nil {
 		fmt.Println(err)
 		os.Exit(1)
 	}
 
 	switch arg {
 	case cDBAll.FullCommand():
-		r := rove.NewFileMigration(m, *cDBAllFile)
+		r := rove.NewFileMigration(db, *cDBAllFile)
 		r.Verbose = true
 		err = r.Migrate(0)
 	case cDBUp.FullCommand():
-		r := rove.NewFileMigration(m, *cDBUpFile)
+		r := rove.NewFileMigration(db, *cDBUpFile)
 		r.Verbose = true
 		err = r.Migrate(*cDBUpCount)
 	case cDBReset.FullCommand():
-		r := rove.NewFileMigration(m, *cDBResetFile)
+		r := rove.NewFileMigration(db, *cDBResetFile)
 		r.Verbose = true
 		err = r.Reset(0)
 	case cDBDown.FullCommand():
-		r := rove.NewFileMigration(m, *cDBDownFile)
+		r := rove.NewFileMigration(db, *cDBDownFile)
 		r.Verbose = true
 		err = r.Reset(*cDBDownCount)
 	case cDBStatus.FullCommand():
-		r := rove.NewFileMigration(m, *cDBDownFile)
+		r := rove.NewFileMigration(db, *cDBDownFile)
 		r.Verbose = true
 		_, err = r.Status()
 	}

cmd/rove/main_test.go

@@ -5,19 +5,19 @@ import (
 	"os"
 	"testing"
 
-	"github.com/josephspurrier/rove/pkg/testutil"
+	"github.com/josephspurrier/rove/pkg/adapter/mysql"
 
 	"github.com/jmoiron/sqlx"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestMigrationAll(t *testing.T) {
 	_, unique := migrateAll(t)
-	testutil.TeardownDatabase(unique)
+	mysql.TeardownDatabase(unique)
 }
 
 func migrateAll(t *testing.T) (*sqlx.DB, string) {
-	db, unique := testutil.SetupDatabase()
+	db, unique := mysql.SetupDatabase()
 
 	// Set the arguments.
 	os.Args = []string{
@@ -87,16 +87,16 @@ func TestMigrationReset(t *testing.T) {
 	assert.Nil(t, err)
 	assert.Equal(t, 0, rows)
 
-	testutil.TeardownDatabase(unique)
+	mysql.TeardownDatabase(unique)
 }
 
 func TestMigrationUp(t *testing.T) {
 	_, unique := migrateUp(t)
-	testutil.TeardownDatabase(unique)
+	mysql.TeardownDatabase(unique)
 }
 
 func migrateUp(t *testing.T) (*sqlx.DB, string) {
-	db, unique := testutil.SetupDatabase()
+	db, unique := mysql.SetupDatabase()
 
 	// Set the arguments.
 	os.Args = []string{
@@ -168,5 +168,5 @@ func TestMigrationDown(t *testing.T) {
 	assert.Nil(t, err)
 	assert.Equal(t, 1, rows)
 
-	testutil.TeardownDatabase(unique)
+	mysql.TeardownDatabase(unique)
 }

example_test.go

@@ -4,7 +4,7 @@ import (
 	"log"
 
 	"github.com/josephspurrier/rove"
-	"github.com/josephspurrier/rove/pkg/database"
+	"github.com/josephspurrier/rove/pkg/adapter/mysql"
 )
 
 func Example() {
@@ -31,7 +31,7 @@ INSERT INTO user_status (id, status, created_at, updated_at, deleted) VALUES
 --rollback TRUNCATE TABLE user_status;`
 
 	// Create a new MySQL database object.
-	db, err := database.NewMySQL(&database.Connection{
+	db, err := mysql.New(&mysql.Connection{
 		Hostname:  "127.0.0.1",
 		Username:  "root",
 		Password:  "password",

pkg/database/connection.go → pkg/adapter/mysql/connection.go

@@ -1,4 +1,4 @@
-package database
+package mysql
 
 import (
 	"fmt"

pkg/database/database_test.go → pkg/adapter/mysql/database_test.go

@@ -1,4 +1,4 @@
-package database
+package mysql
 
 import (
 	"testing"

pkg/database/mysql.go → pkg/adapter/mysql/mysql.go

@@ -1,5 +1,5 @@
-// Package database is a MySQL changelog adapter.
-package database
+// Package mysql is a MySQL changelog adapter.
+package mysql
 
 import (
 	"database/sql"
@@ -37,9 +37,9 @@ type MySQL struct {
 	tablename string
 }
 
-// NewMySQL connects to the database and returns an object that satisfies the
+// New connects to the database and returns an object that satisfies the
 // rove.Migration interface.
-func NewMySQL(c *Connection) (m *MySQL, err error) {
+func New(c *Connection) (m *MySQL, err error) {
 	// Connect to the database.
 	m = new(MySQL)
 	m.DB, err = c.Connect(true)

pkg/testutil/database.go → pkg/adapter/mysql/testutil.go

@@ -1,4 +1,4 @@
-package testutil
+package mysql
 
 import (
 	"fmt"
@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"github.com/josephspurrier/rove"
-	"github.com/josephspurrier/rove/pkg/database"
 	"github.com/josephspurrier/rove/pkg/env"
 
 	"github.com/jmoiron/sqlx"
@@ -43,7 +42,7 @@ func unsetEnv(unique string) {
 
 // connectDatabase returns a test database connection.
 func connectDatabase(dbSpecificDB bool, unique string) *sqlx.DB {
-	dbc := new(database.Connection)
+	dbc := new(Connection)
 	err := env.Unmarshal(dbc, unique)
 	if err != nil {
 		fmt.Println("DB ENV Error:", err)
@@ -98,11 +97,11 @@ func LoadDatabaseFromFile(file string, usePrefix bool) (*sqlx.DB, string) {
 	if usePrefix {
 		db, unique = SetupDatabase()
 		// Create a new MySQL database object.
-		m := new(database.MySQL)
+		m := new(MySQL)
 		m.DB = db
 		r = rove.NewFileMigration(m, file)
 	} else {
-		m := new(database.MySQL)
+		m := new(MySQL)
 		m.DB = db
 		r = rove.NewFileMigration(m, file)
 		setEnv(unique)

pkg/database/transaction.go → pkg/adapter/mysql/transaction.go

@@ -1,4 +1,4 @@
-package database
+package mysql
 
 import "database/sql"
 

rove_test.go

@@ -4,17 +4,16 @@ import (
 	"testing"
 
 	"github.com/josephspurrier/rove"
-	"github.com/josephspurrier/rove/pkg/database"
-	"github.com/josephspurrier/rove/pkg/testutil"
+	"github.com/josephspurrier/rove/pkg/adapter/mysql"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func TestFileMigration(t *testing.T) {
-	db, unique := testutil.SetupDatabase()
+	db, unique := mysql.SetupDatabase()
 
 	// Create a new MySQL database object.
-	m := new(database.MySQL)
+	m := new(mysql.MySQL)
 	m.DB = db
 
 	// Set up rove.
@@ -71,14 +70,14 @@ func TestFileMigration(t *testing.T) {
 	assert.Nil(t, err)
 	assert.Equal(t, "josephspurrier:1", s)
 
-	testutil.TeardownDatabase(unique)
+	mysql.TeardownDatabase(unique)
 }
 
 func TestMigrationFailDuplicate(t *testing.T) {
-	db, unique := testutil.SetupDatabase()
+	db, unique := mysql.SetupDatabase()
 
 	// Create a new MySQL database object.
-	m := new(database.MySQL)
+	m := new(mysql.MySQL)
 	m.DB = db
 
 	// Set up rove.
@@ -94,14 +93,14 @@ func TestMigrationFailDuplicate(t *testing.T) {
 	assert.Nil(t, err)
 	assert.Equal(t, 2, rows)
 
-	testutil.TeardownDatabase(unique)
+	mysql.TeardownDatabase(unique)
 }
 
 func TestInclude(t *testing.T) {
-	db, unique := testutil.SetupDatabase()
+	db, unique := mysql.SetupDatabase()
 
 	// Create a new MySQL database object.
-	m := new(database.MySQL)
+	m := new(mysql.MySQL)
 	m.DB = db
 
 	// Set up rove.
@@ -153,14 +152,14 @@ func TestInclude(t *testing.T) {
 	assert.Nil(t, err)
 	assert.Equal(t, 1, rows)
 
-	testutil.TeardownDatabase(unique)
+	mysql.TeardownDatabase(unique)
 }
 
 func TestChangesetMigration(t *testing.T) {
-	db, unique := testutil.SetupDatabase()
+	db, unique := mysql.SetupDatabase()
 
 	// Create a new MySQL database object.
-	m := new(database.MySQL)
+	m := new(mysql.MySQL)
 	m.DB = db
 
 	// Set up rove.
@@ -212,7 +211,7 @@ func TestChangesetMigration(t *testing.T) {
 	assert.Nil(t, err)
 	assert.Equal(t, 1, rows)
 
-	testutil.TeardownDatabase(unique)
+	mysql.TeardownDatabase(unique)
 }
 
 var sSuccess = `