Relaxed constratint that method receiver has to be of Driver interface.

dimag-jfrog · dimag-jfrog · commit 70b23c3f8496 · 2017-01-07T16:30:40.000+02:00
diff --git a/driver/gomethods/gomethods_migrator.go b/driver/gomethods/gomethods_migrator.go
@@ -8,7 +8,6 @@ import (
 	"os"
 	"path"
 	"bufio"
-	"github.com/dimag-jfrog/migrate/driver"
 	"github.com/dimag-jfrog/migrate/file"
 )
 
@@ -31,7 +30,7 @@ func (e *MethodInvocationFailedError) Error() string {
 
 
 type Migrator struct {
-	Driver driver.Driver
+	MigrationMethodsReceiver interface{}
 	RollbackOnFailure bool
 }
 
@@ -73,12 +72,12 @@ func (m *Migrator) Migrate(f file.File, pipe chan interface{}) error {
 }
 
 func (m *Migrator) IsValid(methodName string) bool {
-	return reflect.ValueOf(m.Driver).MethodByName(methodName).IsValid()
+	return reflect.ValueOf(m.MigrationMethodsReceiver).MethodByName(methodName).IsValid()
 }
 
 func (m *Migrator) Invoke(methodName string) error {
 	name := methodName
-	migrateMethod := reflect.ValueOf(m.Driver).MethodByName(name)
+	migrateMethod := reflect.ValueOf(m.MigrationMethodsReceiver).MethodByName(name)
 	if !migrateMethod.IsValid() {
 		return MissingMethodError(methodName)
 	}
diff --git a/driver/gomethods/gomethods_migrator_test.go b/driver/gomethods/gomethods_migrator_test.go
@@ -232,7 +232,7 @@ func TestMigrate(t *testing.T) {
 	for _, c := range cases {
 		migrator := Migrator{}
 		d := &FakeGoMethodsDriver{Migrator: migrator, InvokedMethods:[]string{}}
-		migrator.Driver = d
+		migrator.MigrationMethodsReceiver = d
 		migrator.RollbackOnFailure = c.expectRollback
 
 		pipe := pipep.New()
diff --git a/driver/gomethods/usage_examples/mongodb.go b/driver/gomethods/usage_examples/mongodb.go
@@ -16,7 +16,7 @@ type GoMethodsMongoDbDriver struct {
 }
 
 func (d *GoMethodsMongoDbDriver) Initialize(url string) error {
-	return d.DriverTemplate.Initialize(url, DB_NAME, gomethods.Migrator{Driver: d})
+	return d.DriverTemplate.Initialize(url, DB_NAME, gomethods.Migrator{MigrationMethodsReceiver: d})
 }
 
 func init() {
diff --git a/driver/gomethods/usage_examples/mongodb_test.go b/driver/gomethods/usage_examples/mongodb_test.go
@@ -68,6 +68,7 @@ func RunMigrationAndAssertResult(
 	if !reflect.DeepEqual(expected.Errors, errs) {
 		t.Fatalf("Migration '%s': FAILED\nexpected errors %v\nbut got %v", title, expected.Errors, errs)
 	}
+	t.Logf("Migration '%s': PASSED", title)
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ import (`
`8`	`8`	`"os"`
`9`	`9`	`"path"`
`10`	`10`	`"bufio"`
`11`		`- "github.com/dimag-jfrog/migrate/driver"`
`12`	`11`	`"github.com/dimag-jfrog/migrate/file"`
`13`	`12`	`)`
`14`	`13`
`@@ -31,7 +30,7 @@ func (e *MethodInvocationFailedError) Error() string {`
`31`	`30`
`32`	`31`
`33`	`32`	`type Migrator struct {`
`34`		`- Driver driver.Driver`
	`33`	`+ MigrationMethodsReceiver interface{}`
`35`	`34`	`RollbackOnFailure bool`
`36`	`35`	`}`
`37`	`36`
`@@ -73,12 +72,12 @@ func (m *Migrator) Migrate(f file.File, pipe chan interface{}) error {`
`73`	`72`	`}`
`74`	`73`
`75`	`74`	`func (m *Migrator) IsValid(methodName string) bool {`
`76`		`- return reflect.ValueOf(m.Driver).MethodByName(methodName).IsValid()`
	`75`	`+ return reflect.ValueOf(m.MigrationMethodsReceiver).MethodByName(methodName).IsValid()`
`77`	`76`	`}`
`78`	`77`
`79`	`78`	`func (m *Migrator) Invoke(methodName string) error {`
`80`	`79`	`name := methodName`
`81`		`- migrateMethod := reflect.ValueOf(m.Driver).MethodByName(name)`
	`80`	`+ migrateMethod := reflect.ValueOf(m.MigrationMethodsReceiver).MethodByName(name)`
`82`	`81`	`if !migrateMethod.IsValid() {`
`83`	`82`	`return MissingMethodError(methodName)`
`84`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ type GoMethodsMongoDbDriver struct {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`func (d *GoMethodsMongoDbDriver) Initialize(url string) error {`
`19`		`- return d.DriverTemplate.Initialize(url, DB_NAME, gomethods.Migrator{Driver: d})`
	`19`	`+ return d.DriverTemplate.Initialize(url, DB_NAME, gomethods.Migrator{MigrationMethodsReceiver: d})`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`func init() {`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ func RunMigrationAndAssertResult(`
`68`	`68`	`if !reflect.DeepEqual(expected.Errors, errs) {`
`69`	`69`	`t.Fatalf("Migration '%s': FAILED\nexpected errors %v\nbut got %v", title, expected.Errors, errs)`
`70`	`70`	`}`
	`71`	`+ t.Logf("Migration '%s': PASSED", title)`
`71`	`72`	`}`
`72`	`73`
`73`	`74`