Merge pull request #17 from plopezm/develop

HotFix for Migrate

Author: plopezm

manager/SQLStandardManager.go

@@ -3,11 +3,12 @@ package manager
 import (
 	"database/sql"
 	"errors"
+	"reflect"
+
 	"github.com/jmoiron/sqlx"
 	"github.com/plopezm/goedb/config"
 	"github.com/plopezm/goedb/dialect"
 	"github.com/plopezm/goedb/metadata"
-	"reflect"
 )
 
 // GoedbSQLDriver constains the database connection
@@ -66,12 +67,12 @@ func (sqld *GoedbSQLDriver) GetDBConnection() *sqlx.DB {
 
 // Migrate creates the table in the database
 func (sqld *GoedbSQLDriver) Migrate(i interface{}, autoCreate bool, dropIfExists bool) (err error) {
+	if dropIfExists {
+		sqld.DropTable(i)
+	}
 	table := metadata.ParseModel(i)
 	metadata.Models[table.Name] = table
 	if autoCreate {
-		if dropIfExists {
-			sqld.DropTable(i)
-		}
 		sqltab := dialect.GetSQLCreate(sqld.Dialect, table)
 		_, err = sqld.db.Exec(sqltab)
 	}

tests/IT_complex_test.go

@@ -1,11 +1,12 @@
 package tests
 
 import (
+	"testing"
+
 	_ "github.com/lib/pq"
 	_ "github.com/mattn/go-sqlite3"
 	"github.com/plopezm/goedb"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 type TestTroop struct {
@@ -31,14 +32,34 @@ func Test_Goedb_Migrate(t *testing.T) {
 	assert.NotNil(t, em)
 
 	err = em.Migrate(&TestTroop{}, true, true)
-	if err != nil {
-		t.Error(err)
-	}
+	assert.Nil(t, err)
 
 	err = em.Migrate(&TestSoldier{}, true, true)
-	if err != nil {
-		t.Error(err)
-	}
+	assert.Nil(t, err)
+}
+
+func Test_Goedb_Migrate_Recreate(t *testing.T) {
+	em, err := goedb.GetEntityManager(persistenceUnitItComplexTest)
+	assert.Nil(t, err)
+	assert.NotNil(t, em)
+
+	err = em.Migrate(&TestTroop{}, true, false)
+	assert.NotNil(t, err)
+
+	err = em.Migrate(&TestSoldier{}, true, false)
+	assert.NotNil(t, err)
+}
+
+func Test_Goedb_Migrate_RecreateWithDrop(t *testing.T) {
+	em, err := goedb.GetEntityManager(persistenceUnitItComplexTest)
+	assert.Nil(t, err)
+	assert.NotNil(t, em)
+
+	err = em.Migrate(&TestTroop{}, true, true)
+	assert.Nil(t, err)
+
+	err = em.Migrate(&TestSoldier{}, true, true)
+	assert.Nil(t, err)
 }
 
 func Test_Goedb_Model(t *testing.T) {