Use both db name and migration table name for lock hash

Fuyuan Bie · christianklotz · commit 9632882b6938 · 2017-06-14T21:57:37.000+02:00
diff --git a/database/mysql/mysql.go b/database/mysql/mysql.go
@@ -156,7 +156,8 @@ func (m *Mysql) Lock() error {
 		return database.ErrLocked
 	}
 
-	aid, err := database.GenerateAdvisoryLockId(m.config.DatabaseName)
+	aid, err := database.GenerateAdvisoryLockId(
+		fmt.Sprintf("%s:%s", m.config.DatabaseName, m.config.MigrationsTable)
 	if err != nil {
 		return err
 	}
@@ -180,7 +181,8 @@ func (m *Mysql) Unlock() error {
 		return nil
 	}
 
-	aid, err := database.GenerateAdvisoryLockId(m.config.DatabaseName)
+	aid, err := database.GenerateAdvisoryLockId(
+		fmt.Sprintf("%s:%s", m.config.DatabaseName, m.config.MigrationsTable)
 	if err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,8 @@ func (m *Mysql) Lock() error {`
`156`	`156`	`return database.ErrLocked`
`157`	`157`	`}`
`158`	`158`
`159`		`- aid, err := database.GenerateAdvisoryLockId(m.config.DatabaseName)`
	`159`	`+ aid, err := database.GenerateAdvisoryLockId(`
	`160`	`+ fmt.Sprintf("%s:%s", m.config.DatabaseName, m.config.MigrationsTable)`
`160`	`161`	`if err != nil {`
`161`	`162`	`return err`
`162`	`163`	`}`
`@@ -180,7 +181,8 @@ func (m *Mysql) Unlock() error {`
`180`	`181`	`return nil`
`181`	`182`	`}`
`182`	`183`
`183`		`- aid, err := database.GenerateAdvisoryLockId(m.config.DatabaseName)`
	`184`	`+ aid, err := database.GenerateAdvisoryLockId(`
	`185`	`+ fmt.Sprintf("%s:%s", m.config.DatabaseName, m.config.MigrationsTable)`
`184`	`186`	`if err != nil {`
`185`	`187`	`return err`
`186`	`188`	`}`