Prevents MySQL driver to failing when version table alredy exists

divoxx · divoxx · commit c94461932f49 · 2014-12-04T13:49:26.000-08:00
The MySQL driver is using `CREATE TABLE IF NOT EXISTS`, which causes
the MySQL database to raise warnings. The golang driver collects
the warnings and return a composite object (mysql.MySQLWarnings) as
an error that needs to be properly handled.

This change stops the driver from failing in case there are only
warnings.
diff --git a/driver/mysql/mysql.go b/driver/mysql/mysql.go
@@ -50,9 +50,12 @@ func (driver *Driver) Close() error {
 }
 
 func (driver *Driver) ensureVersionTableExists() error {
-	if _, err := driver.db.Exec("CREATE TABLE IF NOT EXISTS " + tableName + " (version int not null primary key);"); err != nil {
+	_, err := driver.db.Exec("CREATE TABLE IF NOT EXISTS " + tableName + " (version int not null primary key);")
+
+	if _, isWarn := err.(mysql.MySQLWarnings); err != nil && !isWarn {
 		return err
 	}
+
 	return nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,12 @@ func (driver *Driver) Close() error {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`func (driver *Driver) ensureVersionTableExists() error {`
`53`		`- if _, err := driver.db.Exec("CREATE TABLE IF NOT EXISTS " + tableName + " (version int not null primary key);"); err != nil {`
	`53`	`+ _, err := driver.db.Exec("CREATE TABLE IF NOT EXISTS " + tableName + " (version int not null primary key);")`
	`54`	`+`
	`55`	`+ if _, isWarn := err.(mysql.MySQLWarnings); err != nil && !isWarn {`
`54`	`56`	`return err`
`55`	`57`	`}`
	`58`	`+`
`56`	`59`	`return nil`
`57`	`60`	`}`
`58`	`61`