From b7c6484363af8d41bbecadc15c0c000f58e3c681 Mon Sep 17 00:00:00 2001 From: "Scott J. Goldman" Date: Tue, 3 Oct 2017 15:33:05 -0700 Subject: [PATCH 1/2] Remove use of mysql.MySQLWarnings It was removed from the upstream mysql package in https://github.com/go-sql-driver/mysql/pull/676 --- mysql.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/mysql.go b/mysql.go index bcb7f66..6496150 100644 --- a/mysql.go +++ b/mysql.go @@ -89,9 +89,6 @@ func (driver *Driver) Close() error { func (driver *Driver) ensureVersionTableExists() error { _, err := driver.db.Exec("CREATE TABLE IF NOT EXISTS " + tableName + " (version bigint not null primary key);") - if _, isWarn := err.(mysql.MySQLWarnings); err != nil && !isWarn { - return err - } r := driver.db.QueryRow("SELECT data_type FROM information_schema.columns where table_name = ? and column_name = 'version'", tableName) dataType := "" if err := r.Scan(&dataType); err != nil { From d6d8e6a5ad94f1e71febaa3460675973a3bfbb63 Mon Sep 17 00:00:00 2001 From: "Scott J. Goldman" Date: Tue, 3 Oct 2017 16:10:41 -0700 Subject: [PATCH 2/2] Don't ignore errors from db.Exec --- mysql.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql.go b/mysql.go index 6496150..372c872 100644 --- a/mysql.go +++ b/mysql.go @@ -88,7 +88,10 @@ func (driver *Driver) Close() error { func (driver *Driver) ensureVersionTableExists() error { _, err := driver.db.Exec("CREATE TABLE IF NOT EXISTS " + tableName + " (version bigint not null primary key);") - + if err != nil { + return err + } + r := driver.db.QueryRow("SELECT data_type FROM information_schema.columns where table_name = ? and column_name = 'version'", tableName) dataType := "" if err := r.Scan(&dataType); err != nil {