From 99bbecfea8963402ff234a2633e157f0f7914a97 Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Tue, 30 Apr 2024 19:16:35 +0900 Subject: [PATCH 1/2] Use mysql.NewConfig() instead of mysql.Config{} --- _content/doc/database/open-handle.md | 26 ++++++++++---------- _content/doc/tutorial/database-access.md | 30 ++++++++++++------------ 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/_content/doc/database/open-handle.md b/_content/doc/database/open-handle.md index 0e10ff18d8..2aac6d406d 100644 --- a/_content/doc/database/open-handle.md +++ b/_content/doc/database/open-handle.md @@ -115,13 +115,12 @@ to build a connection string. ``` // Specify connection properties. -cfg := mysql.Config{ - User: username, - Passwd: password, - Net: "tcp", - Addr: "127.0.0.1:3306", - DBName: "jazzrecords", -} +cfg := mysql.NewConfig() +cfg.User = username +cfg.Passwd = password +cfg.Net = "tcp" +cfg.Addr = "127.0.0.1:3306" +cfg.DBName = "jazzrecords" // Get a database handle. db, err = sql.Open("mysql", cfg.FormatDSN()) @@ -143,13 +142,12 @@ create a handle with code such as the following: ``` // Specify connection properties. -cfg := mysql.Config{ - User: username, - Passwd: password, - Net: "tcp", - Addr: "127.0.0.1:3306", - DBName: "jazzrecords", -} +cfg := mysql.NewConfig() +cfg.User = username +cfg.Passwd = password +cfg.Net = "tcp" +cfg.Addr = "127.0.0.1:3306" +cfg.DBName = "jazzrecords" // Get a driver-specific connector. connector, err := mysql.NewConnector(&cfg) diff --git a/_content/doc/tutorial/database-access.md b/_content/doc/tutorial/database-access.md index 900e66c3da..71f3736596 100644 --- a/_content/doc/tutorial/database-access.md +++ b/_content/doc/tutorial/database-access.md @@ -240,14 +240,14 @@ specific database. var db *sql.DB func main() { - // Capture connection properties. - cfg := mysql.Config{ - User: os.Getenv("DBUSER"), - Passwd: os.Getenv("DBPASS"), - Net: "tcp", - Addr: "127.0.0.1:3306", - DBName: "recordings", - } + // Capture connection properties. + cfg := mysql.NewConfig() + cfg.User = os.Getenv("DBUSER") + cfg.Passwd = os.Getenv("DBPASS") + cfg.Net = "tcp" + cfg.Addr = "127.0.0.1:3306" + cfg.DBName = "recordings" + // Get a database handle. var err error db, err = sql.Open("mysql", cfg.FormatDSN()) @@ -690,13 +690,13 @@ type Album struct { func main() { // Capture connection properties. - cfg := mysql.Config{ - User: os.Getenv("DBUSER"), - Passwd: os.Getenv("DBPASS"), - Net: "tcp", - Addr: "127.0.0.1:3306", - DBName: "recordings", - } + cfg := mysql.NewConfig() + cfg.User = os.Getenv("DBUSER") + cfg.Passwd = os.Getenv("DBPASS") + cfg.Net = "tcp" + cfg.Addr = "127.0.0.1:3306" + cfg.DBName = "recordings" + // Get a database handle. var err error db, err = sql.Open("mysql", cfg.FormatDSN()) From 1031334dc57e7458b66e82c6dc238bd1e1c317e1 Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Thu, 2 May 2024 03:05:53 +0900 Subject: [PATCH 2/2] fix indent and sample output --- _content/doc/tutorial/database-access.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/_content/doc/tutorial/database-access.md b/_content/doc/tutorial/database-access.md index 71f3736596..a4275fa599 100644 --- a/_content/doc/tutorial/database-access.md +++ b/_content/doc/tutorial/database-access.md @@ -240,13 +240,13 @@ specific database. var db *sql.DB func main() { - // Capture connection properties. - cfg := mysql.NewConfig() - cfg.User = os.Getenv("DBUSER") - cfg.Passwd = os.Getenv("DBPASS") - cfg.Net = "tcp" - cfg.Addr = "127.0.0.1:3306" - cfg.DBName = "recordings" + // Capture connection properties. + cfg := mysql.NewConfig() + cfg.User = os.Getenv("DBUSER") + cfg.Passwd = os.Getenv("DBPASS") + cfg.Net = "tcp" + cfg.Addr = "127.0.0.1:3306" + cfg.DBName = "recordings" // Get a database handle. var err error @@ -331,7 +331,8 @@ specific database. ``` $ go get . - go get: added github.com/go-sql-driver/mysql v1.6.0 + go: added filippo.io/edwards25519 v1.1.0 + go: added github.com/go-sql-driver/mysql v1.8.1 ``` Go downloaded this dependency because you added it to the `import`