Skip to content

Commit

Permalink
Merge pull request #1 from KSerik/feat/yugabyte-support
Browse files Browse the repository at this point in the history
Feat/yugabyte support
  • Loading branch information
KSerik committed May 23, 2022
2 parents 331a15d + 91d7dff commit 9d811eb
Show file tree
Hide file tree
Showing 122 changed files with 863 additions and 193 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SOURCE ?= file go_bindata github github_ee bitbucket aws_s3 google_cloud_storage godoc_vfs gitlab
DATABASE ?= postgres mysql redshift cassandra spanner cockroachdb clickhouse mongodb sqlserver firebird neo4j pgx
DATABASE ?= postgres mysql redshift cassandra spanner cockroachdb yugabytedb clickhouse mongodb sqlserver firebird neo4j pgx
DATABASE_TEST ?= $(DATABASE) sqlite sqlite3 sqlcipher
VERSION ?= $(shell git describe --tags 2>/dev/null | cut -c 2-)
TEST_FLAGS ?=
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ Database drivers run migrations. [Add a new database?](database/driver.go)
* [Shell](database/shell) ([todo #171](https://github.com/mattes/migrate/issues/171))
* [Google Cloud Spanner](database/spanner)
* [CockroachDB](database/cockroachdb)
* [YugabyteDB](database/yugabytedb)
* [ClickHouse](database/clickhouse)
* [Firebird](database/firebird)
* [MS SQL Server](database/sqlserver)
Expand Down
2 changes: 1 addition & 1 deletion cli/main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package main

import "github.com/golang-migrate/migrate/v4/internal/cli"
import "github.com/KSerik/migrate/internal/cli"

// Deprecated, please use cmd/migrate
func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/migrate/main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package main

import "github.com/golang-migrate/migrate/v4/internal/cli"
import "github.com/KSerik/migrate/internal/cli"

func main() {
cli.Main(Version)
Expand Down
4 changes: 2 additions & 2 deletions database/cassandra/cassandra.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"strings"
"time"

"github.com/KSerik/migrate/database"
"github.com/KSerik/migrate/database/multistmt"
"github.com/gocql/gocql"
"github.com/golang-migrate/migrate/v4/database"
"github.com/golang-migrate/migrate/v4/database/multistmt"
"github.com/hashicorp/go-multierror"
)

Expand Down
8 changes: 4 additions & 4 deletions database/cassandra/cassandra_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cassandra
import (
"context"
"fmt"
"github.com/golang-migrate/migrate/v4"
"github.com/KSerik/migrate"
"strconv"
"testing"
)
Expand All @@ -14,9 +14,9 @@ import (
)

import (
dt "github.com/golang-migrate/migrate/v4/database/testing"
"github.com/golang-migrate/migrate/v4/dktesting"
_ "github.com/golang-migrate/migrate/v4/source/file"
dt "github.com/KSerik/migrate/database/testing"
"github.com/KSerik/migrate/dktesting"
_ "github.com/KSerik/migrate/source/file"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions database/clickhouse/clickhouse.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (

"go.uber.org/atomic"

"github.com/golang-migrate/migrate/v4"
"github.com/golang-migrate/migrate/v4/database"
"github.com/golang-migrate/migrate/v4/database/multistmt"
"github.com/KSerik/migrate"
"github.com/KSerik/migrate/database"
"github.com/KSerik/migrate/database/multistmt"
"github.com/hashicorp/go-multierror"
)

Expand Down
10 changes: 5 additions & 5 deletions database/clickhouse/clickhouse_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"testing"

_ "github.com/ClickHouse/clickhouse-go"
"github.com/KSerik/migrate"
"github.com/KSerik/migrate/database/clickhouse"
dt "github.com/KSerik/migrate/database/testing"
"github.com/KSerik/migrate/dktesting"
_ "github.com/KSerik/migrate/source/file"
"github.com/dhui/dktest"
"github.com/golang-migrate/migrate/v4"
"github.com/golang-migrate/migrate/v4/database/clickhouse"
dt "github.com/golang-migrate/migrate/v4/database/testing"
"github.com/golang-migrate/migrate/v4/dktesting"
_ "github.com/golang-migrate/migrate/v4/source/file"
)

const defaultPort = 9000
Expand Down
4 changes: 2 additions & 2 deletions database/cockroachdb/cockroachdb.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
)

import (
"github.com/golang-migrate/migrate/v4"
"github.com/golang-migrate/migrate/v4/database"
"github.com/KSerik/migrate"
"github.com/KSerik/migrate/database"
)

func init() {
Expand Down
8 changes: 4 additions & 4 deletions database/cockroachdb/cockroachdb_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"context"
"database/sql"
"fmt"
"github.com/golang-migrate/migrate/v4"
"github.com/KSerik/migrate"
"log"
"strings"
"testing"
Expand All @@ -18,9 +18,9 @@ import (
)

import (
dt "github.com/golang-migrate/migrate/v4/database/testing"
"github.com/golang-migrate/migrate/v4/dktesting"
_ "github.com/golang-migrate/migrate/v4/source/file"
dt "github.com/KSerik/migrate/database/testing"
"github.com/KSerik/migrate/dktesting"
_ "github.com/KSerik/migrate/source/file"
)

const defaultPort = 26257
Expand Down
2 changes: 1 addition & 1 deletion database/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"io"
"sync"

iurl "github.com/golang-migrate/migrate/v4/internal/url"
iurl "github.com/KSerik/migrate/internal/url"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions database/firebird/firebird.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"context"
"database/sql"
"fmt"
"github.com/golang-migrate/migrate/v4"
"github.com/golang-migrate/migrate/v4/database"
"github.com/KSerik/migrate"
"github.com/KSerik/migrate/database"
"github.com/hashicorp/go-multierror"
_ "github.com/nakagami/firebirdsql"
"go.uber.org/atomic"
Expand Down
8 changes: 4 additions & 4 deletions database/firebird/firebird_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ import (
"fmt"
"log"

"github.com/golang-migrate/migrate/v4"
"github.com/KSerik/migrate"
"io"
"strings"
"testing"

"github.com/dhui/dktest"

dt "github.com/golang-migrate/migrate/v4/database/testing"
"github.com/golang-migrate/migrate/v4/dktesting"
_ "github.com/golang-migrate/migrate/v4/source/file"
dt "github.com/KSerik/migrate/database/testing"
"github.com/KSerik/migrate/dktesting"
_ "github.com/KSerik/migrate/source/file"

_ "github.com/nakagami/firebirdsql"
)
Expand Down
2 changes: 1 addition & 1 deletion database/mongodb/mongodb.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package mongodb
import (
"context"
"fmt"
"github.com/KSerik/migrate/database"
"github.com/cenkalti/backoff/v4"
"github.com/golang-migrate/migrate/v4/database"
"github.com/hashicorp/go-multierror"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/mongo"
Expand Down
8 changes: 4 additions & 4 deletions database/mongodb/mongodb_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"log"

"github.com/golang-migrate/migrate/v4"
"github.com/KSerik/migrate"
"io"
"os"
"strconv"
Expand All @@ -23,9 +23,9 @@ import (
)

import (
dt "github.com/golang-migrate/migrate/v4/database/testing"
"github.com/golang-migrate/migrate/v4/dktesting"
_ "github.com/golang-migrate/migrate/v4/source/file"
dt "github.com/KSerik/migrate/database/testing"
"github.com/KSerik/migrate/dktesting"
_ "github.com/KSerik/migrate/source/file"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion database/multistmt/parse_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/stretchr/testify/assert"

"github.com/golang-migrate/migrate/v4/database/multistmt"
"github.com/KSerik/migrate/database/multistmt"
)

const maxMigrationSize = 1024
Expand Down
2 changes: 1 addition & 1 deletion database/mysql/mysql.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"strconv"
"strings"

"github.com/KSerik/migrate/database"
"github.com/go-sql-driver/mysql"
"github.com/golang-migrate/migrate/v4/database"
"github.com/hashicorp/go-multierror"
)

Expand Down
8 changes: 4 additions & 4 deletions database/mysql/mysql_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ import (
)

import (
"github.com/golang-migrate/migrate/v4"
dt "github.com/golang-migrate/migrate/v4/database/testing"
"github.com/golang-migrate/migrate/v4/dktesting"
_ "github.com/golang-migrate/migrate/v4/source/file"
"github.com/KSerik/migrate"
dt "github.com/KSerik/migrate/database/testing"
"github.com/KSerik/migrate/dktesting"
_ "github.com/KSerik/migrate/source/file"
)

const defaultPort = 3306
Expand Down
4 changes: 2 additions & 2 deletions database/neo4j/neo4j.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"strconv"
"sync/atomic"

"github.com/golang-migrate/migrate/v4/database"
"github.com/golang-migrate/migrate/v4/database/multistmt"
"github.com/KSerik/migrate/database"
"github.com/KSerik/migrate/database/multistmt"
"github.com/hashicorp/go-multierror"
"github.com/neo4j/neo4j-go-driver/neo4j"
)
Expand Down
8 changes: 4 additions & 4 deletions database/neo4j/neo4j_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"github.com/dhui/dktest"
"github.com/neo4j/neo4j-go-driver/neo4j"

"github.com/golang-migrate/migrate/v4"
dt "github.com/golang-migrate/migrate/v4/database/testing"
"github.com/golang-migrate/migrate/v4/dktesting"
_ "github.com/golang-migrate/migrate/v4/source/file"
"github.com/KSerik/migrate"
dt "github.com/KSerik/migrate/database/testing"
"github.com/KSerik/migrate/dktesting"
_ "github.com/KSerik/migrate/source/file"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions database/pgx/pgx.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
"strings"
"time"

"github.com/golang-migrate/migrate/v4"
"github.com/golang-migrate/migrate/v4/database"
"github.com/golang-migrate/migrate/v4/database/multistmt"
"github.com/KSerik/migrate"
"github.com/KSerik/migrate/database"
"github.com/KSerik/migrate/database/multistmt"
multierror "github.com/hashicorp/go-multierror"
"github.com/jackc/pgconn"
"github.com/jackc/pgerrcode"
Expand Down
10 changes: 5 additions & 5 deletions database/pgx/pgx_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ import (
"sync"
"testing"

"github.com/golang-migrate/migrate/v4"
"github.com/KSerik/migrate"

"github.com/dhui/dktest"

"github.com/golang-migrate/migrate/v4/database"
dt "github.com/golang-migrate/migrate/v4/database/testing"
"github.com/golang-migrate/migrate/v4/dktesting"
_ "github.com/golang-migrate/migrate/v4/source/file"
"github.com/KSerik/migrate/database"
dt "github.com/KSerik/migrate/database/testing"
"github.com/KSerik/migrate/dktesting"
_ "github.com/KSerik/migrate/source/file"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions database/postgres/postgres.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (

"go.uber.org/atomic"

"github.com/golang-migrate/migrate/v4"
"github.com/golang-migrate/migrate/v4/database"
"github.com/golang-migrate/migrate/v4/database/multistmt"
"github.com/KSerik/migrate"
"github.com/KSerik/migrate/database"
"github.com/KSerik/migrate/database/multistmt"
"github.com/hashicorp/go-multierror"
"github.com/lib/pq"
)
Expand Down
10 changes: 5 additions & 5 deletions database/postgres/postgres_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ import (
"sync"
"testing"

"github.com/golang-migrate/migrate/v4"
"github.com/KSerik/migrate"

"github.com/dhui/dktest"

"github.com/golang-migrate/migrate/v4/database"
dt "github.com/golang-migrate/migrate/v4/database/testing"
"github.com/golang-migrate/migrate/v4/dktesting"
_ "github.com/golang-migrate/migrate/v4/source/file"
"github.com/KSerik/migrate/database"
dt "github.com/KSerik/migrate/database/testing"
"github.com/KSerik/migrate/dktesting"
_ "github.com/KSerik/migrate/source/file"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions database/ql/ql.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (

nurl "net/url"

"github.com/golang-migrate/migrate/v4"
"github.com/golang-migrate/migrate/v4/database"
"github.com/KSerik/migrate"
"github.com/KSerik/migrate/database"
_ "modernc.org/ql/driver"
)

Expand Down
6 changes: 3 additions & 3 deletions database/ql/ql_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"path/filepath"
"testing"

"github.com/golang-migrate/migrate/v4"
dt "github.com/golang-migrate/migrate/v4/database/testing"
_ "github.com/golang-migrate/migrate/v4/source/file"
"github.com/KSerik/migrate"
dt "github.com/KSerik/migrate/database/testing"
_ "github.com/KSerik/migrate/source/file"
_ "modernc.org/ql/driver"
)

Expand Down
4 changes: 2 additions & 2 deletions database/redshift/redshift.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"strconv"
"strings"

"github.com/golang-migrate/migrate/v4"
"github.com/golang-migrate/migrate/v4/database"
"github.com/KSerik/migrate"
"github.com/KSerik/migrate/database"
"github.com/hashicorp/go-multierror"
"github.com/lib/pq"
)
Expand Down
10 changes: 5 additions & 5 deletions database/redshift/redshift_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"fmt"
"log"

"github.com/golang-migrate/migrate/v4"
"github.com/KSerik/migrate"
"io"
"strconv"
"strings"
Expand All @@ -22,10 +22,10 @@ import (
)

import (
"github.com/golang-migrate/migrate/v4/database"
dt "github.com/golang-migrate/migrate/v4/database/testing"
"github.com/golang-migrate/migrate/v4/dktesting"
_ "github.com/golang-migrate/migrate/v4/source/file"
"github.com/KSerik/migrate/database"
dt "github.com/KSerik/migrate/database/testing"
"github.com/KSerik/migrate/dktesting"
_ "github.com/KSerik/migrate/source/file"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion database/snowflake/snowflake.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"strconv"
"strings"

"github.com/golang-migrate/migrate/v4/database"
"github.com/KSerik/migrate/database"
"github.com/hashicorp/go-multierror"
"github.com/lib/pq"
sf "github.com/snowflakedb/gosnowflake"
Expand Down
Loading

0 comments on commit 9d811eb

Please sign in to comment.