From f109508b305e4f3b292ab3368cd2337f696abc05 Mon Sep 17 00:00:00 2001 From: lumbric Date: Sun, 20 Aug 2017 15:10:40 +0200 Subject: [PATCH 1/2] Add MySQL port, fixes #4 --- main.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main.go b/main.go index 4399ef8..d17f6e9 100644 --- a/main.go +++ b/main.go @@ -44,6 +44,7 @@ var prefix = flag.String("prefix", "drp_", "Drupal table prefix") var user = flag.String("user", "", "Drupal user (defaults to be the same as the Drupal database name)") var pass = flag.String("pass", "", "Drupal password (you will be prompted for the password if this is absent)") var host = flag.String("host", "localhost", "Mysql host") +var port = flag.String("port", "3306", "Mysql port") var emvideoField = flag.String("emvideoField", "", "name of CCK field that holds emvideo data.") //var dir = flag.String("dir", "", "Run in directory") @@ -83,7 +84,7 @@ func main() { } // username:password@protocol(address)/dbname?param=value - db := model.Connect(*driver, *user+":"+*pass+"@tcp("+*host+")/"+*dbName, *prefix, *verbose) + db := model.Connect(*driver, *user+":"+*pass+"@tcp("+*host+":"+*port+")/"+*dbName, *prefix, *verbose) cckFieldTypes, err := db.CCKFields() if err != nil && *emvideoField != "" { util.Fatal("Unable to retrieve CCK Field metadata: %s", err.Error()) From c82af5de8df450dfcc2091e8301f7c68700b0107 Mon Sep 17 00:00:00 2001 From: lumbric Date: Sun, 20 Aug 2017 15:13:41 +0200 Subject: [PATCH 2/2] Fix wrong signature to DbMap.TraceOn --- model/db.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/db.go b/model/db.go index 5015fa6..57a0c8b 100644 --- a/model/db.go +++ b/model/db.go @@ -71,7 +71,7 @@ func chooseDialect(driver string) gorp.Dialect { func controlTrace(trace bool, DbMap *gorp.DbMap) { if trace { dbTraceWriter := util.ConstructSomeLogWriter(traceLog, os.Stdout) - DbMap.TraceOn("", log.New(dbTraceWriter, "gorptest: ", log.Lmicroseconds)) + DbMap.TraceOn("", "", log.New(dbTraceWriter, "gorptest: ", log.Lmicroseconds)) } else { DbMap.TraceOff() }