Upgraded gorm version, fixed issue with migration table name, init mi…

…gration is also recorded, FK disable issue

go.mod

@@ -6,5 +6,5 @@ require (
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/spf13/cobra v0.0.3
 	github.com/spf13/pflag v1.0.3 // indirect
-	gorm.io/gorm v1.20.2
+	gorm.io/gorm v1.20.9
 )

go.sum

@@ -10,3 +10,5 @@ github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 gorm.io/gorm v1.20.2 h1:bZzSEnq7NDGsrd+n3evOOedDrY5oLM5QPlCjZJUK2ro=
 gorm.io/gorm v1.20.2/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
+gorm.io/gorm v1.20.9 h1:M3aIZKXAC1PtPVu9t3WGwkBTE1le5c2telz3I/qjRNg=
+gorm.io/gorm v1.20.9/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=

gormigro.go

@@ -10,6 +10,10 @@ import (
 	"gorm.io/gorm/logger"
 )
 
+const (
+	InitialSchemaMigrationName = "__initialMigration"
+)
+
 // Gormigro is migration tool which allow you to simply handle migrations with gorm.io
 type Gormigro struct {
 	// db gorm database
@@ -48,7 +52,7 @@ func NewGormigro(db *gorm.DB, options Options) *Gormigro {
 		options:              options,
 		migrationsCollection: DefaultCollector.Export(),
 		migrationManager: NewMigrationManager(db.Session(&gorm.Session{
-			WithConditions: false,
+			NewDB: true,
 		}), options.MigrationTable),
 	}
 }
@@ -65,7 +69,7 @@ func NewGormigroWithMigrations(db *gorm.DB, options Options, migrations []Migrat
 		options:              options,
 		migrationsCollection: NewCollectionWithMigrations(migrations),
 		migrationManager: NewMigrationManager(db.Session(&gorm.Session{
-			WithConditions: false,
+			NewDB: true,
 		}), options.MigrationTable),
 	}
 }
@@ -132,7 +136,7 @@ func (g *Gormigro) MigrateFrom(id string) error {
 		log.Printf("Running migration with ID %s\n", m.ID)
 		// start the transaction per migration
 		tx := g.db.Session(&gorm.Session{
-			WithConditions: false,
+			NewDB: true,
 		})
 		if tx.Error != nil {
 			return tx.Error
@@ -192,7 +196,7 @@ func (g *Gormigro) DropSchema() error {
 	}
 
 	rows, err := g.db.Session(&gorm.Session{
-		WithConditions: false,
+		NewDB: true,
 	}).Raw("SHOW TABLES").Rows()
 	if err != nil {
 		return err
@@ -201,7 +205,7 @@ func (g *Gormigro) DropSchema() error {
 	defer rows.Close()
 
 	// disable FK check for safe remove
-	g.db.Exec("SET FOREIGN_KEY_CHECKS=0;")
+	g.db.Exec("SET GLOBAL FOREIGN_KEY_CHECKS = 0;")
 	for rows.Next() {
 		var table Table
 
@@ -216,7 +220,7 @@ func (g *Gormigro) DropSchema() error {
 	}
 
 	// and enable again
-	g.db.Exec("SET FOREIGN_KEY_CHECKS=1;")
+	g.db.Exec("SET GLOBAL FOREIGN_KEY_CHECKS = 1;")
 
 	log.Println("Dropping completed")
 
@@ -227,6 +231,10 @@ func (g *Gormigro) DropSchema() error {
 func (g *Gormigro) runInitialSchemaFunc() error {
 	log.Println("Running initial schema migration")
 
+	if g.migrationManager.IsMigrationExecuted(InitialSchemaMigrationName) {
+		return nil
+	}
+
 	// start transaction
 	tx := g.db.Begin()
 
@@ -238,5 +246,8 @@ func (g *Gormigro) runInitialSchemaFunc() error {
 		return err
 	}
 
+	// and mark the init func as executed
+	g.migrationManager.AddMigration(InitialSchemaMigrationName)
+
 	return tx.Commit().Error
 }

migrationManager.go

@@ -1,6 +1,8 @@
 package gormigro
 
 import (
+	"errors"
+
 	"gorm.io/gorm"
 )
 
@@ -60,6 +62,18 @@ func (mm MigrationManager) RemoveMigration(id string) {
 	}
 }
 
+func (mm MigrationManager) IsMigrationExecuted(id string) bool {
+	res := mm.db.Find(NewMigrationTable(id))
+	if res.Error != nil && errors.Is(res.Error, gorm.ErrRecordNotFound) {
+		return false
+	}
+	if res.Error != nil {
+		panic(res.Error)
+	}
+
+	return true
+}
+
 func (mm MigrationManager) ClearExecutedMigrations() error {
 	res := mm.db.Exec("TRUNCATE `", mm.tableName)
 

types.go

@@ -44,8 +44,10 @@ type MigrationTable struct {
 }
 
 func NewMigrationTable(tableName string) *MigrationTable {
+	// temporary fix, gorm cloning the struct thru reflection and there's
+	// so it'll override the tableName settings
 	return &MigrationTable{
-		tableName: tableName,
+		tableName: DefaultMigrationTable,
 	}
 }