Skip to content

Fix call timing of defer statement #29

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
kanataxa wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix call timing of defer statement #29

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
24 changes: 15 additions & 9 deletions connection/adapter/plugin/mysql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,22 +66,28 @@ func (adapter *MySQLAdapter) ExecDDL(config *config.DatabaseConfig) error {
if len(config.Masters) > 1 {
return errors.New("Sorry, currently supports single master database only")
}
dbname := config.NameOrPath
for _, master := range config.Masters {
serverDsn := fmt.Sprintf("%s:%s@tcp(%s)/", config.Username, config.Password, master)
serverConn, err := sql.Open(config.Adapter, serverDsn)
defer serverConn.Close()
if err != nil {
return errors.Wrapf(err, "cannot open connection from %s", serverDsn)
}
if _, err := serverConn.Exec(fmt.Sprintf(`CREATE DATABASE IF NOT EXISTS %s`, dbname)); err != nil {
return errors.Wrapf(err, "cannot create database %s", dbname)
if err := adapter.execDDL(config, master); err != nil {
return errors.Wrap(err, "cannot execute DDL")
}
return nil
}
return errors.New("must define 'master' server")
}

func (adapter *MySQLAdapter) execDDL(config *config.DatabaseConfig, master string) error {
serverDsn := fmt.Sprintf("%s:%s@tcp(%s)/", config.Username, config.Password, master)
serverConn, err := sql.Open(config.Adapter, serverDsn)
if err != nil {
return errors.Wrapf(err, "cannot open connection from %s", serverDsn)
}
defer serverConn.Close()
if _, err := serverConn.Exec(fmt.Sprintf(`CREATE DATABASE IF NOT EXISTS %s`, config.NameOrPath)); err != nil {
return errors.Wrapf(err, "cannot create database %s", config.NameOrPath)
}
return nil
}

// OpenConnection open connection by database configuration file
func (adapter *MySQLAdapter) OpenConnection(config *config.DatabaseConfig, queryString string) (*sql.DB, error) {
if len(config.Masters) > 1 {
Expand Down