From 7ddc3a1badc7540dbe4ce614e250068e0e658788 Mon Sep 17 00:00:00 2001 From: Arijit Das Date: Thu, 27 Feb 2020 15:59:28 +0530 Subject: [PATCH 1/3] Allow dgraph migrate with remote mysql server. --- dgraph/cmd/migrate/run.go | 6 +++++- dgraph/cmd/migrate/utils.go | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dgraph/cmd/migrate/run.go b/dgraph/cmd/migrate/run.go index 3d0128295f1..1ace03351db 100644 --- a/dgraph/cmd/migrate/run.go +++ b/dgraph/cmd/migrate/run.go @@ -58,6 +58,8 @@ func init() { flag.StringP("output_data", "o", "sql.rdf", "The data output file") flag.StringP("separator", "p", ".", "The separator for constructing predicate names") flag.BoolP("quiet", "q", false, "Enable quiet mode to suppress the warning logs") + flag.StringP("ip", "", "localhost", "The IP address of the database server.") + flag.StringP("port", "", "3306", "The port of the database server.") } func run(conf *viper.Viper) error { @@ -67,6 +69,8 @@ func run(conf *viper.Viper) error { tables := conf.GetString("tables") schemaOutput := conf.GetString("output_schema") dataOutput := conf.GetString("output_data") + ip := conf.GetString("ip") + port := conf.GetString("port") quiet = conf.GetBool("quiet") separator = conf.GetString("separator") @@ -93,7 +97,7 @@ func run(conf *viper.Viper) error { initDataTypes() - pool, err := getPool(user, db, password) + pool, err := getPool(user, db, password, ip, port) if err != nil { return err } diff --git a/dgraph/cmd/migrate/utils.go b/dgraph/cmd/migrate/utils.go index cccaa33427b..203d121a1d0 100644 --- a/dgraph/cmd/migrate/utils.go +++ b/dgraph/cmd/migrate/utils.go @@ -28,10 +28,10 @@ import ( "github.com/pkg/errors" ) -func getPool(user string, db string, password string) (*sql.DB, +func getPool(user, db, password, ip, port string) (*sql.DB, error) { return sql.Open("mysql", - fmt.Sprintf("%s:%s@/%s?parseTime=true", user, password, db)) + fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?parseTime=true", user, password, ip, port, db)) } // showTables will return a slice of table names using one of the following logic From e45609056a764f87d8d612edded6eae4af0452b5 Mon Sep 17 00:00:00 2001 From: Arijit Das Date: Thu, 27 Feb 2020 21:43:51 +0530 Subject: [PATCH 2/3] Minor change. --- dgraph/cmd/migrate/run.go | 2 +- dgraph/cmd/migrate/utils.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dgraph/cmd/migrate/run.go b/dgraph/cmd/migrate/run.go index 1ace03351db..c2e107fc4d8 100644 --- a/dgraph/cmd/migrate/run.go +++ b/dgraph/cmd/migrate/run.go @@ -97,7 +97,7 @@ func run(conf *viper.Viper) error { initDataTypes() - pool, err := getPool(user, db, password, ip, port) + pool, err := getPool(ip, port, user, password, db) if err != nil { return err } diff --git a/dgraph/cmd/migrate/utils.go b/dgraph/cmd/migrate/utils.go index 203d121a1d0..e23a21d864b 100644 --- a/dgraph/cmd/migrate/utils.go +++ b/dgraph/cmd/migrate/utils.go @@ -28,7 +28,7 @@ import ( "github.com/pkg/errors" ) -func getPool(user, db, password, ip, port string) (*sql.DB, +func getPool(ip, port, user, password, db string) (*sql.DB, error) { return sql.Open("mysql", fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?parseTime=true", user, password, ip, port, db)) From beb71da1906aabd44e70da63ae7311adff69c2ec Mon Sep 17 00:00:00 2001 From: Arijit Das Date: Mon, 2 Mar 2020 12:15:14 +0530 Subject: [PATCH 3/3] Minor changes. --- dgraph/cmd/migrate/run.go | 6 +++--- dgraph/cmd/migrate/utils.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dgraph/cmd/migrate/run.go b/dgraph/cmd/migrate/run.go index c2e107fc4d8..4a498a83238 100644 --- a/dgraph/cmd/migrate/run.go +++ b/dgraph/cmd/migrate/run.go @@ -58,7 +58,7 @@ func init() { flag.StringP("output_data", "o", "sql.rdf", "The data output file") flag.StringP("separator", "p", ".", "The separator for constructing predicate names") flag.BoolP("quiet", "q", false, "Enable quiet mode to suppress the warning logs") - flag.StringP("ip", "", "localhost", "The IP address of the database server.") + flag.StringP("host", "", "localhost", "The hostname or IP address of the database server.") flag.StringP("port", "", "3306", "The port of the database server.") } @@ -69,7 +69,7 @@ func run(conf *viper.Viper) error { tables := conf.GetString("tables") schemaOutput := conf.GetString("output_schema") dataOutput := conf.GetString("output_data") - ip := conf.GetString("ip") + host := conf.GetString("host") port := conf.GetString("port") quiet = conf.GetBool("quiet") separator = conf.GetString("separator") @@ -97,7 +97,7 @@ func run(conf *viper.Viper) error { initDataTypes() - pool, err := getPool(ip, port, user, password, db) + pool, err := getPool(host, port, user, password, db) if err != nil { return err } diff --git a/dgraph/cmd/migrate/utils.go b/dgraph/cmd/migrate/utils.go index e23a21d864b..4d03ae77ac5 100644 --- a/dgraph/cmd/migrate/utils.go +++ b/dgraph/cmd/migrate/utils.go @@ -28,10 +28,10 @@ import ( "github.com/pkg/errors" ) -func getPool(ip, port, user, password, db string) (*sql.DB, +func getPool(host, port, user, password, db string) (*sql.DB, error) { return sql.Open("mysql", - fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?parseTime=true", user, password, ip, port, db)) + fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?parseTime=true", user, password, host, port, db)) } // showTables will return a slice of table names using one of the following logic