Skip to content

Rename databaseName to databaseDriverName #1304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Rename databaseName to databaseDriverName #1304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions migrate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ func (e ErrDirty) Error() string {
}

type Migrate struct {
sourceName string
sourceDrv source.Driver
databaseName string
databaseDrv database.Driver
sourceName string
sourceDrv source.Driver
databaseDriverName string
databaseDrv database.Driver

// Log accepts a Logger interface
Log Logger
Expand Down Expand Up @@ -93,11 +93,11 @@ func New(sourceURL, databaseURL string) (*Migrate, error) {
}
m.sourceName = sourceName

databaseName, err := iurl.SchemeFromURL(databaseURL)
databaseDriverName, err := iurl.SchemeFromURL(databaseURL)
if err != nil {
return nil, fmt.Errorf("failed to parse scheme from database URL: %w", err)
}
m.databaseName = databaseName
m.databaseDriverName = databaseDriverName

sourceDrv, err := source.Open(sourceURL)
if err != nil {
Expand All @@ -116,9 +116,9 @@ func New(sourceURL, databaseURL string) (*Migrate, error) {

// NewWithDatabaseInstance returns a new Migrate instance from a source URL
// and an existing database instance. The source URL scheme is defined by each driver.
// Use any string that can serve as an identifier during logging as databaseName.
// Use any string that can serve as an identifier during logging as databaseDriverName.
// You are responsible for closing the underlying database client if necessary.
func NewWithDatabaseInstance(sourceURL string, databaseName string, databaseInstance database.Driver) (*Migrate, error) {
func NewWithDatabaseInstance(sourceURL string, databaseDriverName string, databaseInstance database.Driver) (*Migrate, error) {
m := newCommon()

sourceName, err := iurl.SchemeFromURL(sourceURL)
Expand All @@ -127,7 +127,7 @@ func NewWithDatabaseInstance(sourceURL string, databaseName string, databaseInst
}
m.sourceName = sourceName

m.databaseName = databaseName
m.databaseDriverName = databaseDriverName

sourceDrv, err := source.Open(sourceURL)
if err != nil {
Expand All @@ -147,11 +147,11 @@ func NewWithDatabaseInstance(sourceURL string, databaseName string, databaseInst
func NewWithSourceInstance(sourceName string, sourceInstance source.Driver, databaseURL string) (*Migrate, error) {
m := newCommon()

databaseName, err := iurl.SchemeFromURL(databaseURL)
databaseDriverName, err := iurl.SchemeFromURL(databaseURL)
if err != nil {
return nil, fmt.Errorf("failed to parse scheme from database URL: %w", err)
}
m.databaseName = databaseName
m.databaseDriverName = databaseDriverName

m.sourceName = sourceName

Expand All @@ -168,13 +168,13 @@ func NewWithSourceInstance(sourceName string, sourceInstance source.Driver, data

// NewWithInstance returns a new Migrate instance from an existing source and
// database instance. Use any string that can serve as an identifier during logging
// as sourceName and databaseName. You are responsible for closing down
// as sourceName and databaseDriverName. You are responsible for closing down
// the underlying source and database client if necessary.
func NewWithInstance(sourceName string, sourceInstance source.Driver, databaseName string, databaseInstance database.Driver) (*Migrate, error) {
func NewWithInstance(sourceName string, sourceInstance source.Driver, databaseDriverName string, databaseInstance database.Driver) (*Migrate, error) {
m := newCommon()

m.sourceName = sourceName
m.databaseName = databaseName
m.databaseDriverName = databaseDriverName

m.sourceDrv = sourceInstance
m.databaseDrv = databaseInstance
Expand Down
16 changes: 8 additions & 8 deletions migrate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ func TestNew(t *testing.T) {
t.Error("expected sourceDrv not to be nil")
}

if m.databaseName != dbDrvNameStub {
t.Errorf("expected stub, got %v", m.databaseName)
if m.databaseDriverName != dbDrvNameStub {
t.Errorf("expected stub, got %v", m.databaseDriverName)
}
if m.databaseDrv == nil {
t.Error("expected databaseDrv not to be nil")
Expand Down Expand Up @@ -94,8 +94,8 @@ func TestNewWithDatabaseInstance(t *testing.T) {
t.Error("expected sourceDrv not to be nil")
}

if m.databaseName != dbDrvNameStub {
t.Errorf("expected stub, got %v", m.databaseName)
if m.databaseDriverName != dbDrvNameStub {
t.Errorf("expected stub, got %v", m.databaseDriverName)
}
if m.databaseDrv == nil {
t.Error("expected databaseDrv not to be nil")
Expand Down Expand Up @@ -153,8 +153,8 @@ func TestNewWithSourceInstance(t *testing.T) {
t.Error("expected sourceDrv not to be nil")
}

if m.databaseName != dbDrvNameStub {
t.Errorf("expected stub, got %v", m.databaseName)
if m.databaseDriverName != dbDrvNameStub {
t.Errorf("expected stub, got %v", m.databaseDriverName)
}
if m.databaseDrv == nil {
t.Error("expected databaseDrv not to be nil")
Expand Down Expand Up @@ -209,8 +209,8 @@ func TestNewWithInstance(t *testing.T) {
t.Error("expected sourceDrv not to be nil")
}

if m.databaseName != dbDrvNameStub {
t.Errorf("expected stub, got %v", m.databaseName)
if m.databaseDriverName != dbDrvNameStub {
t.Errorf("expected stub, got %v", m.databaseDriverName)
}
if m.databaseDrv == nil {
t.Error("expected databaseDrv not to be nil")
Expand Down