Move test data, improve multi-statement handling

migrate.go

@@ -57,24 +57,15 @@ func (r *Rove) Migrate(max int) error {
 			continue
 		}
 
-		arrQueries := strings.Split(cs.Changes(), ";")
-
 		tx, err := r.db.BeginTx()
 		if err != nil {
 			return fmt.Errorf("sql error begin transaction - %v", err.Error())
 		}
 
-		// Loop through each change.
-		for _, q := range arrQueries {
-			if len(q) == 0 {
-				continue
-			}
-
-			// Execute the query.
-			err = tx.Exec(q)
-			if err != nil {
-				return fmt.Errorf("sql error on changeset %v:%v - %v", cs.Author, cs.ID, err.Error())
-			}
+		// Execute the query.
+		err = tx.Exec(cs.Changes())
+		if err != nil {
+			return fmt.Errorf("sql error on changeset %v:%v - %v", cs.Author, cs.ID, err.Error())
 		}
 
 		err = tx.Commit()

pkg/adapter/jsonfile/jsonfile_test.go

@@ -22,7 +22,7 @@ func TestFileMigration(t *testing.T) {
 	assert.Nil(t, err)
 
 	// Set up rove.
-	r := rove.NewFileMigration(js, "testdata/success.sql")
+	r := rove.NewFileMigration(js, "../testdata/success.sql")
 	r.Verbose = true
 
 	// Run migration.
@@ -84,7 +84,7 @@ func TestMigrationFailDuplicate(t *testing.T) {
 	assert.Nil(t, err)
 
 	// Set up rove.
-	r := rove.NewFileMigration(js, "testdata/fail-duplicate.sql")
+	r := rove.NewFileMigration(js, "../testdata/fail-duplicate.sql")
 	r.Verbose = true
 
 	err = r.Migrate(0)
@@ -111,7 +111,7 @@ func TestInclude(t *testing.T) {
 	assert.Nil(t, err)
 
 	// Set up rove.
-	r := rove.NewFileMigration(js, "testdata/parent.sql")
+	r := rove.NewFileMigration(js, "../testdata/parent.sql")
 	r.Verbose = true
 
 	// Run migration.

rove_test.go → pkg/adapter/mysql/mysql_test.go

@@ -1,4 +1,4 @@
-package rove_test
+package mysql_test
 
 import (
 	"testing"
@@ -17,7 +17,7 @@ func TestFileMigration(t *testing.T) {
 	m.DB = db
 
 	// Set up rove.
-	r := rove.NewFileMigration(m, "testdata/success.sql")
+	r := rove.NewFileMigration(m, "../testdata/success.sql")
 	r.Verbose = true
 
 	// Run migration.
@@ -81,7 +81,7 @@ func TestMigrationFailDuplicate(t *testing.T) {
 	m.DB = db
 
 	// Set up rove.
-	r := rove.NewFileMigration(m, "testdata/fail-duplicate.sql")
+	r := rove.NewFileMigration(m, "../testdata/fail-duplicate.sql")
 	r.Verbose = true
 
 	err := r.Migrate(0)
@@ -104,7 +104,7 @@ func TestInclude(t *testing.T) {
 	m.DB = db
 
 	// Set up rove.
-	r := rove.NewFileMigration(m, "testdata/parent.sql")
+	r := rove.NewFileMigration(m, "../testdata/parent.sql")
 	r.Verbose = true
 
 	// Run migration.

pkg/adapter/mysql/testutil.go

@@ -28,7 +28,7 @@ func setEnv(unique string) {
 	os.Setenv(unique+"DB_USERNAME", "root")
 	os.Setenv(unique+"DB_PASSWORD", "")
 	os.Setenv(unique+"DB_DATABASE", TestDatabaseName+unique)
-	os.Setenv(unique+"DB_PARAMETER", "parseTime=true&allowNativePasswords=true")
+	os.Setenv(unique+"DB_PARAMETER", "parseTime=true&allowNativePasswords=true&multiStatements=true")
 }
 
 func unsetEnv(unique string) {

pkg/adapter/jsonfile/testdata/success.sql → pkg/adapter/testdata/success.sql

@@ -11,11 +11,23 @@ CREATE TABLE user_status (
 
     PRIMARY KEY (id)
 );
+CREATE TABLE license (
+    id TINYINT(1) UNSIGNED NOT NULL AUTO_INCREMENT,
+
+    status VARCHAR(25) NOT NULL,
+
+    created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
+
+    PRIMARY KEY (id)
+);
 --rollback DROP TABLE user_status;
+--rollback DROP TABLE license;
 
 --changeset josephspurrier:2
 INSERT INTO `user_status` (`id`, `status`, `created_at`, `updated_at`, `deleted`) VALUES
-(1, 'active',   CURRENT_TIMESTAMP,  CURRENT_TIMESTAMP,  0),
+(1, 'active;live',   CURRENT_TIMESTAMP,  CURRENT_TIMESTAMP,  0),
 (2, 'inactive', CURRENT_TIMESTAMP,  CURRENT_TIMESTAMP,  0);
 --rollback TRUNCATE TABLE user_status;
 

reset.go

@@ -3,7 +3,6 @@ package rove
 import (
 	"errors"
 	"fmt"
-	"strings"
 )
 
 // Reset will remove all migrations. If max is 0, all rollbacks are run.
@@ -38,24 +37,15 @@ func (r *Rove) Reset(max int) error {
 			return errors.New("changeset is missing: " + id)
 		}
 
-		arrQueries := strings.Split(cs.Rollbacks(), ";")
-
 		tx, err := r.db.BeginTx()
 		if err != nil {
 			return fmt.Errorf("sql error begin transaction - %v", err.Error())
 		}
 
-		// Loop through each rollback.
-		for _, q := range arrQueries {
-			if len(q) == 0 {
-				continue
-			}
-
-			// Execute the query.
-			err = tx.Exec(q)
-			if err != nil {
-				return fmt.Errorf("sql error on rollback %v:%v - %v", cs.Author, cs.ID, err.Error())
-			}
+		// Execute the query.
+		err = tx.Exec(cs.Rollbacks())
+		if err != nil {
+			return fmt.Errorf("sql error on rollback %v:%v - %v", cs.Author, cs.ID, err.Error())
 		}
 
 		err = tx.Commit()