Merge pull request #14 from eure/patch-1

Update vendoring packages

.travis.yml

@@ -1,6 +1,6 @@
 language: go
 go:
-  - 1.9
+  - "1.10"
   - tip
 dist: trusty
 sudo: required
@@ -12,7 +12,7 @@ addons:
       - mysql-client-5.6
 env:
   global:
-    - GO15VENDOREXPERIMENT=1
+    - GO111MODULE=on
     - MYSQL_USER=root
     - MYSQL_PASSWORD=
     - MYSQL_HOST=127.0.0.1

cmd/kamimai/main.go

@@ -10,6 +10,7 @@ import (
 	"github.com/eure/kamimai"
 	"github.com/eure/kamimai/core"
 	_ "github.com/eure/kamimai/driver"
+	_ "github.com/go-sql-driver/mysql"
 )
 
 var (

driver/driver_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/eure/kamimai/core"
+	_ "github.com/go-sql-driver/mysql"
 	"github.com/stretchr/testify/assert"
 )
 

driver/mysql.go

@@ -9,7 +9,6 @@ import (
 	"sync"
 
 	"github.com/eure/kamimai/core"
-	"github.com/go-sql-driver/mysql"
 )
 
 type (
@@ -124,7 +123,7 @@ func (d *MySQL) Migrate(m *core.Migration) error {
 			query = strings.TrimSpace(strings.Join(list, ";"))
 		}
 		_, err = d.Exec(query)
-		if _, isWarn := err.(mysql.MySQLWarnings); err != nil && !isWarn {
+		if err != nil {
 			continue
 		} else {
 			list = nil
@@ -140,7 +139,7 @@ func (d *MySQL) Insert(val uint64) error {
 		versionTableName, val)
 
 	_, err := d.Exec(query)
-	if _, isWarn := err.(mysql.MySQLWarnings); err != nil && !isWarn {
+	if err != nil {
 		return err
 	}
 	return nil
@@ -152,7 +151,7 @@ func (d *MySQL) Delete(val uint64) error {
 		versionTableName, val)
 
 	_, err := d.Exec(query)
-	if _, isWarn := err.(mysql.MySQLWarnings); err != nil && !isWarn {
+	if err != nil {
 		return err
 	}
 	return nil
@@ -192,7 +191,7 @@ func (d *MySQL) Create() error {
 		versionTableName + ` (version BIGINT NOT NULL PRIMARY KEY);`
 
 	_, err := d.Exec(query)
-	if _, isWarn := err.(mysql.MySQLWarnings); err != nil && !isWarn {
+	if err != nil {
 		return err
 	}
 	return nil
@@ -203,7 +202,7 @@ func (d *MySQL) Drop() error {
 	const query = `DROP TABLE IF EXISTS ` + versionTableName
 
 	_, err := d.Exec(query)
-	if _, isWarn := err.(mysql.MySQLWarnings); err != nil && !isWarn {
+	if err != nil {
 		return err
 	}
 	return nil

go.mod

@@ -0,0 +1,12 @@
+module github.com/eure/kamimai
+
+require (
+	github.com/BurntSushi/toml v0.3.1
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/go-sql-driver/mysql v1.4.0
+	github.com/pkg/errors v0.8.0
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/testify v1.2.2
+	google.golang.org/appengine v1.3.0 // indirect
+	gopkg.in/yaml.v2 v2.2.1
+)

go.sum

@@ -0,0 +1,20 @@
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/go-sql-driver/mysql v1.4.0 h1:7LxgVwFb2hIQtMm87NdgAVfXjnt4OePseqT1tKx+opk=
+github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+google.golang.org/appengine v1.3.0 h1:FBSsiFRMz3LBeXIomRnVzrQwSDj4ibvcRexLG0LZGQk=
+google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

kamimai_test.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/eure/kamimai/core"
 	_ "github.com/eure/kamimai/driver"
+	_ "github.com/go-sql-driver/mysql"
 	"github.com/stretchr/testify/assert"
 )