Merge branch 'migrate/master'

# Conflicts:
#	.golangci.yml

.golangci.yml

@@ -4,7 +4,7 @@ run:
 linters:
  enable:
  #- golint
- # interfacer
+ #- interfacer
  - unconvert
  #- dupl
  - goconst

go.mod

@@ -26,7 +26,7 @@ require (
  github.com/ktrysmt/go-bitbucket v0.6.4
  github.com/lib/pq v1.10.9
  github.com/markbates/pkger v0.15.1
- github.com/mattn/go-sqlite3 v1.14.16
+ github.com/mattn/go-sqlite3 v1.14.22
  github.com/microsoft/go-mssqldb v1.0.0
  github.com/mutecomm/go-sqlcipher/v4 v4.4.0
  github.com/nakagami/firebirdsql v0.0.0-20190310045651-3c02a58cfed8

go.sum

@@ -453,8 +453,8 @@ github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peK
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
-github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
-github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
+github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
+github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/microsoft/go-mssqldb v1.0.0 h1:k2p2uuG8T5T/7Hp7/e3vMGTnnR0sU4h8d1CcC71iLHU=
 github.com/microsoft/go-mssqldb v1.0.0/go.mod h1:+4wZTUnz/SV6nffv+RRRB/ss8jPng5Sho2SmM1l2ts4=
 github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 h1:AMFGa4R4MiIpspGNG7Z948v4n35fFGB3RR3G/ry4FWs=

migrate.go

@@ -89,25 +89,25 @@ func New(sourceURL, databaseURL string) (*Migrate, error) {
 
  sourceName, err := iurl.SchemeFromURL(sourceURL)
  if err != nil {
- return nil, err
+ return nil, fmt.Errorf("failed to parse scheme from source URL: %w", err)
  }
  m.sourceName = sourceName
 
  databaseName, err := iurl.SchemeFromURL(databaseURL)
  if err != nil {
- return nil, err
+ return nil, fmt.Errorf("failed to parse scheme from database URL: %w", err)
  }
  m.databaseName = databaseName
 
  sourceDrv, err := source.Open(sourceURL)
  if err != nil {
- return nil, err
+ return nil, fmt.Errorf("failed to open source, %q: %w", sourceURL, err)
  }
  m.sourceDrv = sourceDrv
 
  databaseDrv, err := database.Open(databaseURL)
  if err != nil {
- return nil, err
+ return nil, fmt.Errorf("failed to open database, %q: %w", databaseURL, err)
  }
  m.databaseDrv = databaseDrv
 
@@ -131,7 +131,7 @@ func NewWithDatabaseInstance(sourceURL string, databaseName string, databaseInst
 
  sourceDrv, err := source.Open(sourceURL)
  if err != nil {
- return nil, err
+ return nil, fmt.Errorf("failed to open source, %q: %w", sourceURL, err)
  }
  m.sourceDrv = sourceDrv
 
@@ -149,15 +149,15 @@ func NewWithSourceInstance(sourceName string, sourceInstance source.Driver, data
 
  databaseName, err := iurl.SchemeFromURL(databaseURL)
  if err != nil {
- return nil, err
+ return nil, fmt.Errorf("failed to parse scheme from database URL: %w", err)
  }
  m.databaseName = databaseName
 
  m.sourceName = sourceName
 
  databaseDrv, err := database.Open(databaseURL)
  if err != nil {
- return nil, err
+ return nil, fmt.Errorf("failed to open database, %q: %w", databaseURL, err)
  }
  m.databaseDrv = databaseDrv